scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
5352 commits 70 branches 179 tags 165 MiB
Commit graph

62 commits

Author SHA1 Message Date
Urban Rotnik 4cf12d12d1 Refactor 'move_experiment' method into service object 
Jira Ticket: SCI-2926
 2019-01-28 11:45:36 +01:00
Oleksii Kriuchykhin 23ee4760ae Fix failing tests [SCI-2773] 2018-11-07 16:39:00 +01:00
Oleksii Kriuchykhin 30885e060d Merge latest core-api branch [SCI-2773] 2018-11-07 15:53:21 +01:00
Alex Kriuchykhin b2f87561fe
Merge pull request #1335 from okriuchykhin/ok_SCI_2749 
Add tests for CREATE Result endpoint [SCI-2749]
 2018-10-30 09:43:45 +01:00
Alex Kriuchykhin 2f466383a5
Merge pull request #1333 from okriuchykhin/ok_SCI_2742 
RESTful API for Object Querying (READ) - unit tests [SCI-2742]
 2018-10-29 16:26:58 +01:00
Oleksii Kriuchykhin b53f2c8347 Improve error messages in API [SCI-2773] 2018-10-23 17:52:48 +02:00
Oleksii Kriuchykhin c2e36580ce Add tests for CREATE Result endpoint [SCI-2749] 2018-10-17 14:17:16 +02:00
Alex Kriuchykhin 18b1cad8a4
Merge pull request #1334 from okriuchykhin/ok_SCI_2772 
Implement inventory column data type name mappings [SCI-2772]
 2018-10-17 10:37:23 +02:00
Oleksii Kriuchykhin b833ff6616 Rename MyModule serializer in tests [SCI-2742] 2018-10-16 17:45:29 +02:00
Oleksii Kriuchykhin e4e66d3e5d Merge branch 'core-api' into ok_SCI_2742 2018-10-16 17:38:30 +02:00
Oleksii Kriuchykhin ed46115b3f Implement inventory column data type name mappings [SCI-2772] 2018-10-16 15:35:02 +02:00
Oleksii Kriuchykhin f6b039d54e Merge latest core-api branch [SCI-2765] 2018-10-16 12:07:47 +02:00
Oleksii Kriuchykhin 0db9ef44e2 Add experiment, task, result READ endpoints tests [SCI-2742] 2018-10-15 16:27:22 +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
Oleksii Kriuchykhin dd17f1d5ad Add project READ endpoints [SCI-2742] 2018-10-12 17:43:36 +02:00
Luka Murn 2b7a94025e
Merge pull request #1320 from biosistemika/lm-mc-sci-2697 
UPDATE Inventory item endpoint - unit tests [SCI-2697] (v2)
 2018-10-11 15:20:37 +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 1e46631c02
Merge pull request #1316 from czbiohub/mc-SCI-2700 
close sci-2700; add unit tests for inventory column update [SCI-2700]
 2018-10-11 10:20:15 +02:00
Oleksii Kriuchykhin 77e2371091 Add tests for inventory cell endpoints [SCI-2765] 2018-10-08 13:25:03 +02:00
Luka Murn a8d56d32e2 Hound is love, Hound is life 2018-10-07 13:28:29 +02:00
Luka Murn 0bd3c81e39 Fix /users, /users/:id/identities endpoints 2018-10-07 13:07:27 +02:00
Luka Murn d235dd7807 Update GET /inventory_items, GET /inventory_items/:id endpoints 2018-10-06 18:37:40 +02:00
Luka Murn 6625b4019e Update GET /inventory_columns, GET /inventory_columns/:id endpts 2018-10-06 13:47:41 +02:00
Oleksii Kriuchykhin ed7c88f94d Improve tests [SCI-2741] 2018-10-04 12:00:50 +02:00
Oleksii Kriuchykhin 363c1e4a34 Add endpoints for managing inventory list items [SCI-2741] 2018-10-03 13:54:52 +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 548cfb65e1 Merge branch 'mc-SCI-2704' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SCI-2704 
Conflicts:
	spec/requests/api/v1/inventories_controller_spec.rb
 2018-10-01 11:53:47 +02:00
Luka Murn bf59276afd Merge branch 'mc-SC-2703' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SC-2703 
Conflicts:
	spec/requests/api/v1/inventories_controller_spec.rb
 2018-10-01 11:41:29 +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 2ac6563730
Merge pull request #1295 from czbiohub/mc-SCI-2702 
close SCI-2702; unit tests for create inventory [SCI-2702]
 2018-10-01 09:08:39 +02:00
Michael 2f99904000 merge core-api and handle merge issues 2018-09-27 10:43:52 -07:00
Michael 088e06cae7 fix check to inventory 2018-09-26 10:47:13 -07: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
Luka Murn 39dafd2179 Merge branch 'mc-SC-2701' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SC-2701 
Conflicts:
	spec/requests/api/v1/inventory_columns_controller_spec.rb
 2018-09-24 16:40:44 +02:00
Luka Murn 3b3d682ab2
Merge pull request #1294 from czbiohub/mc-SCI-2699 
add unit tests for Create inventory_column endpoint [SCI-2699]
 2018-09-12 15:39:18 +02:00
Luka Murn 8e376a0293 Hound is love, Hound is life. 2018-09-12 13:47:52 +02:00
Luka Murn 0b68a670c2 Fix the inventory_columns_controller#create action 
Based on unit tests, fix the create inventory columns endpoint
to work as intended. Also add another unit test case.
 2018-09-12 13:44:10 +02:00
Michael 9fab092c31 remove funky symbol 2018-09-11 09:55:38 -07:00
Michael 4b41cc9566 close mc-SC-2703; unit tests for DELETE inventory endpoints 2018-09-09 14:58:56 -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 beff430b61 unit tests for DELETE inventory [SCI-2704] 2018-09-09 13:37:26 -07:00
Michael e2c10e973d close mc-SC-2701; DELETE inventory column endpoint unit tests 2018-09-09 13:15:54 -07:00
Michael 43a3c1c06b close SCI-2702; unit tests for create inventory 2018-09-09 13:02:42 -07:00
Michael 436876ad76 close SCI-2699; add unit tests for Create inventory_column endpoint 2018-09-09 00:15:56 -07:00
Michael c0f0f0ea81 close SCI-2698; unit tests for DELETE inventory item 2018-09-07 15:11:53 -07:00