scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 06:56:54 +08:00
Code Issues Projects Releases Packages Wiki Activity
4309 commits 43 branches 185 tags 169 MiB
Commit graph

4309 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Zanz2
c8c0ed6298 standardized serializers by removing specified attributes 2018-09-11 10:47:33 +02:00
Zanz2
34f408b552 refactored serializers, removed attributes 2018-09-11 10:34:05 +02:00
Zanz2
0a6ae102cd fixes travis again 2018-09-10 15:53:12 +02:00
Zanz2
c2d62667e4 fixed hound 2018-09-10 15:42:21 +02:00
Zanz2
87d072537b fixed hound 2018-09-10 15:39:50 +02:00
Zanz2
6a4801466d Fixed serializer types 2018-09-10 15:21:45 +02:00
Zanz2
837fbaa35f Added results endpoint 2018-09-10 15:17:27 +02:00
Zanz2
30c4fac2ae Added task inputs and outputs functionality 2018-09-10 14:22:27 +02:00
Michael
e2c10e973d close mc-SC-2701; DELETE inventory column endpoint unit tests 2018-09-09 13:15:54 -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
Zanz2
e82af2186e Route comment 2018-09-07 15:52:30 +02:00
Zanz2
bad07841da Created new controllers and serializers for nested task related attributes 2018-09-07 15:19:20 +02:00
Zanz2
7496e3749b fixed types to plural for naming convention 2018-09-07 13:39:00 +02:00
Zanz2
2d3f5f2377 new routes for endpoints 2018-09-07 13:36:55 +02:00
Zanz2
4acc8f5719 fixes travis ci mistake 2018-09-07 12:54:09 +02:00
Zanz2
e64aee5db0 Completed the functionality for experiments and related endpoints 2018-09-07 11:58:02 +02:00
Zanz2
1589cfb1b2 saving work 2018-09-06 15:38:48 +02:00