scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-14 21:24:54 +08:00
Code Issues Projects Releases Packages Wiki Activity
4401 commits 31 branches 181 tags 166 MiB
Commit graph

4401 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Kriuchykhin
4320af794b
Merge pull request #1353 from okriuchykhin/ok_SCI_2771 
Fix API endpoints that return file URLs [SCI-2771]
 2018-10-29 13:44:55 +01:00
Alex Kriuchykhin
8f33275b35
Merge pull request #1354 from okriuchykhin/ok_SCI_2820 
Fix project start day in serializer [SCI-2820]
 2018-10-29 13:44:41 +01:00
Oleksii Kriuchykhin
5708e9bbe7 Fix project start day in serializer [SCI-2820] 2018-10-28 19:02:44 +01:00
Oleksii Kriuchykhin
d1e6c64d5e Fix API endpoints that return file URLs [SCI-2771] 2018-10-28 18:39:34 +01:00
Luka Murn
c8d381a0a2
Update Dockerfile.production 
Update Dockerfile.production's FROM to ruby:2.4.4

This should have been done in commit
77e2371091.
 2018-10-22 15:27:18 +02:00
Alex Kriuchykhin
e9b64b65a3
Merge pull request #1330 from okriuchykhin/ok_SCI_2770 
Add request rate throttling for API [SCI-2770]
 2018-10-19 09:38:31 +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
Alex Kriuchykhin
5487999cec
Merge pull request #1328 from okriuchykhin/ok_SCI_2765 
Add CRUD endpoints for inventory cells [SCI-2765]
 2018-10-16 19:34:45 +02:00
Oleksii Kriuchykhin
b9320b3b1d Update sdoc gem [SCI-2765] 2018-10-16 16:50:42 +02:00
Oleksii Kriuchykhin
cf37566e8f Update Gemfile.lock [SCI-2765] 2018-10-16 16:06:03 +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
Luka Murn
5190ac7a08 Merge branch 'Ducz0r-lm-api-fixes' into core-api 2018-10-15 15:21:00 +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
26e5fcf8f6 Set API request rate limit for Travis [SCI-2770] 2018-10-11 15:36:13 +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
Luka Murn
c11345d6a1 Minorly update inventory_column_serializer so tests pass 2018-10-11 09:49:54 +02:00
Oleksii Kriuchykhin
8cf59d8d22 Add request rate throttling for API [SCI-2770] 2018-10-11 09:48:06 +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
Oleksii Kriuchykhin
bf80aa12a7 Fix failing test [SCI-2765] 2018-10-10 17:00:53 +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
dc2ab5fdc0 Fix the Doorkeeper config/access for all users (due to update of Gem) 2018-10-07 13:11:56 +02:00
Luka Murn
0bd3c81e39 Fix /users, /users/:id/identities endpoints 2018-10-07 13:07:27 +02:00
Luka Murn
7527dc7352 Fix READ index, READ show, POST create /tasks/:id/results endpoints 2018-10-07 12:58:17 +02:00
Luka Murn
fc5cf33614 Fix GET /tasks/:id/activities endpoint 2018-10-07 11:54:11 +02:00
Luka Murn
fca580face Fix GET /tasks/:id/inputs, GET /tasks/:id/outputs endpoints 2018-10-07 11:35:12 +02:00
Luka Murn
239b974fa0 Fix GET /tasks/:tid/protocols, GET /tasks/:tid/protocols/:id endpts 2018-10-07 11:29:56 +02:00
Luka Murn
24299ef4c0 Fix GET /tasks/:task_id/tags, GET /tasks/:task_id/tags/:id endpts 2018-10-07 11:10:41 +02:00
Luka Murn
98544f00e8 Fix GET /tasks/:task_id/users, GET /tasks/:task_id/users/1 endpts 2018-10-07 10:20:01 +02:00
Luka Murn
94e80edc9b Minor variable rename in task_groups_controller.rb 2018-10-07 10:16:00 +02:00
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
Oleksii Kriuchykhin
0c452f519d Add CRUD endpoints for inventory cells [SCI-2765] 2018-10-05 00:18:42 +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