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

99 commits

Author SHA1 Message Date
aignatov-bio 188013dd56 Change permission for sorting in steps and asset view [SCI-5289] 2020-12-08 10:45:43 +01:00
Urban Rotnik dc9fae6af0 Remove manage permissions check from step toggle 2020-11-27 11:37:39 +01:00
aignatov-bio 0f80786433 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into ai-sci-5101-add-attachments-dropdown-to-step 2020-11-02 18:52:46 +01:00
aignatov-bio 84a7d49023 Fix markup 2020-11-02 18:51:21 +01:00
aignatov-bio eca39a00b5 Add attachments dropdown to step 2020-11-02 18:47:08 +01:00
Mojca Lorber 8aed48d1ae Merge branch 'develop' into features/office-file-previews 2020-11-02 13:45:06 +01:00
Mojca Lorber 04e3b67968 Change the way buttons are toggled 2020-10-30 18:47:01 +01:00
aignatov-bio 6193f91192 Update view mode switcher logic 2020-10-29 16:42:05 +01:00
aignatov-bio 12991e8fd3 Commit add asset preview mode switcher to step 2020-10-29 16:42:05 +01:00
aignatov-bio 6ed8757eb1 Merge branch 'features/task-flows' into develop 2020-09-17 14:52:05 +02:00
Oleksii Kriuchykhin 73cf620960 Add Completion and Uncompletion consequences [SCI-5004] 2020-09-14 20:06:48 +02:00
Urban Rotnik d9b691103c Add permission error message 2020-09-08 15:42:30 +02:00
Oleksii Kriuchykhin dea75553a3 Fix handling of duplicated step positions [SCI-4880] 2020-09-07 10:44:00 +02:00
Oleksii Kriuchykhin ed2eb81c68 Switch to position swapping when updating step position [SCI-4880] 2020-08-25 15:46:23 +02:00
Oleksii Kriuchykhin a206890a8c Fix step position adjusting on move and destroy [SCI-4880] 2020-08-25 15:46:21 +02:00
Urban Rotnik 5923a4c014 Merge branch 'develop' into features/task-flows 2020-08-25 15:30:22 +02:00
aignatov-bio 19a0d05467 Fix for checklist ordering 2020-08-14 12:32:39 +02:00
Urban Rotnik 38d3411007 Update checklist item positions with validations skip 2020-08-13 20:06:03 +02:00
Oleksii Kriuchykhin aa38d92982 Improve completed_on generation for steps/my_modules [SCI-4776] 2020-07-07 09:34:51 +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
aignatov-bio d5f9604e1c Fix file post process method 2019-12-03 10:17:47 +01:00
Oleksii Kriuchykhin c068901b00 Upgrade Rails to 6.0 [SCI-3745] 2019-09-12 17:24:08 +02:00
Oleksii Kriuchykhin 32054c5516 Handle situation for assets without blob in list sorting [SCI-3757] 2019-08-09 15:17:19 +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
Oleksii Kriuchykhin eaf9d59819 Merge branch 'activestorage_migration' into ok_SCI_3679 2019-08-06 15:27:31 +02:00
Oleksii Kriuchykhin 5e65b07bdc Implement DirectUpload for Steps, Results and Inventories [SCI-3679] 2019-07-25 18:00:24 +02:00
Anton Ignatov 7e5c39d3e4 Merge branch 'master' into features/marvinjs-integration 2019-06-21 14:51:45 +02:00
Oleksii Kriuchykhin 6e1a7a3392 Implement saving of attachments ordering on steps [SCI-3436] 2019-06-11 10:08:33 +02:00
Anton Ignatov c9a29b12ba Merge branch 'master' into features/marvinjs-integration 2019-05-31 10:27:14 +02:00
aignatov-bio 59e824ef9e
Fix nil handling in different places [SCI-2840] (#1777) 
* Fix nil handling in different places
 2019-05-21 15:53:34 +02:00
Anton Ignatov 565a4959b4 small fixes and improvments 2019-05-03 15:24:28 +02:00
Anton Ignatov aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
Jure Grabnar f00f4d39af Refactor step activities using position_plus_one 
Closes SCI-3273
 2019-04-03 13:10:45 +02:00
Jure Grabnar 26848ecaef Refactor step position + 1 into a method 2019-04-03 13:07:30 +02:00
Mojca Lorber 3c69225d6b Change activities for task protocols 2019-03-29 15:09:20 +01:00
Mojca Lorber f06358b2ae Implement missing tests for global activities (task and protocol activities) 2019-03-27 11:24:44 +01:00
Anton Ignatov 4ec0a3c871 Update TinyMCE image loader for new fields 2019-03-22 10:52:26 +01:00
Mojca Lorber c55e314ed5 Refactor upon the review requests 2019-03-20 21:34:47 +01:00
Anton Ignatov 55c93922ea markup fixes 2019-03-20 14:46:54 +01:00
Anton Ignatov 07c2819163 refactoring tinymce image uploading 2019-03-20 14:46:54 +01:00
Mojca Lorber cd7a87348f Protocol activities refactoring, without tests 2019-03-19 16:12:07 +01:00
Urban Rotnik 7a05e817ef Add new Protocol steps activities 2019-03-12 09:15:06 +01:00
Zanz2 ab3b15e13e Found the bug and fixed it 2018-08-21 13:26:16 +02:00
Matej Zrimšek ff9dff5c10 Fixed reports permissions check calls. Fixed Hound warnings. 2018-02-22 13:51:22 +01:00
Matej Zrimšek 6ba226d514 Added missing '?' to the canaid permission calls that were missing it. 2018-02-16 11:12:30 +01:00
Matej Zrimšek 5bda53eebf Overall refactoring of all canaid permissions and code related to their calls. 2018-02-16 10:54:06 +01:00
Matej Zrimšek 09c5e23adf Fixed permission checks for completing step and checking step checkboxes. Disabled turbolinks for comments since it can cause issues. Minor code styling changes. 2018-02-14 14:39:10 +01:00
Matej Zrimšek d7108f5a35 Fixed Hound warnings. 2018-02-14 14:39:07 +01:00
Matej Zrimšek 8ef6c8f91f Refactored remaining experiment level permissions (and everything below it). 2018-02-14 14:39:07 +01:00
Matej Zrimšek d6e7ef465c Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964] 2018-02-14 14:19:22 +01:00