1674 commits

Author	SHA1	Message	Date
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
Anton Ignatov	995408e7fc	Fix protocol update error, rollback bootstrap gems and fix step name	2019-05-08 17:18:19 +02:00
Anton Ignatov	b5271bdd2c	Add remote api support	2019-05-08 15:00:36 +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	7c088c8432	Merge pull request #1725 from aignatov-bio/ai-sci-3411-due-date-in-one-line ... Fix due date position [SCI-3411]	2019-05-07 16:34:23 +02:00
Anton Ignatov	0e1e7c3d82	Fix button icon for uncomplete task	2019-05-06 16:35:46 +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
Alex Kriuchykhin	3f0401bf9a	Merge pull request #1709 from okriuchykhin/ok_SCI_3398 ... Fix TinyMCE for results [SCI-3398]	2019-05-06 10:47:11 +02:00
mlorb	df16b54be0	Merge pull request #1719 from mlorb/ml-sci-3399 ... Visual fixes for edit/add step on protocol [SCI-3399]	2019-05-06 10:33:28 +02:00
aignatov-bio	cc8a152278	Fix step attachments sorting (#1718)	2019-05-06 09:56:26 +02:00
Anton Ignatov	565a4959b4	small fixes and improvments	2019-05-03 15:24:28 +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	fef691d30f	Add error handling and secutiry checks	2019-05-02 16:12:25 +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
Anton Ignatov	7c55fcf0cf	Merge branch 'master' into master-with-note-section	2019-04-30 12:07:59 +02:00
mlorb	9f0983de77	Merge pull request #1706 from mlorb/ml-sci-3350 ... Change ownership of inventory items, when a user leaves a team [SCI-3350]	2019-04-30 10:39:14 +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
Anton Ignatov	2847ec7609	Add env variable and check for MarvinJS available	2019-04-28 17:08:18 +02:00
Anton Ignatov	260810fff8	Add editing mode for tinymce images	2019-04-28 16:16:31 +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	baa9b94a63	Add new graph button to step	2019-04-26 20:33:20 +02:00
Anton Ignatov	40c1c9aef7	Add marvin js modal	2019-04-26 18:24:21 +02:00
Oleksii Kriuchykhin	077ad52d4b	Fix TinyMCE for results [SCI-3398]	2019-04-26 17:37:01 +02:00
Miha Mencin	970a9b42ed	Update hilightjs github theme path	2019-04-26 17:29:14 +02:00
Urban Rotnik	dba1ccfc34	Merge pull request #1705 from urbanrotnik/ur-sci-3387-office-files-icons ... Show icons for office files [SCI-3387]	2019-04-26 15:53:53 +02:00
Urban Rotnik	090df87f48	Merge pull request #1703 from urbanrotnik/ur-sci-3382-duplicated-complete-button ... Remove duplicated button [SCI-3382]	2019-04-26 15:46:57 +02:00
aignatov-bio	57b80280dc	Update attachemnts css (#1700)	2019-04-26 15:20:39 +02:00
Mojca Lorber	eac90109f7	Change ownership of inventory items, when a user leaves a team	2019-04-26 10:47:08 +02:00
Urban Rotnik	c41413234c	Use MS office icons for MS files	2019-04-26 09:29:39 +02:00
Urban Rotnik	c94d3ce950	Remove duplicated button	2019-04-26 07:57:46 +02:00
Oleksii Kriuchykhin	66631ba26c	Fix loading more activities on task page [SCI-3390]	2019-04-25 23:50:00 +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
Urban Rotnik	0cf688be39	Merge pull request #1692 from urbanrotnik/ur-sci-3135-comments-section-changes ... Comments section changes [SCI-3135]	2019-04-25 14:18:05 +02:00
Anton Ignatov	0779ed598b	Reuse inline editing logic	2019-04-25 11:14:55 +02:00
Anton Ignatov	e52b985e7b	xMerge branch 'ur-sci-3135-comments-section-changes' of https://github.com/urbanrotnik/scinote-web into urbanrotnik-ur-sci-3135-comments-section-changes	2019-04-24 13:40:41 +02:00
aignatov-bio	84993ea3ef	Update protocol repository for new description format [SCI-3371] (#1689) ... * Update protocol repository for new description format * move image clone method to concerns	2019-04-24 13:34:56 +02:00
Oleksii Kriuchykhin	88123f5ecd	Fix paths for highlightjs-github-theme [SCI-3377]	2019-04-24 12:35:01 +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	b1dabaca15	New helper for file thumbnails	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