2117 commits

Author	SHA1	Message	Date
Mojca Lorber	04e3b67968	Change the way buttons are toggled	2020-10-30 18:47:01 +01:00
Mojca Lorber	a52315fc79	Merge branch 'develop' into ml-sci-5033	2020-10-29 18:28:25 +01:00
Urban Rotnik	e923128c0e	Merge pull request #2927 from biosistemika/features/signature-requests ... Features/signature requests into develop	2020-10-29 14:48:25 +01:00
Urban Rotnik	bb5c703696	Merge pull request #2878 from urbanrotnik/ur-sci-5040 ... Support multiple file upload in TinyMCE fields [SCI-5040]	2020-10-29 14:14:38 +01:00
Oleksii Kriuchykhin	13fcfedf41	Refactor experiment workflow image generation [SCI-5063]	2020-10-29 13:16:09 +01:00
Urban Rotnik	54f38c8ded	Move validation before request	2020-10-29 08:45:55 +01:00
Miha Mencin	235f87e0d9	Merge pull request #2924 from biosistemika/release/1.20.2 ... Release/1.20.2	2020-10-28 13:58:25 +01:00
aignatov-bio	bb983af42f	Merge pull request #2911 from aignatov-bio/ai-sci-4579-update-checkbox-style ... Update checkbox style at repository and protocol datatable [SCI-4579]	2020-10-27 10:22:56 +01:00
Urban Rotnik	cb9db57645	Merge pull request #2909 from urbanrotnik/ur-sci-5006 ... Add lock icon to current task section on dashboard [SCI-5006]	2020-10-27 08:20:55 +01:00
Mojca Lorber	ec41bdd414	Move open mobile app button to main navigation	2020-10-26 09:28:44 +01:00
Urban Rotnik	b23f110184	Merge pull request #2905 from urbanrotnik/ur-sci-5085-active-filters ... Add mark for active filters [SCI-5085]	2020-10-25 16:06:59 +01:00
aignatov-bio	d6f8e156c1	Update checkbox style at repository and protocol datatable	2020-10-22 16:42:12 +02:00
Urban Rotnik	aa1520bfb8	Merge branch 'develop' into jg_sci_2228	2020-10-22 14:21:39 +02:00
Urban Rotnik	58013e215d	Add lock icon to current task section on dashboard	2020-10-22 08:09:51 +02:00
Mojca Lorber	6d7b55301f	Fix pwa url and change when banner is displayed	2020-10-21 14:56:20 +02:00
Urban Rotnik	e7d2d78935	Add mark for active filters	2020-10-20 16:45:54 +02:00
Mojca Lorber	23f01ac6a9	Add 'Open in APP' button to the task	2020-10-19 12:17:03 +02:00
Mojca Lorber	cf367baefa	Merge branch 'develop' into ml-sci-4841	2020-10-12 14:43:03 +02:00
aignatov-bio	5d6c9e78fd	Refactor dashboard layout	2020-10-06 16:09:26 +02:00
Mojca Lorber	4e4a4a2c4e	Change Complete step button on task step	2020-10-02 15:02:42 +02:00
Urban Rotnik	fc8704b520	Add fileUtils for sizeCheck, add url to textarea data attribute	2020-09-30 13:20:11 +02:00
Urban Rotnik	dc0072e707	Support multiple file upload in TinyMCE fields	2020-09-29 08:21:31 +02:00
aignatov-bio	7c3a3e4490	Small smart annotation fixes	2020-09-28 12:03:01 +02:00
Mojca Lorber	94fea75fda	Fix at long inventory name snapshot in title is not visible	2020-09-24 17:19:41 +02:00
Alex Kriuchykhin	d02d48f10f	Merge pull request #2869 from aignatov-bio/ai-sci-5038-fix-smart-annotaion-link-for-inventory-items ... Improve smart annotation in TinyMCE fields [SCI-5038]	2020-09-24 14:11:59 +02:00
aignatov-bio	4f7814cff4	Fix markup	2020-09-24 13:32:43 +02:00
aignatov-bio	ff33cb45e0	Improve smart annotation in TinyMCE fields	2020-09-24 13:29:20 +02:00
Mojca Lorber	f0a07acaf4	Some protocol repository CSS corrections	2020-09-23 20:54:49 +02:00
aignatov-bio	b6f038ff09	Merge pull request #2863 from aignatov-bio/ai-sci-5037-update-regexp-for-smart-annotation ... Update regexp for smart annotation [SCI-5037]	2020-09-23 16:39:24 +02:00
aignatov-bio	d719c26b6c	Add error handling for MarvinJS	2020-09-23 12:26:26 +02:00
aignatov-bio	21dcf1157c	Update regexp for smart annotation	2020-09-23 11:13:59 +02:00
aignatov-bio	7fa98de1da	Merge pull request #2859 from aignatov-bio/ai-sci-5036-fix-smart-annotation-cursor-position ... Fix smart annotation cursor position [SCI-5036]	2020-09-23 10:11:13 +02:00
mlorb	547af538b3	Merge pull request #2856 from mlorb/ml-sci-5009 ... Update empty states for smart annotation results and dismiss button [SCI-5009]	2020-09-22 15:31:22 +02:00
Mojca Lorber	8b3fce9656	Move it again	2020-09-22 11:38:32 +02:00
Mojca Lorber	0ad93d1288	Move close modal function to global event	2020-09-22 11:30:05 +02:00
aignatov-bio	2d667acdd1	Prevent tinymce edit mode when link click	2020-09-22 10:56:40 +02:00
aignatov-bio	fd7773a3dc	Fix smart annotation cursor position	2020-09-22 10:15:01 +02:00
Mojca Lorber	d9a78d20d7	Update empty states for smart annotation results and dismiss button	2020-09-18 08:50:01 +02:00
aignatov-bio	644f30fb10	Fix syntax for uglifier	2020-09-17 15:35:12 +02:00
aignatov-bio	e5d3fac112	Merge branch 'features/smart-annotation-improvements' into develop	2020-09-17 14:52:51 +02:00
aignatov-bio	6ed8757eb1	Merge branch 'features/task-flows' into develop	2020-09-17 14:52:05 +02:00
aignatov-bio	8dbc69aa31	Remove console.log	2020-09-17 14:48:26 +02:00
aignatov-bio	f11f54db33	Small fixes	2020-09-17 13:11:54 +02:00
aignatov-bio	b4102f3cfd	Add try/cath for JSON.parse	2020-09-17 11:43:08 +02:00
aignatov-bio	9cb26a1cb9	Fix markup	2020-09-17 11:43:08 +02:00
aignatov-bio	3691d21215	Fix multiple smart annotation selected	2020-09-17 11:43:08 +02:00
aignatov-bio	86667feb6b	Add remembered state for smart annotation	2020-09-17 11:43:07 +02:00
mlorb	4acd0c4cb9	Merge pull request #2841 from mlorb/ml-sci-4984 ... Add saving state for filters on dashboard [SCI-4984]	2020-09-17 09:53:16 +02:00
aignatov-bio	c26f8e7193	Add before send condition for status change	2020-09-16 15:23:53 +02:00
Urban Rotnik	c9de9e857f	Fix constant initialization	2020-09-16 12:15:23 +02:00