2103 commits

Author	SHA1	Message	Date
aignatov-bio	c56f7912ef	Update file preview	2020-10-29 14:23:32 +01:00
aignatov-bio	566ef7aef7	Add list view to atachments	2020-10-16 11:00:57 +02:00
aignatov-bio	016fc8a632	Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews	2020-10-15 15:25:54 +02:00
aignatov-bio	0a4b89cf39	Merge branch 'develop' into features/office-file-previews	2020-10-15 15:19:56 +02:00
Mojca Lorber	cf367baefa	Merge branch 'develop' into ml-sci-4841	2020-10-12 14:43:03 +02:00
aignatov-bio	7c3a3e4490	Small smart annotation fixes	2020-09-28 12:03:01 +02:00
aignatov-bio	1ed65eddfa	Move ordering to front-end	2020-09-25 15:06:09 +02:00
Mojca Lorber	94fea75fda	Fix at long inventory name snapshot in title is not visible	2020-09-24 17:19:41 +02:00
aignatov-bio	780db9d134	Add assets view switcher	2020-09-24 17:10:36 +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	e4b94b582a	Add dynamic render of wopi files in viewport	2020-09-23 12:32:46 +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
Mojca Lorber	9cd8e3b7ac	Change default status values, add project and experiment to saved state and fix parsing error handeling	2020-09-16 09:48:06 +02:00
Mojca Lorber	3c30ee904e	Merge branch 'features/task-flows' into ml-sci-4984	2020-09-15 13:27:34 +02:00
mlorb	bf707a11a9	Merge branch 'features/task-flows' into ml-sci-4976	2020-09-15 12:59:49 +02:00
aignatov-bio	67d3a1ad12	Fix markup	2020-09-15 12:06:20 +02:00
aignatov-bio	6dc4422d82	Fix markup	2020-09-15 11:56:44 +02:00
Mojca Lorber	fe7d922cc5	Refactor complete step button	2020-09-15 11:18:15 +02:00
Oleksii Kriuchykhin	73cf620960	Add Completion and Uncompletion consequences [SCI-5004]	2020-09-14 20:06:48 +02:00
Mojca Lorber	13f719a9e1	Add saving state for filters on dashboard	2020-09-14 18:15:57 +02:00
Oleksii Kriuchykhin	a7c6ab9d89	Move some consequence executon into background process [SCI-4978]	2020-09-11 16:18:39 +02:00
aignatov-bio	008563a7f4	Update user smart annotation	2020-09-11 13:00:13 +02:00
mlorb	3d2aaed791	Merge pull request #2820 from mlorb/ml-sci-4580 ... Fix buttons visability on reports page according to new styleguide [SCI-4580]	2020-09-10 09:32:16 +02:00
Mojca Lorber	d055d6e241	Fix quotes again	2020-09-09 14:43:12 +02:00
aignatov-bio	7a86bb47c5	Add styling and highligh	2020-09-09 14:17:19 +02:00
Urban Rotnik	0ae39678d4	Merge pull request #2832 from urbanrotnik/ur-sci-4982-lock-state ... Add error message for locked task, update some permission checks[SCI-4982]	2020-09-09 14:04:08 +02:00