228 commits

Author	SHA1	Message	Date
aignatov-bio	71b3228310	Update protocol preview style [SCI-3416] (#1729) ... * Update protocol appearance	2019-05-13 10:45:12 +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
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
Urban Rotnik	11a7a975af	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50:03 +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	6b45dcd475	Update eln export for new tinyMCE image format (#1680)	2019-04-19 14:44:40 +02:00
aignatov-bio	f47d0e2932	Merge pull request #1561 from aignatov-bio/ai-sci-3131-improve-image-file-upload ... Improve the image file upload into RTE input fields [SCI-3131]	2019-04-10 14:04:06 +02:00
Jure Grabnar	613843d095	Temp commit	2019-04-04 16:58:55 +02:00
Jure Grabnar	26848ecaef	Refactor step position + 1 into a method	2019-04-03 13:07:30 +02:00
Jure Grabnar	171b2eeedc	Remove the title of protocol steps when empty ... Closes SCI-3072	2019-03-25 09:36:56 +01:00
Anton Ignatov	4ec0a3c871	Update TinyMCE image loader for new fields	2019-03-22 10:52:26 +01:00
Anton Ignatov	07c2819163	refactoring tinymce image uploading	2019-03-20 14:46:54 +01:00
Matej Zrimšek	838455af0d	Fix protocols.io Date handling at import	2019-01-12 19:28:45 +01:00
Matej Zrimšek	b64df7d8cc	Fix additional Date and Time display formats	2019-01-08 06:29:37 +01:00
Alex Kriuchykhin	20e2cbf0ca	Merge pull request #1391 from okriuchykhin/ok_SCI_2880 ... Fix smart annotations rendering issues [SCI-2880]	2018-11-28 09:47:20 +01:00
Alex Kriuchykhin	d475197e65	Merge pull request #1396 from okriuchykhin/ok_SCI_2882 ... Fix handsontable initialization [SCI-2882]	2018-11-26 15:19:23 +01:00
Jure Grabnar	7812f70c2f	Merge pull request #1393 from jbargu/jg_2790_protocolsio_fix ... Protocols - import from protocols.io doesn't work	2018-11-26 14:56:25 +01:00
Oleksii Kriuchykhin	2e00f1546a	Fix handsontable initialization [SCI-2882]	2018-11-26 14:11:46 +01:00
Jure Grabnar	0086e4dcf3	Catch some of templates error when import protocols.io	2018-11-26 13:43:05 +01:00
Jure Grabnar	1c7a051551	Catch all errors on PIO import and show message	2018-11-23 20:47:48 +01:00
Jure Grabnar	2834edb286	Add command/subprotocol/safety for PIO	2018-11-23 20:13:34 +01:00
Jure Grabnar	c00b08b101	Add sw_package and dataset component for PIO	2018-11-23 19:44:10 +01:00
Jure Grabnar	2c8a7f8eca	Add last_modified evaluation for PIO import	2018-11-23 17:51:47 +01:00
Jure Grabnar	87d5e5029a	Fix publish_date in PIO import	2018-11-23 17:37:26 +01:00
Jure Grabnar	76c2da4bae	Add uniq tables	2018-11-23 16:30:29 +01:00
Oleksii Kriuchykhin	b926cadba4	Fix smartannotations rendering issues [SCI-2880]	2018-11-23 15:07:08 +01:00
Oleksii Kriuchykhin	380a96dcce	Add caching for step and result fragments [SCI-2830]	2018-11-14 11:57:53 +01:00
Zanz2	0ed62b7375	refactored according to PR review	2018-08-21 11:35:22 +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	38c36ab798	Fix modals handling with Turbolinks [SCI-2253]	2018-08-02 11:25:14 +02:00
Oleksii Kriuchykhin	b2bd1cb849	Upgrade to Turbolinks 5 [SCI-2253]	2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin	6669beaf0e	Change icons throughout the rest of application [SCI-2445]	2018-07-27 15:27:08 +02:00
Oleksii Kriuchykhin	a169639b3c	Fix uploaded file max size validation in JS [SCI-2590]	2018-07-05 15:23:26 +02:00
zmagod	db1944cc90	move maximum file size limit to an ENV variable [fixes SCI-2415]	2018-06-19 14:15:14 +02:00
mlorb	f02363dfce	fix error if user is not assigned to any teams	2018-05-25 17:14:22 +02:00
mlorb	c5e62207eb	fix bug with protocol preview does not open on protocols containing files	2018-05-24 11:51:27 +02:00
mlorb	c4ecfc4d38	Change icons throughout sciNote - navigation, project, task cards	2018-05-22 16:55:58 +02:00
mlorb	ed27a7a62a	some extra restyling/unifying off app	2018-05-11 18:02:17 +02:00
mlorb	7df40e56c7	UI/UX restyle - fixes throughout application part one	2018-05-08 16:33:42 +02:00
mlorb	88d5ba369d	Merge branch 'ux-release-1' into ml-sci-2244	2018-04-26 14:07:03 +02:00
Luka Murn	cb6fe50832	Merge branch 'master' into ux-release-1 ... Conflicts: app/assets/javascripts/repositories/index.js	2018-04-26 11:38:54 +02:00
mlorb	9e11f3b220	update buttons positions and wording throughout app	2018-04-25 13:57:12 +02:00
mlorb	c08d72be36	remove breadcrumbs throughout application	2018-04-17 17:00:04 +02:00
zmagod	233e73c709	adds asset preview link to repository row modal and to table row item [fixes SCI-2110]	2018-04-10 17:06:53 +02:00
Zanz2	cff2f933a0	removed byebug :D	2018-04-04 15:19:00 +02:00
Zanz2	ec743a7420	fixed the issue	2018-04-04 15:16:31 +02:00
Oleksii Kriuchykhin	3b7977ee3b	Merge latest changes from ux-release-1 [SCI-2217]	2018-04-04 14:20:34 +02:00
Zanz2	1606982966	found a hackish fix by doing a manual ajax call and some other things with jquery	2018-04-02 19:56:25 +02:00
Oleksii Kriuchykhin	cc5d8550b1	Refactor file preview modal [SCI-2217]	2018-03-30 11:50:28 +02:00