29 commits

Author	SHA1	Message	Date
Anton Ignatov	259b75a6ba	Merge branch 'master' into features/marvinjs-integration	2019-05-16 09:28:48 +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	b60bd79e2b	Change implementation of TinyMCE floating toolbar [SCI-3439]	2019-05-13 10:26:15 +02:00
Anton Ignatov	65eff67926	Fix merge	2019-05-11 20:54:52 +02:00
Anton Ignatov	e5b4adcc25	Merge branch 'master-with-note-section' into features/marvinjs-integration	2019-05-11 20:51:01 +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	dcf94e78e1	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-08 14:03:41 +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	565a4959b4	small fixes and improvments	2019-05-03 15:24:28 +02:00
Anton Ignatov	fef691d30f	Add error handling and secutiry checks	2019-05-02 16:12:25 +02:00
Anton Ignatov	f73dd38780	Add image editor to tinymce drawings	2019-04-30 18:32:59 +02:00
Anton Ignatov	f80d881847	Fix markup	2019-04-28 19:11:41 +02:00
Anton Ignatov	2847ec7609	Add env variable and check for MarvinJS available	2019-04-28 17:08:18 +02:00
Anton Ignatov	260810fff8	Add editing mode for tinymce images	2019-04-28 16:16:31 +02:00
Anton Ignatov	193edfbc35	Add marvin js support to TinyMCE	2019-04-27 22:54:59 +02:00
Oleksii Kriuchykhin	077ad52d4b	Fix TinyMCE for results [SCI-3398]	2019-04-26 17:37:01 +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	4ec0a3c871	Update TinyMCE image loader for new fields	2019-03-22 10:52:26 +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
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