216 commits

Author	SHA1	Message	Date
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
mlorb	4bf9369bc5	refactor buttons	2018-03-29 13:58:14 +02:00
zmagod	c46da5cc67	fixes import protocol bug for guest user [fixes SCI-2197]	2018-03-19 16:10:28 +01:00
mz3944	bb21f6543c	Merge pull request #1004 from mz3944/mz-SCI-2011 ... Wrapping up the permissions [SCI-2011]	2018-03-06 07:10:40 +01:00
Zanz2	c5728c4018	Merge branch 'master' into null_step_crash_sci2043	2018-03-05 16:37:24 +01:00
Zanz2	5c93bd9676	Tables now have fixed 200 px height, which solves various issues and the scrollbar clipping to the bottom	2018-02-16 14:14:51 +01:00
Zanz2	673901fb01	Merge pull request #984 from Zanz2/yellow_flashv3_SCI1834 ... Fixed tables getting cut when certain attributes are at max length [SCI-1834]	2018-02-16 12:52:51 +01:00
Matej Zrimšek	5bda53eebf	Overall refactoring of all canaid permissions and code related to their calls.	2018-02-16 10:54:06 +01:00
Zanz2	b9db39f87d	removing last commit	2018-02-16 00:00:53 +01:00
Zanz2	95501eb046	saving work for later	2018-02-15 20:01:36 +01:00
Zanz2	ad8f93b57f	Merge pull request #991 from Zanz2/missplaced_authors_sci1808 ... protocols io authors are now real authors, not user that added the protocol [SCI-1808]	2018-02-15 16:53:39 +01:00
Matej Zrimšek	d6e7ef465c	Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]	2018-02-14 14:19:22 +01:00
Zanz2	128f15f984	Merge pull request #990 from Zanz2/code_formatting_sci1822 ... Commands in protocols io steps are now properly formatted like code [SCI-1822]	2018-02-08 08:52:44 +01:00