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
14971 commits 70 branches 179 tags 165 MiB
Commit graph

245 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 49fbc2c561 Add basic modal for direct task creation [SCI-7197] 2022-11-18 17:00:11 +01:00
Oleksii Kriuchykhin 66f9f13508 Implement current team switch when navigating to tasks and experiments from another team [SCI-7447] 2022-11-18 11:48:49 +01:00
Anton 7ceb94ab1f Add toolbar to experiment table [SCI-7379] 2022-11-08 12:52:49 +01:00
artoscinote 9126b7fca4
Add missing protocol description activity [SCI-7140] (#4401) 2022-09-06 11:03:13 +02:00
ajugo 83c78d660f
Added activity for update protocol name [SCI-7095] (#4346) 
* Added activity for update protocol name [SCI-7095]

* Fix activity log for updated protocol name [SCI-7095]

* Fix activity log for updated protocol name [SCI-7095]
 2022-08-11 14:09:01 +02:00
Anton 0e36783c5c Fix image saving to tinymce field [SCI-6909] 2022-06-27 13:31:09 +02:00
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
Oleksii Kriuchykhin 6afebdc5da Remove inventory links of unshared inventory [SCI-4715] 2020-06-01 17:50:31 +02:00
mlorb 26bdabb0c3
Merge pull request #2609 from mlorb/ml-sci-4529 
Add rename task and rename experiment activities [SCI-4529]
 2020-06-01 12:58:36 +02:00
aignatov-bio aaff5eb67f Add name order for porject/experiment/task sidebar 2020-05-27 13:31:00 +02:00
Mojca Lorber 9b7d321666 Add rename task and rename experiment activities 2020-05-26 15:34:20 +02:00
Oleksii Kriuchykhin ba1661b40f Fix handling of deleted repositories for snapshots [SCI-4596] 2020-05-13 18:00:56 +02:00
aignatov-bio c9545ddb19 Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab 2020-05-08 10:28:33 +02:00
Urban Rotnik 8ff7c33431 Fix start date activity message 2020-05-06 12:34:45 +02:00
aignatov-bio fe718349da Add recent protocol tab to load protocal from repository 2020-04-09 17:29:39 +02:00
Oleksii Kriuchykhin a9c3102835 Add repository snapshots with service, refactor item assigning [SCI-4516] 2020-04-07 18:26:39 +02:00
aignatov-bio fc810b5524
Merge pull request #2503 from aignatov-bio/ai-sci-4507-add-assigned-repositories-list 
Add assigned repositories list [SCI-4507]
 2020-04-03 13:59:26 +02:00
aignatov-bio dd3f2cb219 Update my_module assigned repository method 2020-04-03 12:33:42 +02:00
aignatov-bio 9678372dd5 Add assigned repositories list 2020-04-02 12:05:07 +02:00
Oleksii Kriuchykhin 3c53be1f9a Add start date to the task [SCI-4504] 2020-03-31 14:17:14 +02:00
Oleksii Kriuchykhin a518bfe023 Enable time fraction for task due date [SCI-4408] 2020-03-16 17:55:35 +01:00
Oleksii Kriuchykhin b0c785f4fb Extend inventory import to support new data types [SCI-4220] 2020-02-03 15:20:01 +01:00
Oleksii Kriuchykhin eed68a2590 Refactor repository cell clonning to support all data types [SCI-4204] 2020-01-14 16:55:10 +01:00
Oleksii Kriuchykhin 01b8d2226d Optimize repository table counters [SCI-4224] 2020-01-13 16:31:42 +01:00
Oleksii Kriuchykhin 7b82e33eb6 Fix repository filtering and improve speed [SCI-4224] 2020-01-13 16:09:07 +01:00
Oleksii Kriuchykhin 16b591b110 Fix sidebar update for inline editing [SCI-4000] 2020-01-06 16:07:23 +01:00
aignatov-bio 68284c10da Add task description and task protocol description activities 2019-11-27 14:37:53 +01:00
Oleksii Kriuchykhin 3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
Miha Mencin d522b3807a codestyle improvements 2019-09-06 14:59:30 +02:00
Miha Mencin 7fc5035d2d PR fixes, codestyle fixes 2019-09-06 13:47:06 +02:00
Miha Mencin 2486bd0077 SCI3818-unshared-inventory-screen 2019-09-05 14:03:08 +02:00
aignatov-bio b6661682ad
Fix shared inventory in task dropdown (#1993) 2019-08-19 13:56:02 +02:00
Mojca Lorber cac7dab440 Show shared inventories in left navigation and fix read repository permission 2019-08-09 14:13:00 +02:00
aignatov-bio 6e5f078dea
Add activities for marvinJS [SCI-3630] (#1950) 
* Add marvinJs activities to step and results

* Add activities for TinyMCE marvinJS assets

* Fix markup
 2019-08-09 09:47:07 +02:00
Jure Grabnar bbdc5ce6c3 Remove couple of Samples related logic/comments 2019-08-05 14:09:13 +02:00
Luka Murn 83bb89fdf5 Cherry-picked commit from ZZ (and LM)'s various changes 2019-07-26 10:13:14 +02:00
aignatov-bio 52a2f5cd0e
Add recent protocols dropdown to task page [SCI-3417] (#1800) 
* Add recent protocols dropdown to task page
 2019-06-13 15:47:29 +02:00
Oleksii Kriuchykhin 1128fedc51 Refactor title inline editing permission checking [SCI-3471] 2019-05-20 13:13:31 +02:00
Anton Ignatov 652fba0e23 Merge branch 'master-with-note-section' 2019-05-13 11:08:11 +02:00
Oleksii Kriuchykhin 40550f92c9 Improve HTML data escaping in JSON endpoints [SCI-3403] 2019-05-08 17:38:24 +02:00
Anton Ignatov 7d60eb5572 Fix migration issues 2019-04-23 11:11:22 +02:00
Anton Ignatov aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
Oleksii Kriuchykhin a43e42fdb3 Fix crash when no activities present [SCI-3340] 2019-04-15 10:51:59 +02:00
Oleksii Kriuchykhin 231106e131 Switch to kaminari pagination in global activities [SCI-3292] 2019-04-12 15:37:45 +02:00
Urban Rotnik 86ddbc68b6 fixup! Show date actual value without link 2019-04-02 14:21:06 +02:00
Urban Rotnik 8eaeeee9f8 Show date actual value without link 2019-04-02 13:15:34 +02:00
aignatov-bio e6102c72c7
Adding missed activities [SCI-3253] (#1614) 
* Adding missed activties

* Adding test for activities
 2019-04-02 11:50:37 +02:00
aignatov-bio b51dcc9d75
Adding children selector to global activities subjects [SCI-3247] (#1605) 
* Adding children selector to global activities subjects

* Fix naming, add seperate check for project id
 2019-03-29 09:26:27 +01:00
mlorb 5f663b3c74
Merge pull request #1600 from mlorb/ml-sci-3215 
Implement missing tests for global activities [SCI-3215][SCI-3219]
 2019-03-28 11:10:38 +01:00
aignatov-bio 08263ab64e
adding filters for task activities [SCI-3076] (#1553) 
* update task activity screen
 2019-03-28 10:55:48 +01:00
Mojca Lorber f06358b2ae Implement missing tests for global activities (task and protocol activities) 2019-03-27 11:24:44 +01:00