36 commits

Author	SHA1	Message	Date
Martin Artnik	136440f704	Merge pull request #6582 from G-Chubinidze/gc_SCI_9521 ... Issues with attachment previews [SCI-9521]	2023-11-09 10:48:18 +01:00
Martin Artnik	f26950f249	Fix initialization of MarvinJS [SCI-9642]	2023-11-06 14:16:15 +01:00
Giga Chubinidze	d84e6e2e4e	Issues with attachment previews [SCI-9521]	2023-11-06 13:06:59 +04:00
Martin Artnik	16ebf0cbe8	Revert "Revert "Refocus on tinymce editor after marvinjs img update [SCI-9515]""	2023-11-02 13:18:50 +01:00
Martin Artnik	73ec9848ea	Merge pull request #6470 from artoscinote/ma_SCI_9411 ... Fix MarvinJS loading race condition [SCI-9411]	2023-10-18 15:23:21 +02:00
Martin Artnik	947d5e6744	Fix MarvinJS loading race condition [SCI-9411]	2023-10-17 15:15:11 +02:00
Martin Artnik	3021297f73	Revert "Refocus on tinymce editor after marvinjs img update [SCI-9515]"	2023-10-13 14:40:52 +02:00
Ivan Kljun	d80d0af5b8	Refocus on tinymce editor after marvinjs img update [SCI-9515]	2023-10-12 16:35:36 +02:00
Martin Artnik	5c7ee78cd6	Fix attachment issues [SCI-9410]	2023-10-05 15:44:41 +02:00
sboursen-scinote	d631098d9a	Fix multiple issues with edit sequence on task protocol [SCI-8966] ... - Fix edit button label and icon - Fix preview modal for gene-sequence	2023-08-16 17:01:43 +02:00
wandji	a1e6392a45	Fix bugs with jquery3 upgrade [SCI-8973] (#5933) ... * Fix bugs with jquery3 upgrade [SCI-8973] * Remove deprecated jquery method (.error, .completed, .success) [SCI-8973] * Fix linter error [SCI-8973]	2023-08-09 10:33:58 +02:00
Alex Kriuchykhin	87153b8899	Improve filtering of user supplied data in the input and text fields [SCI-8095] (#5106)	2023-03-09 11:38:47 +01:00
Martin Artnik	4e779e70a4	Merge branch 'develop' into features/tiny_mce_6	2023-01-04 14:21:02 +01:00
ajugo	ae55935002	Add missing microinteractions on step editing [SCI-7575] (#4711)	2023-01-03 12:25:22 +01:00
Anton	73917ec4c0	Fix tinymce errors [SCI-7182]	2022-09-09 15:50:59 +02:00
Anton	1ebd4046cd	Update tinyMCE marvinjs plugin [SCI-7154]	2022-09-06 13:05:56 +02:00
artoscinote	44b7c866b5	Move tinymce to webpacker and upgrade to v6 [SCI-7081] (#4385) ... * Move tinymce to webpacker and upgrade to v6 [SCI-7081] * Cleanup and refactor [SCI-7081] * Clean up legacy plugins [SCI-7150] * Linter fix [SCI-7081]]	2022-09-05 11:29:19 +02:00
artoscinote	c33b426c03	Add marvinJS integration [SCI-6831] (#4113)	2022-05-24 11:30:15 +02:00
aignatov-bio	53b47412ee	Update marvinJS image generation [SCI-5834]	2021-06-24 22:36:51 +02:00
aignatov-bio	d99e279ecc	Add gallery to file preview	2020-10-29 14:30:26 +01:00
aignatov-bio	c56f7912ef	Update file preview	2020-10-29 14:23:32 +01:00
aignatov-bio	d719c26b6c	Add error handling for MarvinJS	2020-09-23 12:26:26 +02:00
aignatov-bio	15b5f9bb68	Add ordering for result page	2020-07-28 15:39:29 +02:00
aignatov-bio	15de84ff2f	Not include marvinJS library, if marvinJS disabled	2020-06-08 09:59:26 +02:00
aignatov-bio	0cbc699c62	Remove image icon from preview	2019-10-03 15:44:03 +02:00
aignatov-bio	9000438025	Enable additional tools	2019-10-03 11:07:19 +02:00
Anton Ignatov	d048b7fb56	Fix cancel button for marvinJS images	2019-09-26 11:25:34 +02:00
Anton Ignatov	6d81727bf1	Fix dirty event after update marvinjs image	2019-09-24 10:37:51 +02:00
aignatov-bio	11f6517d0a	Fix duplicate marvinjs save (#2057)	2019-09-18 11:18:44 +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	ad7130d3b2	Simplify TinyMCE assets for MarvinJS	2019-07-19 09:27:03 +02:00
Anton Ignatov	d79fec3345	Move TinyMCE logic to correspond controller	2019-07-16 15:51:44 +02:00
Anton Ignatov	1e8663548e	Add MarvinJS assets to TinyMCE	2019-07-16 13:40:54 +02:00
Anton Ignatov	3339c1fbbf	Add MarvinJS to Result and TinyMce MarvinJS refactor	2019-07-15 17:17:14 +02:00
Anton Ignatov	ffd415d409	Inital refactor for Assets model	2019-07-12 15:02:06 +02:00
aignatov-bio	a08d93376c	Add promo modal when MarvinJS disabled (#1872)	2019-07-01 11:51:13 +02:00

Renamed from app/assets/javascripts/marvinjs_editor.js (Browse further)