Commit graph

180 commits

Author SHA1 Message Date
aignatov-bio fa881253b6
Merge pull request #4672 from aignatov-bio/ai-sci-7531-fix-cross-team-redirections
Add missed notifications to steps and fix notification for protocol repository [SCI-7531]
2023-01-04 10:07:36 +01:00
Anton 98572d9a2c Add missed notifications to steps and fix notification for protocol repository [SCI-7531] 2022-12-01 14:55:23 +01:00
Oleksii Kriuchykhin 3b474fc9f0 Improve activity records creation in controllers [SCI-7505] 2022-11-24 15:19:17 +01:00
Anton 0c596bb701 Merge branch 'develop' into features/label-templates 2022-09-15 10:40:17 +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
aignatov-bio f1013c59fd
Merge pull request #4341 from aignatov-bio/ai-sci-7094-fix-protocol-description-save-in-repository
Fix protocol description save in protocol repository [SCI-7094]
2022-08-10 13:57:18 +02:00
Anton f39e86d40b Fix protocol description save in protocol repository [SCI-7094] 2022-08-10 13:46:50 +02:00
artoscinote 610ee6bdaa
Don't adjust step position in bulk deletion [SCI-7079] (#4339) 2022-08-10 12:05:24 +02:00
Anton 6131b6c0b7 Add new templates section and navigation [SCI-7017] 2022-07-26 13:53:51 +02:00
Alex Kriuchykhin 9aeb107635
Fix saving protocol to repository [SCI-6935] (#4190) 2022-07-06 11:45:04 +02:00
Anton f3fdf25d2f Add activity to bulk step deletion [SCI-6928] 2022-07-04 21:15:19 +02:00
Anton 5296b50c2f Add delete all steps button [SCI-6921] 2022-06-24 11:21:47 +02:00
artoscinote 5c051ef8c1
Implement V2 protocols exporter [SCI-6876] (#4142)
* Implement V2 protocols exporter [SCI-6876]

* Implement new importer [SCI-6877]
2022-06-10 10:18:55 +02:00
Anton e86a0610b2 Add metadata block in protocol repository [SCI-6869] 2022-06-06 13:56:22 +02:00
Anton 3910fa34f3 Remove protocol creation modal [SCI-6868] 2022-06-03 15:11:51 +02:00
Anton 61464b3780 Add new protocol view to repository [SCI-6858] 2022-06-02 11:05:25 +02:00
artoscinote 19a91fce66
Fix protocol layout issue [SCI-6312] (#3712) 2021-12-01 16:23:46 +01:00
artoscinote 9937d1d913
Add print feature to protocols [SCI-6028] (#3700)
* Add print feature to protocols [SCI-6028]

* Close tab after closing print dialog [SCI-6028]

* CSS linter fixes [SCI-6028]
2021-12-01 11:16:45 +01:00
Oleksii Kriuchykhin c26dcf4b23 Replace empty? with blank? [SCI-5579] 2021-07-23 11:56:28 +02:00
Oleksii Kriuchykhin d315b1327b Implement missing missing user smart annotation notifications [SCI-5575] 2021-03-19 17:11:19 +01:00
Urban Rotnik 7c312a844f Fix updating updated_at on protocol while load/sync with repository 2020-09-29 15:37:40 +02:00
Urban Rotnik d9b691103c Add permission error message 2020-09-08 15:42:30 +02:00
Urban Rotnik a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
Urban Rotnik de4e4ca967 Add before_action for team switch 2020-04-23 16:20:01 +02:00
aignatov-bio fe718349da Add recent protocol tab to load protocal from repository 2020-04-09 17:29:39 +02:00
aignatov-bio 0b04ca4012 Fix markup 2019-11-21 12:19:47 +01:00
aignatov-bio 56ae32323c Add autosave for protocol keywords and user preferences 2019-11-20 14:57:53 +01:00
aignatov-bio 1488f75e26 Add activities 2019-11-13 13:57:04 +01:00
aignatov-bio a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01:00
Oleksii Kriuchykhin 584f2d07c0 Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934] 2019-10-01 13:06:01 +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
Anton Ignatov 57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00
Oleksii Kriuchykhin 9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +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
aignatov-bio d207cf5dce
Refactored comments over SciNote [SCI-3505] (#1808)
* Preparing helpers for comments

* Refactored comments over scinote

* Update events
2019-06-04 14:40:21 +02:00
Alex Kriuchykhin df59c54bd4
Merge pull request #1776 from okriuchykhin/ok_SCI_3477
Fix protocol metadata editing in repository [SCI-3477]
2019-05-17 09:42:13 +02:00
Oleksii Kriuchykhin 488fc99dae Fix protocol metadata editing in repository [SCI-3477] 2019-05-16 17:11:17 +02:00
Anton Ignatov 652fba0e23 Merge branch 'master-with-note-section' 2019-05-13 11:08:11 +02:00
Anton Ignatov 2e6bab4638 Fix smart anottation to protocols in repository 2019-05-09 09:40:40 +02:00
Oleksii Kriuchykhin 40550f92c9 Improve HTML data escaping in JSON endpoints [SCI-3403] 2019-05-08 17:38:24 +02:00
aignatov-bio 84993ea3ef
Update protocol repository for new description format [SCI-3371] (#1689)
* Update protocol repository for new description format

* move image clone method to concerns
2019-04-24 13:34:56 +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 6b45dcd475
Update eln export for new tinyMCE image format (#1680) 2019-04-19 14:44:40 +02:00
aignatov-bio a1047f4597
Fix activities wording [SCI-3287] (#1635)
* Fix activities wording

* Adding project to export protocol
2019-04-04 10:45:35 +02:00
aignatov-bio e034a0c055
Fix bug with update protocol from repository and modal disable button [SCI-3284] (#1631)
* Fix bug with update protocol from repository and modal disable button
2019-04-03 09:18:18 +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
Mojca Lorber 3c69225d6b Change activities for task protocols 2019-03-29 15:09:20 +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