574 commits

Author	SHA1	Message	Date
Anton Ignatov	259b75a6ba	Merge branch 'master' into features/marvinjs-integration	2019-05-16 09:28:48 +02:00
aignatov-bio	24e30867da	Add smart annotation to comments [SCI-3458] (#1768) ... * Add smart annotation to comments	2019-05-15 14:59:15 +02:00
aignatov-bio	f970eea525	Some gui fixes (#1757)	2019-05-14 09:43:02 +02:00
Oleksii Kriuchykhin	4b1c4bd140	Fix handling of proccessing step attachments [SCI-3381]	2019-05-13 17:12:06 +02:00
Miha Mencin	5ff344c208	Merge pull request #1746 from biosistemika/lm-sci-3426 ... Changes to create new office file button [SCI-3426]	2019-05-13 10:55:58 +02:00
aignatov-bio	71b3228310	Update protocol preview style [SCI-3416] (#1729) ... * Update protocol appearance	2019-05-13 10:45:12 +02:00
aignatov-bio	2010b3ad8f	Fix step comments bugs (#1751)	2019-05-13 09:49:53 +02:00
Anton Ignatov	e5b4adcc25	Merge branch 'master-with-note-section' into features/marvinjs-integration	2019-05-11 20:51:01 +02:00
aignatov-bio	634b58bd6a	Various UX improvements for note section [SCI-3444] (#1742) ... * Various UX improvments for note section	2019-05-11 16:04:28 +02:00
Luka Murn	584cf4b93b	Change Office icon on the create New Office buttons	2019-05-10 17:51:29 +02:00
mlorb	110c4ec460	Merge pull request #1743 from mlorb/ml-sci-3386 ... Fix tiny mce visuals, saving and cursor position [SCI-3386]	2019-05-10 17:45:12 +02:00
aignatov-bio	f684ddd365	Change dropdown highlight color and fix task tag position [SCI-3410] (#1735) ... * Change dropdown highlight color and fix task tag position	2019-05-10 16:37:59 +02:00
Mojca Lorber	8e6413b031	Fix tiny mce visuals, saving and cursor position	2019-05-10 10:52:14 +02:00
Anton Ignatov	995408e7fc	Fix protocol update error, rollback bootstrap gems and fix step name	2019-05-08 17:18:19 +02:00
Anton Ignatov	dcf94e78e1	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-08 14:03:41 +02:00
Anton Ignatov	2a294c408f	Fix due date alignment and chage header structure from bootstrap to flexbox	2019-05-06 16:20:00 +02:00
Anton Ignatov	88e67a16c2	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-02 16:16:03 +02:00
Anton Ignatov	f73dd38780	Add image editor to tinymce drawings	2019-04-30 18:32:59 +02:00
Anton Ignatov	4d0d5aa014	Adding team sketches selector	2019-04-30 17:32:55 +02:00
Mojca Lorber	7be151bd2d	Visual fixes for edit/add step on protocol	2019-04-30 14:57:50 +02:00
aignatov-bio	60296419e8	Update project card due date dropdown (#1716)	2019-04-30 13:30:09 +02:00
aignatov-bio	26dc1a0a4a	Note section css issues [SCI-3378] (#1715) ... * Fix step name width bug	2019-04-30 10:23:44 +02:00
aignatov-bio	7d197a6f02	Remove gray step headers (#1713)	2019-04-29 14:06:55 +02:00
Anton Ignatov	f80d881847	Fix markup	2019-04-28 19:11:41 +02:00
Anton Ignatov	260810fff8	Add editing mode for tinymce images	2019-04-28 16:16:31 +02:00
Anton Ignatov	193edfbc35	Add marvin js support to TinyMCE	2019-04-27 22:54:59 +02:00
Anton Ignatov	54731856f0	Finish step chemical attachments	2019-04-27 19:08:40 +02:00
Anton Ignatov	cf4ff41ec6	Add delete feature	2019-04-27 13:51:35 +02:00
Anton Ignatov	46f0e0c0c2	Add marvin js assets to assets sort and name field	2019-04-27 12:46:45 +02:00
Anton Ignatov	fe620c4a63	Add marvin model and controller	2019-04-26 22:59:38 +02:00
Anton Ignatov	40c1c9aef7	Add marvin js modal	2019-04-26 18:24:21 +02:00
Urban Rotnik	3b063348ce	Hide remove icon and show only on attachment hover	2019-04-26 15:51:35 +02:00
Urban Rotnik	88050b9b93	Merge pull request #1707 from urbanrotnik/ur-sci-3383-task-name-not-editable ... Fix for inline editing on Firefox [SCI-3383]	2019-04-26 15:46:37 +02:00
aignatov-bio	dc7fddc60a	Improve task tags (#1708)	2019-04-26 15:38:33 +02:00
aignatov-bio	9fbfa9215e	Add zoom to image annotation [SCI-3374] (#1694) ... * Add zoom to image annotation	2019-04-26 15:21:01 +02:00
aignatov-bio	57b80280dc	Update attachemnts css (#1700)	2019-04-26 15:20:39 +02:00
Urban Rotnik	8413ed5ab0	Fix for inline editing on Firefox	2019-04-26 14:22:18 +02:00
aignatov-bio	1a860037f7	Update reports for new RTE [SCI-3263] (#1691) ... * Update reports for new RTE	2019-04-25 16:16:43 +02:00
Anton Ignatov	0779ed598b	Reuse inline editing logic	2019-04-25 11:14:55 +02:00
Urban Rotnik	774521df7a	Changes to comments section in Task Steps	2019-04-23 15:02:58 +02:00
Urban Rotnik	11a7a975af	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50:03 +02:00
Urban Rotnik	7a2bfc12ce	Remove form_asset partial	2019-04-23 13:50:48 +02:00
Urban Rotnik	ea0368aa11	Attachments update for edit page	2019-04-23 13:50:47 +02:00
Anton Ignatov	7d60eb5572	Fix migration issues	2019-04-23 11:11:22 +02:00
Anton Ignatov	aa2dab2014	Merge branch 'features/note-section' into master-with-note-section	2019-04-23 10:31:37 +02:00
aignatov-bio	92d8e42a92	Add floating toolbar for tinymce (#1688)	2019-04-19 15:12:06 +02:00
aignatov-bio	ba1e3dc3c6	Add smooth loading for inline task and protoocl description editing (#1682)	2019-04-19 14:47:05 +02:00
aignatov-bio	6b45dcd475	Update eln export for new tinyMCE image format (#1680)	2019-04-19 14:44:40 +02:00
aignatov-bio	063f02dc56	Add ability to select filters with keyboard [SCI-3200] (#1649) ... * Add ability to select fitlers with keyboard	2019-04-15 10:30:08 +02:00
Mojca Lorber	bf2e9e8194	Rename button load more system notification to fix the bug	2019-04-12 11:58:47 +02:00