Commit graph

1263 commits

Author SHA1 Message Date
Alex Kriuchykhin 4f851b0995
Merge pull request #1816 from aignatov-bio/ai-sci-3525-fix-nil-error-in-module-tag-controller
Fix nil issue in tags_my_module controller [SCI-3525]
2019-06-12 13:11:40 +02:00
aignatov-bio d553fee2b3
Prevent negative scroll for sidebar (#1819) 2019-06-05 12:41:27 +02:00
Urban Rotnik 3d3c6d5350 Toolbar position fix for Safari 2019-06-04 15:55:44 +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
Anton Ignatov d0439f478d Fix markup 2019-06-03 09:52:04 +02:00
Anton Ignatov 559bb2d793 Prevent selecting empty tag 2019-06-03 09:50:55 +02:00
aignatov-bio cd7460a4bd
Add croppie tool to avatar editing [SCI-3502] (#1801)
* Add croppie tool to avatar editing
2019-05-31 15:44:27 +02:00
aignatov-bio 3681df7b9f
Fix scroll issue in repository column editor (#1813) 2019-05-31 09:48:45 +02:00
Alex Kriuchykhin c49dbe5c44
Merge pull request #1810 from okriuchykhin/ok_SCI_3511
Fix RTE editor initialization for new step in protocol [SCI-3511]
2019-05-30 12:54:36 +02:00
Oleksii Kriuchykhin d061aec5cd Fix RTE editor initialization for new step in protocol [SCI-3511] 2019-05-29 18:33:20 +02:00
Oleksii Kriuchykhin 2c9ced0c75 Fix step numbering update on reposition [SCI-3507] 2019-05-29 12:20:35 +02:00
aignatov-bio fb30e6b6e5
Add check for refreshProtocolStatusBar function exist (#1794) 2019-05-22 10:31:29 +02:00
aignatov-bio d97e803d01
Adding placeholder to TinyMCE editor (#1788) 2019-05-21 15:53:47 +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
mlorb be0393e642
Merge pull request #1785 from biosistemika/lm-ml-sci-3193
Update protocol status bar upon protocol changing [SCI-3193]
2019-05-21 15:28:58 +02:00
aignatov-bio 2de2ead723
Refactor avatar image appearance across Scinote [SCI-3482] (#1787)
* Refactor avatar appearance across Scinote
2019-05-21 15:19:44 +02:00
Mojca Lorber b479a6a145 Cover all use cases for updating protocol status bar 2019-05-20 16:09:43 +02:00
aignatov-bio 20b626d791
Fix warning message issue in step description [SCI-3479] (#1778)
* Fix warning message issue
2019-05-20 11:19:53 +02:00
Luka Murn c26489acdc Update protocol status bar upon changing of protocol description 2019-05-17 10:22:16 +02:00
aignatov-bio 24e30867da
Add smart annotation to comments [SCI-3458] (#1768)
* Add smart annotation to comments
2019-05-15 14:59:15 +02:00
aignatov-bio 825e34e661
Fix inside click action in inline editing [SCI-3440] (#1765)
* Fix inside click action
2019-05-14 16:25:46 +02:00
aignatov-bio d28d466dc9
Fix multiple confirm windows [SCI-3452] (#1763)
* Fix multiple confirm windows
2019-05-14 16:25:34 +02:00
aignatov-bio 4a753f8519
Fix user smart annotation fpr tinyMCE (#1759) 2019-05-14 15:02:12 +02:00
aignatov-bio fe2a3c4ee6
Add message when turbolinks change page with dirty tinyMCE [SCI-3452] (#1754)
* Add message when turbolinks change page with dirty tinuMCE
2019-05-14 09:49:00 +02:00
Oleksii Kriuchykhin 4b1c4bd140 Fix handling of proccessing step attachments [SCI-3381] 2019-05-13 17:12:06 +02:00
aignatov-bio 039b2f3754
Fix zoom on Y axis [SCI-3374] (#1750)
* Add zoom to image annotation
2019-05-13 11:01:39 +02:00
Miha Mencin 5ff344c208
Merge pull request #1746 from biosistemika/lm-sci-3426
Changes to create new office file button [SCI-3426]
2019-05-13 10:55:58 +02:00
aignatov-bio d3aa6371cd
Fix report saving [SCI-3443] (#1753)
* Fix report saving

* Fix the report saving by using the reports' structures

* Remove uneccesary yarn.lock (mistake)
2019-05-13 10:55:08 +02:00
Oleksii Kriuchykhin b60bd79e2b Change implementation of TinyMCE floating toolbar [SCI-3439] 2019-05-13 10:26:15 +02:00
aignatov-bio 3633274c8f
Fix import for eln (#1741) 2019-05-13 10:22:30 +02:00
aignatov-bio 364f903b3c
Fix protocol preview name (#1749) 2019-05-13 10:17:47 +02:00
aignatov-bio 2010b3ad8f
Fix step comments bugs (#1751) 2019-05-13 09:49:53 +02:00
Luka Murn bbfad0efe5 Refresh current page after new OfficeOnline file is created 2019-05-10 18:30:48 +02:00
Mojca Lorber 86255b9037 Remove automatic saving on task and protocol description 2019-05-10 15:30:29 +02:00
Mojca Lorber d761a5cecb Make tiny mce saving at clicking anywhere outside of the editor works only for task and protocol description 2019-05-10 11:27:47 +02:00
Mojca Lorber 8e6413b031 Fix tiny mce visuals, saving and cursor position 2019-05-10 10:52:14 +02:00
aignatov-bio d08bdd771e
Fix task tag cut off (#1734) 2019-05-08 10:21:59 +02:00
Miha Mencin 0a7696200a
Merge pull request #1732 from aignatov-bio/ai-sci-3413-tinymce-step-not-loading
Clear step edit textarea status before going to edit mode [SCI-3413]
2019-05-07 16:36:04 +02:00
Miha Mencin b31645adbe
Merge pull request #1731 from aignatov-bio/ai-sci-3418-fix-window-scroll-after-exit-from-tinymce
Fix floating tool bar and scroll issue after leaving editor [SCI-3418]
2019-05-07 16:35:49 +02:00
Miha Mencin 60fd1a02c6
Merge pull request #1730 from aignatov-bio/ai-sci-3410-add-task-tag-on-enter
Add task tag on enter button [SCI-3410]
2019-05-07 16:35:34 +02:00
Miha Mencin 4b76151e40
Merge pull request #1727 from mlorb/ml-sci-3384
Fix bug when saving empty step description [SCI-3384]
2019-05-07 16:35:12 +02:00
Anton Ignatov ea545801aa Clear edit textarea status before going to editmode 2019-05-07 15:54:32 +02:00
Anton Ignatov 826ed63f17 Fix floating tool bar and scroll issue after leaving editor 2019-05-07 15:21:15 +02:00
Anton Ignatov 168424a035 Add tag on enter button 2019-05-07 14:47:44 +02:00
aignatov-bio 7d54f2ab01
Fix issue with TInyMCE upload plugin (#1723) 2019-05-07 10:24:02 +02:00
Mojca Lorber 46e8f80965 Fix bug when saving empty step description 2019-05-06 17:14:19 +02:00
Alex Kriuchykhin 3f0401bf9a
Merge pull request #1709 from okriuchykhin/ok_SCI_3398
Fix TinyMCE for results [SCI-3398]
2019-05-06 10:47:11 +02:00
aignatov-bio cc8a152278
Fix step attachments sorting (#1718) 2019-05-06 09:56:26 +02:00
Oleksii Kriuchykhin 077ad52d4b Fix TinyMCE for results [SCI-3398] 2019-04-26 17:37:01 +02:00
aignatov-bio dc7fddc60a
Improve task tags (#1708) 2019-04-26 15:38:33 +02:00