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
4334 commits 39 branches 184 tags 168 MiB
Commit graph

4334 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
cb9503af5d
Merge pull request #1319 from Ducz0r/lm-revert-pr-1300 
Revert "Merge branch 'mc-SC-2697' of https://github.com/czbiohub/scin…
 2018-10-01 14:55:22 +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
d21ec35cfc Merge branch 'czbiohub-mc-SCI-2704' into core-api 2018-10-01 11:54:07 +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
eade0fe1eb Merge branch 'czbiohub-mc-SC-2703' into core-api 2018-10-01 11:42:44 +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
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
3a2740604d Merge branch 'czbiohub-mc-SCI-2696' into core-api 2018-09-26 18:21:47 +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
Alex Kriuchykhin
38a4360361
Merge pull request #1302 from okriuchykhin/ok_SCI_2718 
Add CREATE Result endpoint: Create Text result [SCI-2718]
 2018-09-26 13:29:54 +02:00
Oleksii Kriuchykhin
e06684b7cf Few fixes after review [SCI-2718] 2018-09-24 18:10:37 +02:00
Oleksii Kriuchykhin
ab3aeac26b Merge latest core-api branch [SCI-2718] 2018-09-24 16:49:27 +02:00
Luka Murn
2a1c3037b8 Merge branch 'czbiohub-mc-SC-2701' into core-api 2018-09-24 16:44:06 +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
Zanz2
8699761389
Merge pull request #1297 from Zanz2/zz_tasks_api_task_2667 
Created read endpoint for tasks, results and related data [SCI-2667] [SCI-2669]
 2018-09-24 15:31:47 +02:00
Zanz2
e5b7d68031 this should fix travis ci 2018-09-24 13:33:44 +02:00
Zanz2
1e8442e22e fixed pull request review, forgot some small thing 2018-09-24 12:50:11 +02:00
Zanz2
1a9890ee0f fixed pull request review 2018-09-24 12:48:53 +02:00
Alex Kriuchykhin
b38e85c282
Merge pull request #1301 from okriuchykhin/ok_SCI_2693_v2 
Fix CREATE inventory endpoint [SCI-2693]
 2018-09-24 10:51:13 +02:00
Alex Kriuchykhin
7526dad859
Merge pull request #1268 from okriuchykhin/ok_SCI_2515 
Add OAuth2 provider [SCI-2515]
 2018-09-14 10:40:20 +02:00
Oleksii Kriuchykhin
49e788a9ad Mergre latest core-api [SCI-2515] 2018-09-14 10:24:05 +02:00
Oleksii Kriuchykhin
acc00ff3b9 Add CREATE Result endpoint: Create Text result [SCI-2718] 2018-09-13 13:38:11 +02:00
Zanz2
e47acfb4a1 Fixed attribute names 2018-09-13 11:57:31 +02:00
Zanz2
5f39404e83 minor indendation fix 2018-09-13 11:25:25 +02:00
Zanz2
26856463ac rebased with core api 2018-09-13 11:24:31 +02:00
Zanz2
68385b36cc removed attributes 2018-09-13 11:20:30 +02:00
Zanz2
23f74a5b9b standardized serializers by removing specified attributes 2018-09-13 11:19:54 +02:00
Zanz2
8a925008f9 fixed hound 2018-09-13 11:18:49 +02:00
Zanz2
bd49ea56c5 Added results endpoint 2018-09-13 11:16:34 +02:00
Zanz2
426bd129cc Added task inputs and outputs functionality 2018-09-13 11:14:22 +02:00
Oleksii Kriuchykhin
9d9a5d07d8 Fix CREATE inventory endpoint [SCI-2693] 2018-09-13 11:08:58 +02:00
Zanz2
2519a010f6 Created new controllers and serializers for nested task related attributes 2018-09-13 11:04:52 +02:00
Zanz2
8d70764fe8 new routes for endpoints 2018-09-13 11:04:52 +02:00
Zanz2
765ee25853
Merge pull request #1292 from Zanz2/zz_experiments_api_task_2666 
Created API endpoints for experiments and related data [SCI-2666]
 2018-09-13 10:49:49 +02:00
Zanz2
1159ce519c Review changes 2018-09-13 09:25:16 +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
Luka Murn
3099725065
Merge pull request #1293 from czbiohub/mc-SCI-2698 
close SCI-2698; unit tests for DELETE inventory item [SCI-2698]
 2018-09-11 19:05:56 +02:00
Michael
9fab092c31 remove funky symbol 2018-09-11 09:55:38 -07:00
Zanz2
98ef3585a3 removed attributes 2018-09-11 15:41:38 +02:00
Zanz2
ae3c19ced5 removing attributes 2018-09-11 15:35:03 +02:00
Zanz2
4c2c92445c fixed oversight, added paging to connections 2018-09-11 13:07:28 +02:00
Zanz2
fa54badb9a fixed oversight, added paging to connections 2018-09-11 13:06:41 +02:00
Zanz2
c5300865d6 fixed hound 2018-09-11 10:49:24 +02:00