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

4362 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Luka Murn
c11345d6a1 Minorly update inventory_column_serializer so tests pass 2018-10-11 09:49:54 +02:00
Luka Murn
a217b11bba
Merge pull request #1298 from Zanz2/zz_projects_api_task_2539 
Created read endpoint for projects and related models [SCI-2539]
 2018-10-11 09:03:18 +02:00
Luka Murn
c0f47f03b7 Hound is love, Hound is life 2018-10-11 08:51:14 +02:00
Luka Murn
dd4f7b5d02 Fix project users, activities, comments, reports endpoints 2018-10-10 17:35:09 +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
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
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
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
Zanz2
2e0c40ed45 fixed merge 2018-09-26 12:20:13 +02:00
Zanz2
c8ed808920 merged with core-api 2018-09-26 12:17:49 +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
81115f411a Renaming my module attribute to tasks 2018-09-13 11:46:25 +02:00
Zanz2
bbca47684f Merge branch 'zz_projects_api_task_2539' of https://github.com/Zanz2/scinote-web into zz_projects_api_task_2539 2018-09-13 11:39:53 +02:00
Zanz2
46d33d28a3 standardized serializers by removing specified attributes 2018-09-13 11:38:29 +02:00
Zanz2
8ac1445ace Fixed hound 2018-09-13 11:37:07 +02:00
Zanz2
7f704c07e3 Created base endpoints for projects and related models 2018-09-13 11:37:07 +02:00
Zanz2
dace81f724 created base projects endpoint 2018-09-13 11:37:07 +02:00