6628 commits

Author	SHA1	Message	Date
Urban Rotnik	f5118e5461	Merge pull request #2901 from okriuchykhin/ok_SCI_5063 ... Refactor experiment workflow image generation [SCI-5063]	2020-10-29 13:55:23 +01:00
Urban Rotnik	c6a891bcea	Merge pull request #2912 from urbanrotnik/ur-sci-5091 ... Add current team to smart annotations permission check [SCI-5091]	2020-10-29 13:32:29 +01:00
Oleksii Kriuchykhin	13fcfedf41	Refactor experiment workflow image generation [SCI-5063]	2020-10-29 13:16:09 +01:00
Urban Rotnik	25d050cec4	Add current team to smar annotations permission check	2020-10-29 12:17:40 +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
Alex Kriuchykhin	8ef5bafc1a	Revert "Init user session for devise controllers after token auth [SCI-5123]"	2020-10-27 13:20:14 +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
Alex Kriuchykhin	792edb62d6	Merge pull request #2919 from okriuchykhin/ok_SCI_5123 ... Init user session for devise controllers after token auth [SCI-5123]	2020-10-26 17:21:56 +01:00
Oleksii Kriuchykhin	00a2f5f41b	Init user session for devise controllers after token auth [SCI-5123]	2020-10-26 16:35:49 +01:00
Miha Mencin	840b84aa9a	Merge pull request #2916 from okriuchykhin/ok_SCI_5139 ... Add activities for step completion and checklist toggling through API [SCI-5139]	2020-10-26 14:19:31 +01:00
mlorb	b941c8c9d4	Merge pull request #2917 from mlorb/ml-sci-5119 ... Move open mobile app button to main navigation [SCI-5119]	2020-10-26 14:02:57 +01:00
Alex Kriuchykhin	050e1e0973	Merge pull request #2913 from okriuchykhin/ok_SCI_5123 ... Add token authentication to Active Storage controllers [SCI-5123]	2020-10-26 13:46:03 +01:00
aignatov-bio	bddd1956ab	Fix font size and font weight for status label	2020-10-26 12:35:40 +01:00
Urban Rotnik	431b9161b6	Code cleanup	2020-10-26 11:03:43 +01:00
Mojca Lorber	ec41bdd414	Move open mobile app button to main navigation	2020-10-26 09:28:44 +01:00
Oleksii Kriuchykhin	4d64883963	Add activities for step completion and checklist toggling through API [SCI-5139]	2020-10-25 22:33:50 +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
Oleksii Kriuchykhin	5f70984919	Add token authentication to Active Storage controllers [SCI-5123]	2020-10-23 19:22:31 +02:00
Urban Rotnik	c5a1d34c36	Merge pull request #1967 from jbargu/jg_sci_2228 ... [SCI-2228] Remove samples, sample types, sample groups, custom sample columns from the codebase	2020-10-23 15:33:22 +02:00
Urban Rotnik	75351a3aed	px to em	2020-10-23 14:11:56 +02:00
Urban Rotnik	6ccd34291d	Merge pull request #2904 from urbanrotnik/ur-sci-5093 ... Fix smart annotation in checklist title [SCI-5093]	2020-10-23 13:36:22 +02: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
Miha Mencin	9f2b7f962b	Merge pull request #2908 from mlorb/ml-sci-5120 ... Fix pwa url and change when banner is displayed [SCI-5120]	2020-10-22 13:41:12 +02:00
Mojca Lorber	2639810e1a	Fix no step bug	2020-10-22 13:21:05 +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	2f99e3a464	Remove border, update copy	2020-10-21 09:58:35 +02:00
Urban Rotnik	a87302a183	Include styled text in list items elements	2020-10-21 08:27:10 +02:00
Urban Rotnik	e7d2d78935	Add mark for active filters	2020-10-20 16:45:54 +02:00
Urban Rotnik	a728ba2f2d	Fix smart annotation in checklist title	2020-10-20 13:02:49 +02:00
aignatov-bio	2968e677b8	Update image for doorkeeper auth	2020-10-19 16:23:20 +02:00
Miha Mencin	c31a7373fb	Merge pull request #2902 from mlorb/ml-sci-5089 ... Add 'Open in APP' button to the task	2020-10-19 12:28:35 +02:00
Mojca Lorber	23f01ac6a9	Add 'Open in APP' button to the task	2020-10-19 12:17:03 +02:00
Urban Rotnik	d88040fd1b	Move snapshot default selection to core from addon	2020-10-15 15:21:44 +02:00
Urban Rotnik	e1e7496307	Merge pull request #2884 from urbanrotnik/ur-sci-5043 ... DOCX lists [SCI-5043]	2020-10-15 11:53:58 +02:00
Urban Rotnik	e748e1eff3	Fix smart annotations and links styling	2020-10-14 17:58:07 +02:00
mlorb	83ba40d135	Merge pull request #2870 from mlorb/ml-sci-4841 ... Fix at long inventory name snapshot in title is not visible [SCI-4841]	2020-10-14 14:38:04 +02:00
Mojca Lorber	5013f224ee	Fix ems	2020-10-14 13:16:38 +02:00
Urban Rotnik	a19e0ef846	Refactor	2020-10-13 14:23:39 +02:00
Urban Rotnik	1b860afe30	Move TinyMCE parser to separate class	2020-10-13 09:45:13 +02:00
Urban Rotnik	ae8b2cbf8f	Add text to I18n	2020-10-13 08:37:32 +02:00
Mojca Lorber	a944525d25	Change px to em	2020-10-12 16:59:33 +02:00
Mojca Lorber	cf367baefa	Merge branch 'develop' into ml-sci-4841	2020-10-12 14:43:03 +02:00
Oleksii Kriuchykhin	caa2098550	Improve handling of empty cells in inventory imports [SCI-5094]	2020-10-12 14:42:47 +02:00
Urban Rotnik	274293348e	Clean up	2020-10-09 09:53:27 +02:00
Urban Rotnik	dfca798e2d	Refactored tiny_mce_table parser and renderer	2020-10-09 09:43:36 +02:00
Urban Rotnik	92b4d95c72	Implement lists in DOCX	2020-10-09 09:43:00 +02:00
Oleksii Kriuchykhin	7cd12bfb07	Fix protocol repository save/load timestamps [SCI-5067]	2020-10-06 15:30:04 +02:00