273 commits

Author	SHA1	Message	Date
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
Oleksii Kriuchykhin	b60bd79e2b	Change implementation of TinyMCE floating toolbar [SCI-3439]	2019-05-13 10:26:15 +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
Anton Ignatov	826ed63f17	Fix floating tool bar and scroll issue after leaving editor	2019-05-07 15:21:15 +02:00
aignatov-bio	7d54f2ab01	Fix issue with TInyMCE upload plugin (#1723)	2019-05-07 10:24:02 +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
Oleksii Kriuchykhin	077ad52d4b	Fix TinyMCE for results [SCI-3398]	2019-04-26 17:37:01 +02:00
aignatov-bio	9fbfa9215e	Add zoom to image annotation [SCI-3374] (#1694) ... * Add zoom to image annotation	2019-04-26 15:21:01 +02:00
Urban Rotnik	11a7a975af	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50:03 +02:00
Urban Rotnik	ea0368aa11	Attachments update for edit page	2019-04-23 13:50:47 +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	92d8e42a92	Add floating toolbar for tinymce (#1688)	2019-04-19 15:12:06 +02:00
aignatov-bio	ba1e3dc3c6	Add smooth loading for inline task and protoocl description editing (#1682)	2019-04-19 14:47:05 +02:00
Anton Ignatov	f1d801117d	disable zoom	2019-04-18 09:11:27 +02:00
Anton Ignatov	f6ecea42cf	Remove minimum zoom size	2019-04-17 18:51:52 +02:00
aignatov-bio	8d7cc57da1	Add zoom to image annotation and check jpeg file quality before save [SCI-3300] (#1654) ... * Add zoom to image annotation and check jpeg file quality before save * Move compression to front end * Move quality extractor to paperclip processor	2019-04-15 09:49:44 +02:00
aignatov-bio	a086f88541	Disable save button while image loading (#1646)	2019-04-09 09:07:58 +02:00
Oleksii Kriuchykhin	9e91e9e59d	Improve large image saving after editing [SCI-3289]	2019-04-03 16:31:56 +02:00
Oleksii Kriuchykhin	c47d243b1f	Disable WOPI edit button in read only mode [SCI-3281]	2019-04-02 17:45:26 +02:00
Oleksii Kriuchykhin	ffa7c5ecb2	Fix permition checks for file editing and make protocol preview files read only [SCI-3281]	2019-04-02 16:38:53 +02:00
Anton Ignatov	c9f9523210	Remove src when save description and rename token tag	2019-04-02 13:41:32 +02:00
aignatov-bio	daaa6a367b	Adding custom scrollbar to global activities [SCI-3206] (#1623) ... * Adding custom scrollbar to global activities	2019-04-02 09:56:50 +02:00
Anton Ignatov	46ee2557d4	Fix tooltip stuck bug	2019-03-27 13:53:32 +01:00
Anton Ignatov	fc7400bec9	fix markup	2019-03-22 13:42:12 +01:00
Anton Ignatov	65521533b4	change js.erb to js	2019-03-22 13:35:11 +01:00
Anton Ignatov	4ec0a3c871	Update TinyMCE image loader for new fields	2019-03-22 10:52:26 +01:00
aignatov-bio	723024202e	Image editor improvements [SCI - 3158, 3160, 3156, 3154] (#1563) ... * Improvments SCI - 3158, 3160, 3156, 3154	2019-03-22 09:27:50 +01:00
Anton Ignatov	bc58f0aecd	Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload	2019-03-21 11:48:51 +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
Oleksii Kriuchykhin	0c2b7959b6	Fix smart annotations in RTE [SCI-3111]	2019-03-20 11:41:36 +01:00
Oleksii Kriuchykhin	b46f3566ef	Fix rendering of HTML in RTE fields [SCI-3111]	2019-03-19 23:32:24 +01:00
Oleksii Kriuchykhin	eb3d1ea6fe	Update RTE for step description [SCI-3111]	2019-03-19 17:42:49 +01:00
aignatov-bio	6eae12efab	Updating permission check for image editing [SCI - 3153, 3159] (#1568) ... *Add permission check for assets editing * Add check for image format	2019-03-19 13:52:57 +01:00
aignatov-bio	a0a3c4b97f	Fix file format bug (#1569)	2019-03-19 11:06:36 +01:00
Oleksii Kriuchykhin	ba41afe449	Re-orginize TinyMCE init callback [SCI-3062][SCI-3071]	2019-03-15 11:07:57 +01:00
Oleksii Kriuchykhin	2cc170c3d4	Close RTE on save [SCI-3062][SCI-3071]	2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin	a822227383	Add rich text editor to task and protocol description [SCI-3062][SCI-3071]	2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin	af94f79f0d	Submit image as FormData [SCI-2879]	2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin	feb75f62e1	Add workaround for image caching in fabric js [SCI-2855]	2019-03-11 15:10:32 +01:00
Oleksii Kriuchykhin	80e525fd97	Improve image editor behaviour [SCI-2855]	2019-03-11 15:09:49 +01:00
Oleksii Kriuchykhin	89e968c410	Add tui.image-editor [SCI-2815]	2019-03-11 15:08:15 +01:00
Oleksii Kriuchykhin	2769add4d9	Disable edit button for unsupported WOPI formats [SCI-2904]	2018-12-31 18:10:12 +01:00
mlorb	39b01bc8ed	fix in app help window does not close in some cases	2018-11-21 10:19:41 +01:00