153 commits

Author	SHA1	Message	Date
Anton Ignatov	dcf94e78e1	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-08 14:03:41 +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	fef691d30f	Add error handling and secutiry checks	2019-05-02 16:12:25 +02:00
Mojca Lorber	7be151bd2d	Visual fixes for edit/add step on protocol	2019-04-30 14:57:50 +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	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
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
aignatov-bio	57b80280dc	Update attachemnts css (#1700)	2019-04-26 15:20:39 +02:00
Urban Rotnik	c41413234c	Use MS office icons for MS files	2019-04-26 09:29:39 +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
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	aa2dab2014	Merge branch 'features/note-section' into master-with-note-section	2019-04-23 10:31:37 +02:00
Urban Rotnik	ee3dc571e1	Update attachments view, add ordering on FE	2019-04-09 14:17:40 +02:00
Urban Rotnik	a3932cc67f	New asset box style update	2019-04-09 14:17:40 +02:00
Urban Rotnik	26cf8271a1	Change step header, remove vertical line	2019-04-05 10:57:38 +02:00
Jure Grabnar	cbf109f884	Fix create WOPI file button ... Closes SCI-3137	2019-04-04 17:05:25 +02:00
Jure Grabnar	613843d095	Temp commit	2019-04-04 16:58:55 +02:00
Jure Grabnar	9a4cd4fda2	Add file_present true	2019-04-04 16:57:36 +02:00
Jure Grabnar	3b8e6fa47c	Test office online	2019-04-04 16:57:36 +02:00
Jure Grabnar	26848ecaef	Refactor step position + 1 into a method	2019-04-03 13:07:30 +02:00
Miha Mencin	1b19e67c07	Revert "Step header changes, removed vertical line" ... This reverts commit b0f0ded87d.	2019-03-27 10:21:40 +01:00
Urban Rotnik	b0f0ded87d	Step header changes, removed vertical line ... SCI-3134	2019-03-25 17:25:13 +01:00
Anton Ignatov	4ec0a3c871	Update TinyMCE image loader for new fields	2019-03-22 10:52:26 +01:00
Anton Ignatov	bc58f0aecd	Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload	2019-03-21 11:48:51 +01:00
Anton Ignatov	07c2819163	refactoring tinymce image uploading	2019-03-20 14:46:54 +01:00
Oleksii Kriuchykhin	eb3d1ea6fe	Update RTE for step description [SCI-3111]	2019-03-19 17:42:49 +01:00
mz3944	4d460d14ea	Merge pull request #1378 from mz3944/mz-SCI-2861 ... All users in smart annotation have removed in brackets [SCI-2861]	2018-11-20 21:22:23 +01:00
Matej Zrimšek	c144d599fc	Fix user smart annotation showing as if the user is removed from team [SCI-2861]	2018-11-19 08:02:25 +01:00
Oleksii Kriuchykhin	fb309a12b9	Refactor result and step comments initialization [SCI-2830]	2018-11-13 16:57:42 +01:00
Luka Murn	63b4f7d909	Merge pull request #1274 from Zanz2/zz_in_app_tooltips_help_sci2662 ... Added Tooltips (bootstrap popovers) for various elements in scinote [SCI-2662]	2018-09-24 16:23:53 +02:00
Zanz2	22a565a684	Made fixes according to review	2018-09-14 13:07:09 +02:00
Zanz2	2d1d4c78bc	Merge branch 'master' into zz_in_app_tooltips_help_sci2662	2018-08-21 11:27:01 +02:00
Zanz2	36cca3d6aa	Implemented popover tooltips in all specified places, and fixed a bug where old popovers were open on page switch with ajax	2018-08-21 11:11:25 +02:00
Zanz2	1159a32ce2	Implemented all except 2 tooltips, debbugging why they dont work now	2018-08-20 13:03:30 +02:00
Zanz2	dfcaa40f1a	Merge branch 'master' into zz_refactor_icons_sci_2445_v2	2018-08-14 13:33:43 +02:00
Zanz2	45a4c1c598	changed the icons as per last comment in jira issue	2018-08-14 13:26:48 +02:00
Oleksii Kriuchykhin	6669beaf0e	Change icons throughout the rest of application [SCI-2445]	2018-07-27 15:27:08 +02:00