372 commits

Author	SHA1	Message	Date
aignatov-bio	198697ff23	Fix avatar localization	2019-10-11 12:22:09 +02:00
aignatov-bio	54627faeb3	Fix tests	2019-10-11 11:46:51 +02:00
aignatov-bio	521a367960	Add predefined avatars	2019-10-11 11:46:51 +02:00
aignatov-bio	1f43f35073	First modal	2019-10-11 11:46:51 +02:00
aignatov-bio	a930f7affd	Fix async assets results	2019-10-08 19:51:03 +02:00
Urban Rotnik	bd1c5e4454	Fix focus for RTE	2019-10-04 14:55:14 +02:00
aignatov-bio	a39a95d2a7	Merge pull request #2122 from aignatov-bio/ai-sci-disable-autosave-feature ... Disable autosave notification feature	2019-10-04 09:17:16 +02:00
aignatov-bio	af69e12d1e	Disable autosave notification feature	2019-10-04 09:13:42 +02:00
aignatov-bio	0cbc699c62	Remove image icon from preview	2019-10-03 15:44:03 +02:00
aignatov-bio	e35617208d	Merge pull request #2118 from aignatov-bio/ai-sci-3841-enable-additional-tools ... Enable additional tools [SCI-3841]	2019-10-03 11:24:31 +02:00
aignatov-bio	65b1e0c041	Fix reload page	2019-10-03 11:19:12 +02:00
aignatov-bio	9000438025	Enable additional tools	2019-10-03 11:07:19 +02:00
aignatov-bio	301b37cccd	Fix duplicate code in file preview	2019-10-03 10:55:54 +02:00
Oleksii Kriuchykhin	dd7f2fe095	Fix large preview for documents [SCI-3938]	2019-10-01 16:14:28 +02:00
Oleksii Kriuchykhin	6a6a43f5ff	Improve file processing indicator [SCI-3938]	2019-10-01 15:20:46 +02:00
aignatov-bio	b8e917455a	Merge pull request #2104 from aignatov-bio/ai-sci-3907-update-marvin-js-asset-in-result-on-cancel ... Update MarvinJS asset on result text cancel [SCI-3907]	2019-10-01 13:39:01 +02:00
Anton Ignatov	33497d11a3	Merge branch 'activestorage_migration'	2019-10-01 10:36:05 +02:00
Anton Ignatov	859c5931a4	Update MArvinJS asset on result text cancel	2019-09-30 16:09:43 +02:00
Jure Grabnar	070c307721	Implement style changes suggested by Anton	2019-09-30 14:27:00 +02:00
Jure Grabnar	8441c5b6ed	Add anchor to result text editing	2019-09-30 11:34:39 +02:00
Jure Grabnar	477e41a96d	Refactor I18n strings for tiny_mce	2019-09-30 11:34:39 +02:00
Jure Grabnar	b3cafcec7c	Add restore draft notification to all models ... Close SCI-3751	2019-09-30 11:34:39 +02:00
Jure Grabnar	b286e4adfd	Fix styles for notification bar	2019-09-30 11:34:39 +02:00
Jure Grabnar	4f2182e2f5	Remove restoredraft icon	2019-09-30 11:34:39 +02:00
Jure Grabnar	6e33baa995	Add skeleton restore-draft notification for module description	2019-09-30 11:32:38 +02:00
Alex Kriuchykhin	53caaf647b	Merge pull request #2080 from okriuchykhin/ok_SCI_3891 ... Move file preview generation to delayed job [SCI-3891]	2019-09-27 10:50:21 +02:00
Anton Ignatov	d048b7fb56	Fix cancel button for marvinJS images	2019-09-26 11:25:34 +02:00
Jure Grabnar	ae83ef749f	Add tables functionality in tinymce ... Close SCI-3821	2019-09-24 12:44:00 +02:00
Anton Ignatov	6d81727bf1	Fix dirty event after update marvinjs image	2019-09-24 10:37:51 +02:00
Oleksii Kriuchykhin	aabeeec95a	Move file preview generation to delayed job [SCI-3891]	2019-09-23 21:07:03 +02:00
aignatov-bio	11f6517d0a	Fix duplicate marvinjs save (#2057)	2019-09-18 11:18:44 +02:00
aignatov-bio	737f9e572c	Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976) ... * Replace marvinJS logo and fix some merge issues * Fix tests	2019-08-13 11:04:19 +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
Oleksii Kriuchykhin	973efa55e1	Merge branch 'master' into ok_SCI_3678	2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin	d942788581	Implement read permissions checks for ActiveStorage controllers [SCI-3680]	2019-08-07 15:21:41 +02:00
aignatov-bio	aa5061a1af	Add custom context menu to TinyMCE images [SCI-3582] (#1944) ... * Add custom context menu to TinyMCE images * Fix permission check for unsaved objects * Fix markup	2019-08-07 10:28:42 +02:00
Oleksii Kriuchykhin	f3849e2ece	Fix TinyMCE plugings config [SCI-3679]	2019-08-06 15:46:55 +02:00
Oleksii Kriuchykhin	eaf9d59819	Merge branch 'activestorage_migration' into ok_SCI_3679	2019-08-06 15:27:31 +02:00
Oleksii Kriuchykhin	423528933e	Switch to global JS constants [SCI-3679]	2019-08-06 15:06:19 +02:00
Oleksii Kriuchykhin	5e65b07bdc	Implement DirectUpload for Steps, Results and Inventories [SCI-3679]	2019-07-25 18:00:24 +02:00
Jure Grabnar	06657dbdf6	Add spinner when editing image annotation (#1948) ... Add spinner when editing image annotation	2019-07-25 11:28:13 +02:00
Urban Rotnik	1b9db2f61e	Fix for file annotating on Safari	2019-07-24 14:16:29 +02:00
Jure Grabnar	cdad167be2	Add spinner when editing image annotation ... Close SCI-3710	2019-07-23 15:02:33 +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
aignatov-bio	894e201e1b	Fix big file issue in step attachments [SCI-3682] (#1919) ... * Fix big file issue in step atachments * Fix markup	2019-07-15 11:00:01 +02:00
Anton Ignatov	ba1d6d45ca	Fix merging issues	2019-07-12 15:47:15 +02:00
Anton Ignatov	ffd415d409	Inital refactor for Assets model	2019-07-12 15:02:06 +02:00