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

4348 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luka Murn
f56e5b1e5a Update GET /task/:task_id/items, GET /task/:task_id/items/:id endpts 2018-10-07 10:07:37 +02:00
Luka Murn
0de3c7eb4e Update GET /tasks, GET /tasks/:id endpoints, refactor routes.rb 2018-10-07 09:45:24 +02:00
Luka Murn
0643ba216e Fix GET /connections, /connections/:id endpoints 2018-10-07 00:53:39 +02:00
Luka Murn
c9a15db85f Fix GET /task_groups endpoints 2018-10-06 20:11:01 +02:00
Luka Murn
d235dd7807 Update GET /inventory_items, GET /inventory_items/:id endpoints 2018-10-06 18:37:40 +02:00
Luka Murn
9e78de6ef2 Update CREATE, PATCH, DELETE inventory_column endpoints 2018-10-06 17:11:59 +02:00
Luka Murn
6625b4019e Update GET /inventory_columns, GET /inventory_columns/:id endpts 2018-10-06 13:47:41 +02:00
Luka Murn
eaa8a627a8 Update GET /inventories, GET /inventories/:inventory_id endpoints 2018-10-06 12:39:44 +02:00
Luka Murn
6faaff550b Update GET /teams, GET teams/:team_id endpoints slightly 2018-10-06 12:18:57 +02:00
Luka Murn
7b5a65416a Update status endpoint 2018-10-06 11:47:23 +02:00
Luka Murn
be06630109
Merge pull request #1325 from Ducz0r/lm-update-doorkeeper 
Update doorkeeper gem to >= 4.6
 2018-10-05 12:05:32 +02:00
Luka Murn
9f4cb02fba Update doorkeeper gem to >= 4.6 2018-10-05 11:50:17 +02:00
Alex Kriuchykhin
7bad772e81
Merge pull request #1323 from okriuchykhin/ok_SCI_2741 
Add endpoints for managing inventory list items [SCI-2741]
 2018-10-04 14:29:11 +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
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