scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-29 11:45:18 +08:00
Code Issues Projects Releases Packages Wiki Activity
6072 commits 39 branches 184 tags 168 MiB
Commit graph

21 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
b53f2c8347 Improve error messages in API [SCI-2773] 2018-10-23 17:52:48 +02:00
Luka Murn
1093ea11f4 Merge branch 'lm-api-fixes' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-api-fixes 
Conflicts:
	app/serializers/api/v1/activity_serializer.rb
	app/serializers/api/v1/inventory_column_serializer.rb
	app/serializers/api/v1/project_serializer.rb
 2018-10-15 15:20:26 +02:00
Luka Murn
028c0c6832 Remove 2 obsolete unit tests 2018-10-11 14:41:13 +02:00
Luka Murn
33b9c65c29 Fix Hound 2018-10-11 14:27:52 +02:00
Luka Murn
d235dd7807 Update GET /inventory_items, GET /inventory_items/:id endpoints 2018-10-06 18:37:40 +02:00
Luka Murn
2dc09f080d Revert "Revert "Merge branch 'mc-SC-2697' of https://github.com/czbiohub/scinote-web-1 into core-api"" 
This reverts commit 7ef85a9b60.
 2018-10-01 14:59:06 +02:00
Luka Murn
7ef85a9b60 Revert "Merge branch 'mc-SC-2697' of https://github.com/czbiohub/scinote-web-1 into core-api" 
This reverts commit 870dda255c, reversing
changes made to 2ac6563730.
 2018-10-01 14:41:18 +02:00
Luka Murn
870dda255c Merge branch 'mc-SC-2697' of https://github.com/czbiohub/scinote-web-1 into core-api 
Conflicts:
	spec/requests/api/v1/inventory_items_controller_spec.rb
 2018-10-01 09:20:58 +02:00
Luka Murn
07c8c448d5 Fix codestyle 2018-09-26 18:30:07 +02:00
Luka Murn
46883150d1 Merge branch 'mc-SCI-2696' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SCI-2696 
Conflicts:
	spec/requests/api/v1/inventory_items_controller_spec.rb
 2018-09-26 18:16:25 +02:00
Luka Murn
d0d0939afd Move @valid_headers content type to global @valid_headers def 2018-09-26 18:13:10 +02:00
Michael
9fab092c31 remove funky symbol 2018-09-11 09:55:38 -07:00
Michael
f9f9bcac9f same changes to update unite tests 2018-09-09 14:03:56 -07:00
Michael
849a147756 failing tests for update, to_i doesn't work with updated changes 2018-09-09 14:02:22 -07:00
Michael
c0f0f0ea81 close SCI-2698; unit tests for DELETE inventory item 2018-09-07 15:11:53 -07:00
Michael
212bdfeffe close SCI-2696 2018-09-06 17:54:24 -07:00
Michael
c22ad02858 inventory_item #create correct response unit test 2018-09-06 13:45:28 -07:00
Oleksii Kriuchykhin
5488fc66fc Refactor JSON API mime type registration [SCI-2687] 2018-08-24 15:37:23 +02:00
Oleksii Kriuchykhin
6c59e1e159 Fix failing tests [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin
4df9a4c9ca Fix code style warnings [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin
8d11e03d47 Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00