70 commits

Author	SHA1	Message	Date
Anton	ed1c4bcb69	Replace webpacker with jsbundling-rails [SCI-7926]	2023-03-30 13:39:57 +02:00
Martin Artnik	4e779e70a4	Merge branch 'develop' into features/tiny_mce_6	2023-01-04 14:21:02 +01:00
Martin Artnik	c828d02b99	Merge branch 'develop' into features/tiny_mce_6	2022-12-07 14:07:43 +01:00
Oleksii Kriuchykhin	78660fb1aa	Improve sorting of task results [SCI-7543]	2022-12-02 14:58:36 +01:00
Andrej	e05ad97498	Enable label print modal for smart annotations [SCI-7270]	2022-10-03 13:39:18 +02:00
Anton	73917ec4c0	Fix tinymce errors [SCI-7182]	2022-09-09 15:50:59 +02:00
artoscinote	44b7c866b5	Move tinymce to webpacker and upgrade to v6 [SCI-7081] (#4385) ... * Move tinymce to webpacker and upgrade to v6 [SCI-7081] * Cleanup and refactor [SCI-7081] * Clean up legacy plugins [SCI-7150] * Linter fix [SCI-7081]]	2022-09-05 11:29:19 +02:00
aignatov-bio	75f7e67602	Fix task navigation for archived experiments [SCI-6333] (#3753) ... Co-authored-by: Anton <anton@scinote.net>	2022-01-03 10:48:17 +01:00
Martin Artnik	e8f57e9e99	Reworked MyModule permissions [SCI-6056]	2021-09-14 11:08:35 +02:00
artoscinote	f839cb5256	Merge pull request #3464 from biosistemika/features/bioeddie-integration ... Features/bioeddie integration	2021-08-03 13:32:53 +02:00
aignatov-bio	786e74e4de	Add BioEddie integration [SCI-5654][SCI-5657][SCI-5658][SCI-5670] (#3391) ... * Add backend for bioeddie [SCI-5654] * Add modal for bioeddie [SCI-5654] * Add bio eddie editor to steps and results [SCI-5654] * Fix markup and code styling	2021-06-23 19:48:44 +02:00
Martin Artnik	b6588c2334	Reworked task view sidebar [SCI-5701]	2021-06-18 16:52:19 +02:00
Oleksii Kriuchykhin	29c83ffbb1	Merge branch 'develop' into features/new-reports	2021-05-21 11:04:17 +02:00
Oleksii Kriuchykhin	a307a16033	Fix handsontable assets inclusion in report templates [SCI-5692]	2021-05-04 16:05:19 +02:00
Oleksii Kriuchykhin	2f6194a99f	Remove canvas-to-blob library [SCI-5595]	2021-03-29 14:02:30 +02:00
aignatov-bio	df4297f6f7	Merge branch 'develop' into features/local_file_previews	2021-03-08 11:30:47 +01:00
aignatov-bio	b3faa170fb	PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018) ... * Add PDF Preview [SCI-5299]	2020-12-22 15:25:30 +01:00
Mojca Lorber	5cdab422df	Update layout of the navigation for experiments, tasks list and task page	2020-12-10 15:15:36 +01:00
Oleksii Kriuchykhin	dc15accc86	Update sidebar usages in partials [SCI-5177]	2020-12-03 10:21:53 +01:00
Mojca Lorber	a91aa6ce46	Fix Collapse and expand buttons position	2020-08-13 13:18:50 +02:00
aignatov-bio	15b5f9bb68	Add ordering for result page	2020-07-28 15:39:29 +02:00
aignatov-bio	7c4bfad09b	Add pagination to results page	2020-07-16 15:47:19 +02:00
Urban Rotnik	8fa024ed10	Remove all tooltips from HTML	2020-04-28 12:30:43 +02:00
Mojca Lorber	9045d1a8de	Fix tooltips appear wrongly	2020-03-22 17:47:13 +01:00
aignatov-bio	68646276f5	Replace bootstrap styles for button	2020-01-07 16:13:34 +01:00
aignatov-bio	ef3814ccec	Add new buttons to protocols, tasks, experiments, projects	2020-01-06 10:40:20 +01:00
Anton Ignatov	3339c1fbbf	Add MarvinJS to Result and TinyMce MarvinJS refactor	2019-07-15 17:17:14 +02:00
aignatov-bio	71b3228310	Update protocol preview style [SCI-3416] (#1729) ... * Update protocol appearance	2019-05-13 10:45:12 +02:00
Jure Grabnar	b12916b828	Add main functionality	2019-04-04 17:05:25 +02:00
mlorb	b7efce579b	fix tooltip style	2018-12-13 12:43:12 +01:00
Oleksii Kriuchykhin	60a19734b2	Enable caching for navigation sidebar [SCI-2757]	2018-11-29 11:28:36 +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
Oleksii Kriuchykhin	2e00f1546a	Fix handsontable initialization [SCI-2882]	2018-11-26 14:11:46 +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
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	15c124f3fd	replaced image icon with paperclip, to represent files, removed all image icons	2018-08-27 13:07:18 +02:00
Zanz2	2d1d4c78bc	Merge branch 'master' into zz_in_app_tooltips_help_sci2662	2018-08-21 11:27:01 +02:00
Zanz2	1159a32ce2	Implemented all except 2 tooltips, debbugging why they dont work now	2018-08-20 13:03:30 +02:00
Oleksii Kriuchykhin	6669beaf0e	Change icons throughout the rest of application [SCI-2445]	2018-07-27 15:27:08 +02:00
mlorb	c4ecfc4d38	Change icons throughout sciNote - navigation, project, task cards	2018-05-22 16:55:58 +02:00
mlorb	7df40e56c7	UI/UX restyle - fixes throughout application part one	2018-05-08 16:33:42 +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
Oleksii Kriuchykhin	3b7977ee3b	Merge latest changes from ux-release-1 [SCI-2217]	2018-04-04 14:20:34 +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
Matej Zrimšek	8ef6c8f91f	Refactored remaining experiment level permissions (and everything below it).	2018-02-14 14:39:07 +01:00
zmagod	c6bb20039b	adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]	2017-06-07 13:29:39 +02:00
zmagod	070a829c49	change new results hendlers	2017-05-12 10:02:33 +02:00