1451 commits

Author	SHA1	Message	Date
Urban Rotnik	bd1c5e4454	Fix focus for RTE	2019-10-04 14:55:14 +02:00
aignatov-bio	8176ce3a9d	Merge pull request #2123 from aignatov-bio/ai-sci-fix-merge-for-repository-datatable ... Fix merge for repository datatable [SCI-3957]	2019-10-04 12:59:22 +02:00
aignatov-bio	fcc1829660	Fix merge for repository datatable	2019-10-04 10:51:13 +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	289853e2e8	Do not remove draft on step cancel (temporary) ... Close SCI-3751	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	0a36372321	Fix placeholder positioning	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
mlorb	594124dad6	Merge pull request #2053 from mlorb/ml-sci-3637 ... Redesign of sorting button for projects/experiments cards [SCI-3637]	2019-09-27 12:44:44 +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
mlorb	2fd9345616	Merge pull request #2068 from mlorb/ml-sci-3816 ... Fix reloading of datatables header [SCI-3816]	2019-09-27 10:29:32 +02:00
mlorb	246634dbc4	Merge pull request #2069 from mlorb/ml-sci-3796 ... Fix inventory item selection when previewing file [SCI-3796]	2019-09-27 10:13:35 +02:00
Anton Ignatov	d048b7fb56	Fix cancel button for marvinJS images	2019-09-26 11:25:34 +02:00
aignatov-bio	ba50b19986	Merge pull request #2082 from aignatov-bio/ai-sci-3907-fix-dirty-event-after-update-marvinjs-image ... Fix dirty event after update marvinjs image [SCI-3907]	2019-09-25 13:51:36 +02:00
aignatov-bio	8a3b6b5cda	Merge pull request #2076 from aignatov-bio/ai-sci3769-fix-repository-row-import-export ... Fix repository row import/export [SCI-3769]	2019-09-24 12:44:18 +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
Anton Ignatov	c389972e2a	Fix JS error in recent protocol drop down	2019-09-24 09:47:04 +02:00
Oleksii Kriuchykhin	aabeeec95a	Move file preview generation to delayed job [SCI-3891]	2019-09-23 21:07:03 +02:00
Anton Ignatov	09e3b7c80b	Fix repository row import/export	2019-09-23 13:33:02 +02:00
Mojca Lorber	4263edf0cc	Fix inventory item selection when previewing file	2019-09-18 15:08:40 +02:00
aignatov-bio	c652bb0d44	Merge pull request #2066 from aignatov-bio/ai-sci-3878-fix-missing-expand-all-steps-button ... Fix missing expand all button [SCI-3878]	2019-09-18 14:59:29 +02:00
aignatov-bio	ce91759ee2	Merge pull request #2065 from aignatov-bio/ai-sci-3879-fix-step-table-error ... Fix step table error [SCI-3879]	2019-09-18 14:59:16 +02:00
Mojca Lorber	4d4a275c0d	Fix reloading of datatables header	2019-09-18 14:28:29 +02:00
Anton Ignatov	0adb016293	Fix missing expand all button	2019-09-18 12:33:48 +02:00
Anton Ignatov	146c725e89	Fix step table error	2019-09-18 11:47:33 +02:00
aignatov-bio	d028856fe0	Fix hidden buttons in inventory (#2063)	2019-09-18 11:36:30 +02:00
aignatov-bio	11f6517d0a	Fix duplicate marvinjs save (#2057)	2019-09-18 11:18:44 +02:00
Mojca Lorber	47ccf38662	Redesign of sorting button for projects/experiments cards	2019-09-16 14:43:12 +02:00
Oleksii Kriuchykhin	3509543e7b	Merge branch 'master' into ok_SCI_3881	2019-09-16 11:56:49 +02:00
Alex Kriuchykhin	b8a5b1b542	Merge pull request #2036 from okriuchykhin/ok_SCI_3815 ... Improve behavior of inventory items export modal [SCI-3815]	2019-09-09 11:08:02 +02:00
aignatov-bio	16ae00782a	Fix new step button on empty task [SCI-3826] (#2026) ... * Fix new step button on empty task * Fix markup	2019-09-09 10:43:38 +02:00
Oleksii Kriuchykhin	265047caf3	Improve behaviour of inventory items export modal [SCI-3815]	2019-09-09 10:38:47 +02:00
aignatov-bio	15dc25cee9	Fix handson table initialization [SCI-3749] (#2021) ... * Fix handson table initialization * Fix markup	2019-09-05 08:35:28 +02:00