13 commits

Author	SHA1	Message	Date
Anton Ignatov	7e5c39d3e4	Merge branch 'master' into features/marvinjs-integration	2019-06-21 14:51:45 +02:00
aignatov-bio	83b9efd7dd	Fix right floating images in RTE editor (#1842)	2019-06-19 14:06:33 +02:00
Anton Ignatov	c9a29b12ba	Merge branch 'master' into features/marvinjs-integration	2019-05-31 10:27:14 +02:00
aignatov-bio	d97e803d01	Adding placeholder to TinyMCE editor (#1788)	2019-05-21 15:53:47 +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	8e6413b031	Fix tiny mce visuals, saving and cursor position	2019-05-10 10:52:14 +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	260810fff8	Add editing mode for tinymce images	2019-04-28 16:16:31 +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
Oleksii Kriuchykhin	b46f3566ef	Fix rendering of HTML in RTE fields [SCI-3111]	2019-03-19 23:32:24 +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