125 commits

Author	SHA1	Message	Date
aignatov-bio	e022f7a096	Fix small css issues	2020-01-20 15:48:51 +01:00
Urban Rotnik	1d180f3688	Fix for step description overwriting ... [SCI-4067]	2019-11-11 10:31:55 +01:00
Anton Ignatov	33497d11a3	Merge branch 'activestorage_migration'	2019-10-01 10:36:05 +02:00
Jure Grabnar	070c307721	Implement style changes suggested by Anton	2019-09-30 14:27:00 +02:00
Jure Grabnar	289853e2e8	Do not remove draft on step cancel (temporary) ... Close SCI-3751	2019-09-30 11:34:39 +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
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
Oleksii Kriuchykhin	3509543e7b	Merge branch 'master' into ok_SCI_3881	2019-09-16 11:56:49 +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
aignatov-bio	15dc25cee9	Fix handson table initialization [SCI-3749] (#2021) ... * Fix handson table initialization * Fix markup	2019-09-05 08:35:28 +02:00
aignatov-bio	e682a3e5d9	Fix steps description and table saving (#1984)	2019-08-21 11:05:49 +02:00
Oleksii Kriuchykhin	973efa55e1	Merge branch 'master' into ok_SCI_3678	2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin	eaf9d59819	Merge branch 'activestorage_migration' into ok_SCI_3679	2019-08-06 15:27:31 +02:00
Oleksii Kriuchykhin	5e65b07bdc	Implement DirectUpload for Steps, Results and Inventories [SCI-3679]	2019-07-25 18:00:24 +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
Anton Ignatov	57a273d5d0	Merge branch 'activestorage_migration' into features/marvinjs-integration	2019-07-12 11:34:41 +02:00
aignatov-bio	d2849c88fd	Remove draft after save step (#1878)	2019-07-03 09:18:52 +02:00
aignatov-bio	378e91b426	Fix links on search page (#1867)	2019-07-02 11:21:00 +02:00
Oleksii Kriuchykhin	4ea6b56582	Fix Step and Result file previews [SCI-3539]	2019-07-01 23:30:20 +02:00
aignatov-bio	a08d93376c	Add promo modal when MarvinJS disabled (#1872)	2019-07-01 11:51:13 +02:00
Oleksii Kriuchykhin	2f39b7f22b	Fix TinyMCE editor initialization for step editing [SCI-3511]	2019-06-28 12:06:04 +02:00
Anton Ignatov	7e5c39d3e4	Merge branch 'master' into features/marvinjs-integration	2019-06-21 14:51:45 +02:00
Alex Kriuchykhin	db7c6435b3	Merge pull request #1851 from okriuchykhin/ok_SCI_3436 ... Implement saving of attachments ordering on steps [SCI-3436]	2019-06-20 11:31:15 +02:00
aignatov-bio	609c408c77	Fix error on new step saving command (#1845)	2019-06-19 14:06:25 +02:00
aignatov-bio	5734d0cdd7	Fix TinyMCE field selector for steps (#1844)	2019-06-19 14:06:16 +02:00
aignatov-bio	81d10c8ce4	Remove recent protocol button on new step (#1841)	2019-06-19 12:49:22 +02:00
Oleksii Kriuchykhin	a855eade4c	Merge branch 'master' into ok_SCI_3461	2019-06-11 17:48:02 +02:00
Oleksii Kriuchykhin	6e1a7a3392	Implement saving of attachments ordering on steps [SCI-3436]	2019-06-11 10:08:33 +02:00
aignatov-bio	d207cf5dce	Refactored comments over SciNote [SCI-3505] (#1808) ... * Preparing helpers for comments * Refactored comments over scinote * Update events	2019-06-04 14:40:21 +02:00
Anton Ignatov	c9a29b12ba	Merge branch 'master' into features/marvinjs-integration	2019-05-31 10:27:14 +02:00
Alex Kriuchykhin	c49dbe5c44	Merge pull request #1810 from okriuchykhin/ok_SCI_3511 ... Fix RTE editor initialization for new step in protocol [SCI-3511]	2019-05-30 12:54:36 +02:00
Oleksii Kriuchykhin	d061aec5cd	Fix RTE editor initialization for new step in protocol [SCI-3511]	2019-05-29 18:33:20 +02:00
Oleksii Kriuchykhin	2c9ced0c75	Fix step numbering update on reposition [SCI-3507]	2019-05-29 12:20:35 +02:00
aignatov-bio	fb30e6b6e5	Add check for refreshProtocolStatusBar function exist (#1794)	2019-05-22 10:31:29 +02:00
Oleksii Kriuchykhin	84a2ad4487	Refactor the async thumbnail reloading (spinner) [SCI-3461]	2019-05-21 17:29:33 +02:00
mlorb	be0393e642	Merge pull request #1785 from biosistemika/lm-ml-sci-3193 ... Update protocol status bar upon protocol changing [SCI-3193]	2019-05-21 15:28:58 +02:00
Mojca Lorber	b479a6a145	Cover all use cases for updating protocol status bar	2019-05-20 16:09:43 +02:00
aignatov-bio	20b626d791	Fix warning message issue in step description [SCI-3479] (#1778) ... * Fix warning message issue	2019-05-20 11:19:53 +02:00
Anton Ignatov	dcf94e78e1	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-08 14:03:41 +02:00
Miha Mencin	0a7696200a	Merge pull request #1732 from aignatov-bio/ai-sci-3413-tinymce-step-not-loading ... Clear step edit textarea status before going to edit mode [SCI-3413]	2019-05-07 16:36:04 +02:00
Anton Ignatov	ea545801aa	Clear edit textarea status before going to editmode	2019-05-07 15:54:32 +02:00
Mojca Lorber	46e8f80965	Fix bug when saving empty step description	2019-05-06 17:14:19 +02:00
aignatov-bio	cc8a152278	Fix step attachments sorting (#1718)	2019-05-06 09:56:26 +02:00
Anton Ignatov	2847ec7609	Add env variable and check for MarvinJS available	2019-04-28 17:08:18 +02:00
Anton Ignatov	54731856f0	Finish step chemical attachments	2019-04-27 19:08:40 +02:00
Anton Ignatov	46f0e0c0c2	Add marvin js assets to assets sort and name field	2019-04-27 12:46:45 +02:00
Urban Rotnik	11a7a975af	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50:03 +02:00