scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
6554 commits 70 branches 179 tags 165 MiB
Commit graph

113 commits

Author SHA1 Message Date
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
Oleksii Kriuchykhin 552f69b9b1 Add system notifications service to health check endpoint [SCI-3522] 2019-05-31 15:52:47 +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
Luka Murn e9c0b34662 Merge branch 'core-api' into 'master' 
Conflicts:
	Gemfile
	app/services/api.rb
	config/initializers/api.rb
	config/initializers/extends.rb
	config/routes.rb
	db/schema.rb
	spec/controllers/api/api_controller_spec.rb
 2018-11-14 16:59:04 +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
Alex Kriuchykhin 1083ce61fb
Merge pull request #1352 from okriuchykhin/ok_SCI_2814 
Rename user_id to sub in JWT [SCI-2814]
 2018-10-29 14:54:00 +01:00
mlorb 0f8c80172e remove show protocol api endpoint 2018-10-29 11:21:48 +01:00
Oleksii Kriuchykhin 04ff5870af Rename user_id to sub in JWT [SCI-2814] 2018-10-28 14:34:51 +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