scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-09 22:23:28 +08:00
Code Issues Projects Releases Packages Wiki Activity
11811 commits 52 branches 189 tags 169 MiB
Commit graph

185 commits

Author SHA1 Message Date
miha
961fa9ab4e [SCI-5631] Add ordering to index endpoint so pagination works, limit maximum page size for kaminari 2021-04-06 09:59:24 +02:00
Oleksii Kriuchykhin
75da67b937 Update Rails to 6.1.1, ruby to 2.7.2 [SCI-5459] 2021-01-28 14:43:45 +01:00
Oleksii Kriuchykhin
67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
Urban Rotnik
87b5552b27 Add equals team validations for project and folder 2020-12-02 14:53:46 +01:00
Urban Rotnik
df2b8ab3df Remove jsonapi_parameters gem, accept rails params in controller 2020-12-02 13:15:49 +01:00
Urban Rotnik
7c1a0a9044 Add projects to project_folder serializer 2020-12-02 13:15:49 +01:00
Urban Rotnik
97733498d9 Include project_folders at Projects API endpoints 2020-12-02 13:15:48 +01:00
Urban Rotnik
a4fc01d595 Add jsonapi_parameters gem, use relationships for parent_folder relation 2020-12-02 13:15:48 +01:00
Urban Rotnik
088fa79874 Add Project Folders API endpoints 2020-12-02 13:15:48 +01:00
Oleksii Kriuchykhin
eafc4cf367 Fix permission check for archived tasks [SCI-5235] 2020-11-20 14:39:17 +01:00
Oleksii Kriuchykhin
4d64883963 Add activities for step completion and checklist toggling through API [SCI-5139] 2020-10-25 22:33:50 +01:00
Alex Kriuchykhin
3eb448c39b
Merge pull request #2862 from okriuchykhin/ok_SCI_5001 
Add Endpoins for Project Membership manipulation [SCI-5001]
 2020-09-25 14:25:20 +02:00
Urban Rotnik
f4f0bc706a Fix step deletion 2020-09-25 08:43:03 +02:00
Oleksii Kriuchykhin
2cda80dc5f Add Endpoins for Project Membership manipulation [SCI-5001] 2020-09-23 11:03:29 +02:00
Alex Kriuchykhin
136ce06022
Merge pull request #2851 from okriuchykhin/ok_SCI_4999 
Add Create and Update endpoints for experiments [SCI-4999]
 2020-09-22 10:20:00 +02:00
Alex Kriuchykhin
e19efe3975
Merge pull request #2850 from okriuchykhin/ok_SCI_4997 
Add Create and Update endpoints for projects [SCI-4997]
 2020-09-21 13:22:12 +02:00
Oleksii Kriuchykhin
0147e1aee1 Add Create and Update endpoints for experiments [SCI-4999] 2020-09-16 23:15:36 +02:00
Oleksii Kriuchykhin
dd4a62bb45 Add Create and Update endpoints for projects [SCI-4997] 2020-09-16 17:03:39 +02:00
Oleksii Kriuchykhin
57716fd89c Fix API and tests for new task completion logic [SCI-5004] 2020-09-15 11:19:25 +02:00
aignatov-bio
5cb497b61d Split params validation to create and update 2020-09-03 09:49:00 +02:00
aignatov-bio
4c7312faf9 Add tests for new workflow endpoints 2020-09-02 11:43:00 +02:00
aignatov-bio
68f31ce7ec Add api endpoints for workflows 2020-09-01 15:01:38 +02:00
Miha Mencin
b333700f40
Merge pull request #2779 from okriuchykhin/ok_SCI_4910 
Fix rendering of RTE in API [SCI-4910]
 2020-08-10 15:26:35 +02:00
Oleksii Kriuchykhin
91d9f5d6ee Fix rendering of RTE in API [SCI-4910] 2020-08-07 16:51:57 +02:00
Oleksii Kriuchykhin
3d3fd1625c Add created_at and user to API Step serializer [SCI-4911] 2020-08-07 14:54:05 +02:00
Alex Kriuchykhin
22015beeb5
Merge pull request #2757 from urbanrotnik/ur-sci-4813-base64-multipart-upload 
Extend asset API upload to support base64 [SCI-4813]
 2020-08-04 09:43:01 +02:00
Urban Rotnik
9b06510dcc Update PUT result file endpoint, refactor 2020-08-03 15:14:58 +02:00
Urban Rotnik
4958139699 Extend asset API upload to support base64 2020-07-24 14:57:03 +02:00
Oleksii Kriuchykhin
b4fab62d38 Merge branch 'develop' into ok_SCI_4776 2020-07-10 13:40:46 +02:00
Urban Rotnik
b11f166c38 Fix cucumber tests 2020-07-09 13:14:07 +02:00
Oleksii Kriuchykhin
dc481cf236 Add API endpoints for checklists, checklist items, tables, API code improvements [SCI-4776] 2020-07-03 16:48:29 +02:00
Urban Rotnik
c565cbe579 Filter out non active repositories and rows 2020-06-23 10:23:22 +02:00
aignatov-bio
10fdd0c1c7 Merge branch 'develop' into features/new-task-layout 2020-04-23 14:07:40 +02:00
Oleksii Kriuchykhin
837437309e Fix failing tests [SCI-4516] 2020-04-09 17:11:58 +02:00
aignatov-bio
af02201b43 Add decimals to repository column API 2020-04-01 13:29:21 +02:00
Oleksii Kriuchykhin
9d0d75acc5 Add API endpoints for new column types [SCI-4276] 2020-02-18 15:13:46 +01:00
Oleksii Kriuchykhin
b0c785f4fb Extend inventory import to support new data types [SCI-4220] 2020-02-03 15:20:01 +01:00
Urban Rotnik
1e8261ac2a Update InventoryColumns API for new Status Type 2019-11-29 10:19:07 +01:00
Urban Rotnik
7ab12baef9 Add API endpoint for StatusItems 2019-11-29 10:19:07 +01:00
Urban Rotnik
5e97116c5a Update results params 2019-11-18 11:11:39 +01:00
Urban Rotnik
8b5e346770 Remove file deletion manually 2019-11-18 11:11:39 +01:00
Urban Rotnik
cc9d987321 Add update result(file) and create result(file) API endpoint 2019-11-18 11:11:38 +01:00
Urban Rotnik
060125a1c4 Add file size validation 2019-11-18 11:11:38 +01:00
Urban Rotnik
1be88baab1 Add API endpoint for Attachments resource 2019-11-18 11:11:38 +01:00
Urban Rotnik
e7083e188c Add API endpoint for Step resource 
[SCI-3835]
 2019-11-18 11:11:37 +01:00
Urban Rotnik
24033bec7a Add API endpoint for Task creation 2019-11-18 11:11:37 +01:00
Oleksii Kriuchykhin
3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
mlorb
cf8c98dfa3
Merge pull request #2042 from biosistemika/hotfix-september 
Hotfix september
 2019-09-10 13:53:28 +02:00
Mojca Lorber
a312c0c4b8 fix bug on api endpoint when creating result 2019-09-04 13:41:06 +02:00
Oleksii Kriuchykhin
3918c893db Fix new office file creation [SCI-3778] 2019-08-21 13:26:11 +02:00
Urban Rotnik
077369d960 Update permissions for Repositories 2019-08-09 14:12:59 +02:00
Anton Ignatov
aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
aignatov-bio
a75c4c2f91
Update Result API for new tiny mce image format (#1674) 2019-04-19 14:44:16 +02:00
Anton Ignatov
811f07a62c Update API endpoints for new activities 2019-04-08 15:07:45 +02:00
Anton Ignatov
94efd2e649 Fix tests 2019-04-02 16:04:50 +02:00
Anton Ignatov
c9f9523210 Remove src when save description and rename token tag 2019-04-02 13:41:32 +02:00
Anton Ignatov
65521533b4 change js.erb to js 2019-03-22 13:35:11 +01:00
Anton Ignatov
07c2819163 refactoring tinymce image uploading 2019-03-20 14:46:54 +01:00
Alex Kriuchykhin
4e416fe81b
Merge pull request #1404 from okriuchykhin/ok_SCI_2822 
Return task inputs/outputs as references [SCI-2822]
 2018-12-12 11:36:39 +01:00
Oleksii Kriuchykhin
5b566b48ae Improve error messages and fix task users/items endpoints [SCI-2886] 2018-11-28 14:14:45 +01:00
Oleksii Kriuchykhin
b3a377f949 Return task inputs/outputs as references [SCI-2822] 2018-11-28 11:33:00 +01:00
Oleksii Kriuchykhin
23ee4760ae Fix failing tests [SCI-2773] 2018-11-07 16:39:00 +01:00
Oleksii Kriuchykhin
30885e060d Merge latest core-api branch [SCI-2773] 2018-11-07 15:53:21 +01:00
Oleksii Kriuchykhin
60e78fa868 Improve code style for error handling [SCI-2773] 2018-11-07 15:43:44 +01:00
mlorb
ad5f4c2ebb
Merge pull request #1356 from mlorb/ml-sci-remove-protocol-show-endpoint 
Remove show protocol api endpoint
 2018-10-30 14:04:17 +01:00
Alex Kriuchykhin
2f466383a5
Merge pull request #1333 from okriuchykhin/ok_SCI_2742 
RESTful API for Object Querying (READ) - unit tests [SCI-2742]
 2018-10-29 16:26:58 +01:00
Alex Kriuchykhin
126fa03305
Merge pull request #1349 from okriuchykhin/ok_SCI_2818 
Fix project index endpoint permission bug [SCI-2818]
 2018-10-29 14:59:22 +01:00
mlorb
0f8c80172e remove show protocol api endpoint 2018-10-29 11:21:48 +01:00
Oleksii Kriuchykhin
9ad2718f32 Fix project index endpoint permission bug [SCI-2818] 2018-10-26 16:46:01 +02:00
Oleksii Kriuchykhin
93e7c3f390 Fix inventory column creation permission check [SCI-2782] 2018-10-26 14:38:47 +02:00
Oleksii Kriuchykhin
b53f2c8347 Improve error messages in API [SCI-2773] 2018-10-23 17:52:48 +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
Oleksii Kriuchykhin
e4e66d3e5d Merge branch 'core-api' into ok_SCI_2742 2018-10-16 17:38:30 +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
Oleksii Kriuchykhin
0db9ef44e2 Add experiment, task, result READ endpoints tests [SCI-2742] 2018-10-15 16:27:22 +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
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
dd4f7b5d02 Fix project users, activities, comments, reports endpoints 2018-10-10 17:35:09 +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
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
Oleksii Kriuchykhin
0c452f519d Add CRUD endpoints for inventory cells [SCI-2765] 2018-10-05 00:18:42 +02:00
Oleksii Kriuchykhin
363c1e4a34 Add endpoints for managing inventory list items [SCI-2741] 2018-10-03 13:54:52 +02:00
Zanz2
2e0c40ed45 fixed merge 2018-09-26 12:20:13 +02:00