Commit graph

189 commits

Author SHA1 Message Date
Martin Artnik 9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
Anton 6dce426db4 Add tinyMce field to protocol [SCI-6810] 2022-05-11 16:10:26 +02:00
Oleksii Kriuchykhin e957d7d35e Improve loading time of canvas view/edit [SCI-6797] 2022-05-09 11:40:31 +02:00
artoscinote 6352a4dd04
Implement protocol options dropdown [SCI-6750, SCI-6751] (#4066)
* Implement protocol options dropdown [SCI-6750, SCI-6751]

* Implement simple API error handling for step status update [SCI-6354]
2022-05-03 15:18:48 +02:00
artoscinote 8aaab73856
Add inline edit component, protocol name updates [SCI-6749] (#4057) 2022-04-26 14:13:17 +02:00
artoscinote 6ef190f353
Basic Vue setup for protocols [SCI-6749] (#4044) 2022-04-21 15:12:34 +02:00
artoscinote 401a32edd9
Implement failed snapshot pop-up on task screen [SCI-6612] (#3950)
* Implement failed snapshot pop-up on task screen [SCI-6612]

* Copy change [SCI-6612]

* Proper handling of snapshot transition error [SCI-6612]

* Move modal auto open logic to JS file [SCI-6612]

* Remove unnecessary .html_safe [SCI-6612]
2022-04-04 11:04:03 +02:00
aignatov-bio 75f7e67602
Fix task navigation for archived experiments [SCI-6333] (#3753)
Co-authored-by: Anton <anton@scinote.net>
2022-01-03 10:48:17 +01:00
artoscinote 5a7d285264
Fix due/start date label render [SCI-6288] (#3690) 2021-11-22 11:18:05 +01:00
artoscinote 4fb9f8836d
Fix my_modules_controller typo [SCI-6278] (#3688) 2021-11-22 09:49:44 +01:00
artoscinote 9b06a24288
Added granular task permissions, permission check fixes [SCI-6278] (#3683) 2021-11-19 13:24:57 +01:00
Oleksii Kriuchykhin a99599efea Merge branch 'features/new_permissions' into develop 2021-10-29 15:16:30 +02:00
artoscinote f68d724202
Rework experiment permissions [SCI-6054] (#3538)
* Rework experiment permissions [SCI-6054]
2021-09-30 11:32:11 +02:00
Martin Artnik e8f57e9e99 Reworked MyModule permissions [SCI-6056] 2021-09-14 11:08:35 +02:00
aignatov-bio 6a1223c498 Fix sidebar navigation for archived task [SCI-6050] 2021-09-10 12:05:40 +02:00
Martin Artnik c6c5f75262 Remove unncessary newline 2021-06-22 14:53:03 +02:00
Martin Artnik b6588c2334 Reworked task view sidebar [SCI-5701] 2021-06-18 16:52:19 +02:00
Oleksii Kriuchykhin 29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
aignatov-bio e8b115ca7a Change results sorting [SCI-5727] 2021-05-17 15:17:32 +02:00
Oleksii Kriuchykhin d315b1327b Implement missing missing user smart annotation notifications [SCI-5575] 2021-03-19 17:11:19 +01:00
Alex Kriuchykhin adb9442677
Small bugfixes [SCI-5432] (#3107) 2021-01-21 11:24:25 +01:00
Urban Rotnik c9bbc64751 Fix missing results of archived task
[SCI-5394]
2021-01-15 11:40:25 +01:00
Oleksii Kriuchykhin 58cce0f153 Improve task restoring and refactor flash messages [SCI-5341] 2021-01-04 17:00:23 +01:00
Oleksii Kriuchykhin f76eb170a1 Fix restore action for experiments and tasks [SCI-5341] 2020-12-28 22:21:38 +01:00
Oleksii Kriuchykhin 67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
Oleksii Kriuchykhin 7bb334e737 Archiving: update archived TASK screen layout [SCI-5276] 2020-12-17 13:26:44 +01:00
Oleksii Kriuchykhin 9546b8f71d Prepare backend for the improved navigation [SCI-5177] 2020-12-03 10:19:11 +01:00
Oleksii Kriuchykhin eafc4cf367 Fix permission check for archived tasks [SCI-5235] 2020-11-20 14:39:17 +01:00
Urban Rotnik aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Oleksii Kriuchykhin a7c6ab9d89 Move some consequence executon into background process [SCI-4978] 2020-09-11 16:18:39 +02:00
Urban Rotnik 45a09e5a3c Fix tests 2020-09-09 13:17:07 +02:00
Urban Rotnik aa88b6bdb4 Move redirect to controller 2020-09-09 11:26:43 +02:00
Urban Rotnik d9b691103c Add permission error message 2020-09-08 15:42:30 +02:00
aignatov-bio e1229f5606 Fix test and status validations 2020-09-01 14:49:58 +02:00
aignatov-bio 9ff5e8bd7d Add task state change error handling and validation 2020-09-01 12:41:00 +02:00
Urban Rotnik 581cd69963 Add activities for status change 2020-09-01 11:48:04 +02:00
Urban Rotnik a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Urban Rotnik 5923a4c014 Merge branch 'develop' into features/task-flows 2020-08-25 15:30:22 +02:00
Alex Kriuchykhin ccf4e2a747
Merge pull request #2759 from okriuchykhin/ok_SCI_4817
Refactor task archive and move permissions [SCI-4817]
2020-08-21 11:01:05 +02:00
Urban Rotnik 7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
aignatov-bio 15b5f9bb68 Add ordering for result page 2020-07-28 15:39:29 +02:00
Oleksii Kriuchykhin 1a8333612a Merge branch 'features/pwa' into develop 2020-07-27 09:47:41 +02:00
Oleksii Kriuchykhin 94588e4698 Refactor task archive and move permissions [SCI-4817] 2020-07-24 17:00:42 +02:00
Urban Rotnik 025378cd0e Fix translations and JS 2020-07-23 15:53:46 +02:00
aignatov-bio 04a6a2a250 Small fixes 2020-07-23 11:35:22 +02:00
Urban Rotnik 512d6f3229 Add actions for update status, clean old complete actions 2020-07-22 16:12:34 +02:00
aignatov-bio 7c4bfad09b Add pagination to results page 2020-07-16 15:47:19 +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
Oleksii Kriuchykhin 48865c8cea Clear the obsolete code for assiging inventory items to the task [SCI-4571] 2020-06-03 22:54:45 +02:00
Miha Mencin d89dce9f72
Merge pull request #2632 from okriuchykhin/ok_SCI_4715
Remove inventory links of unshared inventory [SCI-4715]
2020-06-02 10:46:33 +02:00