144 commits

Author	SHA1	Message	Date
aignatov-bio	6ed8757eb1	Merge branch 'features/task-flows' into develop	2020-09-17 14:52:05 +02:00
mlorb	bf707a11a9	Merge branch 'features/task-flows' into ml-sci-4976	2020-09-15 12:59:49 +02:00
Mojca Lorber	fe7d922cc5	Refactor complete step button	2020-09-15 11:18:15 +02:00
Oleksii Kriuchykhin	73cf620960	Add Completion and Uncompletion consequences [SCI-5004]	2020-09-14 20:06:48 +02:00
Urban Rotnik	0ae39678d4	Merge pull request #2832 from urbanrotnik/ur-sci-4982-lock-state ... Add error message for locked task, update some permission checks[SCI-4982]	2020-09-09 14:04:08 +02:00
Urban Rotnik	aa88b6bdb4	Move redirect to controller	2020-09-09 11:26:43 +02:00
Urban Rotnik	d9b691103c	Add permission error message	2020-09-08 15:42:30 +02:00
Oleksii Kriuchykhin	dea75553a3	Fix handling of duplicated step positions [SCI-4880]	2020-09-07 10:44:00 +02:00
Mojca Lorber	9dac4079f8	Replace old arrow with new one and remove redundant javascript for arrow collapsing	2020-09-04 14:43:30 +02:00
Oleksii Kriuchykhin	ed2eb81c68	Switch to position swapping when updating step position [SCI-4880]	2020-08-25 15:46:23 +02:00
Oleksii Kriuchykhin	a206890a8c	Fix step position adjusting on move and destroy [SCI-4880]	2020-08-25 15:46:21 +02:00
aignatov-bio	19a0d05467	Fix for checklist ordering	2020-08-14 12:32:39 +02:00
Urban Rotnik	a2ade6e0ec	Merge branch 'develop' into features/new-task-layout	2020-05-15 14:27:56 +02:00
aignatov-bio	c9545ddb19	Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab	2020-05-08 10:28:33 +02:00
Urban Rotnik	276351bbed	Remove Tooltips JS code	2020-04-28 12:51:59 +02:00
aignatov-bio	4f941610b2	Small layout changes for protocol	2020-04-24 11:50:03 +02:00
aignatov-bio	b53ad2850a	Remove old code	2020-04-09 17:31:28 +02:00
Oleksii Kriuchykhin	a518bfe023	Enable time fraction for task due date [SCI-4408]	2020-03-16 17:55:35 +01:00
Oleksii Kriuchykhin	11a5536af5	Improve file upload checks [SCI-4382]	2020-03-03 15:26:40 +01:00
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