6860 commits

Author	SHA1	Message	Date
mlorb	a71e8ef9cf	Merge pull request #2940 from mlorb/ml-sci-5034 ... Expose the new step button on task [SCI-5034]	2020-11-10 13:10:55 +01:00
Oleksii Kriuchykhin	ee1bcd7aac	Implement search endpoint for Projects & folders search [SCI-5136]	2020-11-09 16:16:09 +01:00
Urban Rotnik	0f5bf45cf6	Rebase, add toolbar, minor fixes css and JS	2020-11-06 13:56:21 +01:00
Urban Rotnik	9f12c5f343	New cards and list layout	2020-11-06 13:01:52 +01:00
Urban Rotnik	a06f421c88	Merge pull request #2941 from urbanrotnik/ur-sci-5124 ... Fix teams query [SCI-5124]	2020-11-06 12:08:54 +01:00
aignatov-bio	f3dd749c1d	Fix smart annotation for archived experiments	2020-11-06 11:47:18 +01:00
Oleksii Kriuchykhin	f2f08a31d5	Add check for zero page size in repository states [SCI-5190]	2020-11-06 11:42:33 +01:00
Urban Rotnik	8ac59fd699	Fix acessiable_by_team scope	2020-11-06 10:43:18 +01:00
Mojca Lorber	9893e8d5c8	Add 403 error handling to current tasks dashboard widget	2020-11-06 10:39:04 +01:00
Urban Rotnik	d6eef4699b	Merge pull request #2938 from aignatov-bio/ai-sci-5153-fix-dashboard-widget-overlap ... Fix dashboard small screen overlap [SCI-5153]	2020-11-06 09:59:52 +01:00
Alex Kriuchykhin	b51e92d5be	Merge pull request #2933 from okriuchykhin/ok_SCI_5047 ... Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047]	2020-11-06 09:06:37 +01:00
Mojca Lorber	8ee8f7b4d2	Expose the new step button on task	2020-11-05 16:14:40 +01:00
aignatov-bio	2c64481cda	Fix navigation on small screens	2020-11-05 15:20:34 +01:00
aignatov-bio	5b22f7d301	Fix dashboard small screen overlap	2020-11-05 14:47:19 +01:00
Urban Rotnik	2c347af7bf	Add data attribute to change status dropdown	2020-11-05 13:19:45 +01:00
aignatov-bio	d29a62dad1	Improve markup	2020-11-05 10:41:06 +01:00
aignatov-bio	e8592d911d	Fix markup	2020-11-05 10:04:27 +01:00
aignatov-bio	8145a292fd	Clear code and add missed I18n translation	2020-11-05 10:03:15 +01:00
aignatov-bio	99b52e5d80	Fix markup	2020-11-05 08:44:48 +01:00
Oleksii Kriuchykhin	40ab03c38d	Fix cucumber tests for table results [SCI-5047]	2020-11-04 16:46:18 +01:00
Oleksii Kriuchykhin	327baafcd7	Improve CSS structure for project toolbar [SCI-5129]	2020-11-04 16:10:40 +01:00
aignatov-bio	5d0ab1f2e9	Fix markup	2020-11-04 13:32:34 +01:00
aignatov-bio	12fdea8d89	Add context menu to attahcments	2020-11-04 13:08:40 +01:00
aignatov-bio	e8e9244d96	Fix I18n and double loading	2020-11-03 09:07:49 +01:00
Oleksii Kriuchykhin	8eec4e4b59	Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047]	2020-11-02 22:19:33 +01:00
aignatov-bio	0f80786433	Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into ai-sci-5101-add-attachments-dropdown-to-step	2020-11-02 18:52:46 +01:00
aignatov-bio	84a7d49023	Fix markup	2020-11-02 18:51:21 +01:00
aignatov-bio	f85a3493cd	Merge pull request #2925 from aignatov-bio/ai-sci-5110-add-file-previews-to-reports ... Add filer previews to reports [SCI-5110]	2020-11-02 18:48:45 +01:00
aignatov-bio	eca39a00b5	Add attachments dropdown to step	2020-11-02 18:47:08 +01:00
Mojca Lorber	8aed48d1ae	Merge branch 'develop' into features/office-file-previews	2020-11-02 13:45:06 +01:00
Oleksii Kriuchykhin	258c57870f	Implement the toolbar on the Team Projects page [SCI-5129]	2020-11-02 13:28:37 +01:00
Alex Kriuchykhin	8566d56b68	Merge pull request #2928 from okriuchykhin/ok_SCI_5126 ... Create database structure for project folders [SCI-5126]	2020-11-02 11:46:15 +01:00
Urban Rotnik	2549d9deeb	Merge pull request #2929 from urbanrotnik/ur-sci-5147-generate-word-with-included-smart ... Fix SA in protocol description [SCI-5147]	2020-11-02 09:55:40 +01:00
Mojca Lorber	04e3b67968	Change the way buttons are toggled	2020-10-30 18:47:01 +01:00
Urban Rotnik	042231469c	Fix syntax	2020-10-30 13:37:59 +01:00
Urban Rotnik	1295299370	Fix SA in protocol description	2020-10-30 12:55:30 +01:00
Mojca Lorber	a52315fc79	Merge branch 'develop' into ml-sci-5033	2020-10-29 18:28:25 +01:00
aignatov-bio	6193f91192	Update view mode switcher logic	2020-10-29 16:42:05 +01:00
aignatov-bio	12991e8fd3	Commit add asset preview mode switcher to step	2020-10-29 16:42:05 +01:00
Oleksii Kriuchykhin	e87407bbd3	Create database structure for project folders [SCI-5126]	2020-10-29 15:44:21 +01:00
aignatov-bio	f51416d83a	Update permission markup	2020-10-29 14:59:14 +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
aignatov-bio	b0fe68553a	Fix tests	2020-10-29 14:30:26 +01:00
aignatov-bio	21f584a2c4	Fix markup	2020-10-29 14:30:26 +01:00
aignatov-bio	131d487e69	Add file preview to list view	2020-10-29 14:30:26 +01:00
aignatov-bio	d99e279ecc	Add gallery to file preview	2020-10-29 14:30:26 +01:00
aignatov-bio	c56f7912ef	Update file preview	2020-10-29 14:23:32 +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
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
aignatov-bio	23f9fb212d	Merge pull request #2915 from aignatov-bio/ai-sci-5105-update-image-edit-modal ... Update image edit modal [SCI-5105]	2020-10-29 09:15:32 +01:00
Urban Rotnik	bf4062b7cb	Refactor rescue block	2020-10-29 09:12:12 +01:00
Urban Rotnik	54f38c8ded	Move validation before request	2020-10-29 08:45:55 +01:00
aignatov-bio	16249201f3	Fix markup	2020-10-28 16:44:28 +01:00
aignatov-bio	2f1217688c	Add filer previews to reports	2020-10-28 16:32:22 +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
Urban Rotnik	b94a3a6cb8	Clean up controller	2020-10-26 16:17:39 +01:00
aignatov-bio	6edcf4b099	Add size label	2020-10-26 15:10:06 +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
Urban Rotnik	1ffc3449bf	Clean up index view	2020-10-26 13:42:32 +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
aignatov-bio	aefaf4d0c1	Update image edit modal	2020-10-25 16:57: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
aignatov-bio	f4bf2ab75f	Remove empty children from extents	2020-10-22 14:29:35 +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
aignatov-bio	bdcc7939ad	Update export all generator	2020-10-16 18:25:01 +02:00
aignatov-bio	3fe3c2087f	Fix hound issues	2020-10-16 11:27:23 +02: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
Urban Rotnik	d88040fd1b	Move snapshot default selection to core from addon	2020-10-15 15:21:44 +02:00
aignatov-bio	0a4b89cf39	Merge branch 'develop' into features/office-file-previews	2020-10-15 15:19:56 +02:00
aignatov-bio	a2bfb1cfeb	Merge branch 'develop' of https://github.com/biosistemika/scinote-web into develop	2020-10-15 15:09:05 +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
aignatov-bio	cc70d42193	Merge branch 'ur-sci-5043' of https://github.com/urbanrotnik/scinote-web into develop	2020-10-15 11:21:03 +02:00
aignatov-bio	f1a5811d5f	Merge pull request #2809 from biosistemika/ai-sci-4960-render-wopi-preview-only-in-view-port ... Render wopi preview only in view port	2020-10-14 21:29:56 +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
aignatov-bio	e240b629c4	Fix rubocop issues	2020-10-14 12:12:32 +02:00
aignatov-bio	36bab10de7	Update export all to tree structure	2020-10-14 12:08:04 +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
aignatov-bio	a7da7b0de3	Refactor export all my module generator	2020-10-12 15:55:06 +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
aignatov-bio	5d6c9e78fd	Refactor dashboard layout	2020-10-06 16:09:26 +02:00
Oleksii Kriuchykhin	7cd12bfb07	Fix protocol repository save/load timestamps [SCI-5067]	2020-10-06 15:30:04 +02:00
Miha Mencin	3a4a166856	Merge pull request #2888 from okriuchykhin/ok_SCI_5082 ... Fix index page for users without a team [SCI-5082]	2020-10-05 10:16:04 +02:00
Oleksii Kriuchykhin	dd64206b25	Fix index page for users without a team [SCI-5082]	2020-10-02 16:57:46 +02:00
Mojca Lorber	4e4a4a2c4e	Change Complete step button on task step	2020-10-02 15:02:42 +02:00
Oleksii Kriuchykhin	6c367428a1	Fix team switcher [SCI-5080]	2020-10-02 14:25:44 +02:00
Oleksii Kriuchykhin	aeba25cf09	Fix Hound warning	2020-10-01 11:56:33 +02:00
Oleksii Kriuchykhin	21fab4198c	Merge branch 'develop' into features/local	2020-10-01 11:52:59 +02:00
Urban Rotnik	fc8704b520	Add fileUtils for sizeCheck, add url to textarea data attribute	2020-09-30 13:20:11 +02:00
aignatov-bio	9010f9c1db	Merge pull request #2876 from aignatov-bio/ai-sci-5066-fix-switch-team ... Fix switch team on link for object from other team [SCI-5066]	2020-09-30 10:09:19 +02:00
Urban Rotnik	e9ac999645	Merge pull request #2880 from urbanrotnik/ur-sci-5067-protocols-sync ... Fix updating updated_at on protocol while load/sync with repository [SCI-5067]	2020-09-29 16:54:42 +02:00
Urban Rotnik	7c312a844f	Fix updating updated_at on protocol while load/sync with repository	2020-09-29 15:37:40 +02:00
aignatov-bio	d21aee1843	Remove complete step button from protocol managment	2020-09-29 15:08:01 +02:00
Alex Kriuchykhin	939c0096de	Merge pull request #2881 from biosistemika/features/yomu ... Switch to a new version of Yomu gem	2020-09-29 14:41:36 +02:00
Oleksii Kriuchykhin	1603ec6d1a	Switch to a new version of Yomu gem	2020-09-29 13:11:50 +02:00
aignatov-bio	9d64121577	Refactor WOPI discovery	2020-09-29 12:58:05 +02:00
Urban Rotnik	dc0072e707	Support multiple file upload in TinyMCE fields	2020-09-29 08:21:31 +02:00
Oleksii Kriuchykhin	25a9f5c685	Add typeface-lato for shipping Lato fonts	2020-09-28 18:02:47 +02:00
aignatov-bio	16fe11f0f7	Fix smitch team on link for object from other team	2020-09-28 17:16:18 +02:00
aignatov-bio	7c3a3e4490	Small smart annotation fixes	2020-09-28 12:03:01 +02:00
aignatov-bio	cd9b143bc5	Fix markup	2020-09-25 15:08:20 +02:00
aignatov-bio	1ed65eddfa	Move ordering to front-end	2020-09-25 15:06:09 +02:00
Alex Kriuchykhin	fb28fa557b	Merge pull request #2872 from okriuchykhin/ok_SCI_5062 ... Improve performance of fetching of statuses [SCI-5062]	2020-09-25 15:00:30 +02:00
Alex Kriuchykhin	3eb448c39b	Merge pull request #2862 from okriuchykhin/ok_SCI_5001 ... Add Endpoins for Project Membership manipulation [SCI-5001]	2020-09-25 14:25:20 +02:00
Oleksii Kriuchykhin	134e549ed5	Improve performance of fetching of statuses [SCI-5062]	2020-09-25 10:14:57 +02:00
Urban Rotnik	f4f0bc706a	Fix step deletion	2020-09-25 08:43:03 +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	70a0da17b2	Fix markup	2020-09-24 17:12:53 +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
mlorb	acda21f357	Merge pull request #2867 from mlorb/ml-sci-4578-v2 ... Some protocol repository CSS corrections [SCI-4578]	2020-09-24 13:44:06 +02:00
aignatov-bio	4f7814cff4	Fix markup	2020-09-24 13:32:43 +02:00
aignatov-bio	9da27956d3	Merge pull request #2857 from aignatov-bio/ai-sci-4987-fix-smart-annotation-for-archived-projects ... Show smart annotation for archived projects/experiments [SCI-4987]	2020-09-24 13:29:49 +02:00
aignatov-bio	ff33cb45e0	Improve smart annotation in TinyMCE fields	2020-09-24 13:29:20 +02:00
aignatov-bio	653fe6fb1d	Fix markup	2020-09-24 11:56:17 +02:00
Urban Rotnik	3bda6a987d	Fix smart annotation for RepositoryItem	2020-09-24 11:45:03 +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
Urban Rotnik	3de2aee921	Merge pull request #2864 from urbanrotnik/ur-sci-4993 ... Assign user to cloned experiment [SCI-4993]	2020-09-23 13:37:07 +02:00
Urban Rotnik	33d53c958d	Merge pull request #2866 from urbanrotnik/ur-sci-5053 ... Fix protocol import modal [SCI-5053]	2020-09-23 13:19:23 +02:00
aignatov-bio	0865802255	Merge pull request #2853 from aignatov-bio/ai-sci-5024-disable-autostrip-on-status-change ... Disable autostrip attrbiutes on status change [SCI-5024]	2020-09-23 13:18:07 +02:00
Urban Rotnik	7bc31905b5	Fix protocol import modal	2020-09-23 12:54:16 +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
Urban Rotnik	5be7a1b32d	Assign user to cloned experiment	2020-09-23 11:31:18 +02:00
aignatov-bio	21dcf1157c	Update regexp for smart annotation	2020-09-23 11:13:59 +02:00
Oleksii Kriuchykhin	2cda80dc5f	Add Endpoins for Project Membership manipulation [SCI-5001]	2020-09-23 11:03:29 +02:00
mlorb	feda5622d8	Merge pull request #2860 from mlorb/ml-sci-5007 ... Add info of the locked task to the View status flow modal [SCI-5007]	2020-09-23 10:19:48 +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
Mojca Lorber	affae15ccf	Simplification	2020-09-22 17:19:15 +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
aignatov-bio	bbfd4b1c02	Run autostrip when related field changed	2020-09-22 12:48:52 +02:00
aignatov-bio	e288a1f911	Merge pull request #2861 from aignatov-bio/ai-sci-5038-prevent-tinymce-edit-mode-when-link-click ... Prevent tinymce edit mode when link click [SCI-5038]	2020-09-22 11:41:50 +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
Mojca Lorber	fe779f9146	Add info of the locked task to the View status flow modal	2020-09-22 10:21:55 +02:00
aignatov-bio	b540f90514	Merge pull request #2858 from aignatov-bio/ai-sci-5035-fix-smart-annotation-for-shared-inventories ... Add shared inventories to smart annotation [SCI-5035]	2020-09-22 10:20:20 +02:00
Alex Kriuchykhin	136ce06022	Merge pull request #2851 from okriuchykhin/ok_SCI_4999 ... Add Create and Update endpoints for experiments [SCI-4999]	2020-09-22 10:20:00 +02:00
aignatov-bio	fd7773a3dc	Fix smart annotation cursor position	2020-09-22 10:15:01 +02:00
Mojca Lorber	23d6d93074	Fix css	2020-09-21 17:13:42 +02:00
aignatov-bio	fde33e6e63	Fix tests	2020-09-21 14:41:51 +02:00
aignatov-bio	f8a28f378e	Add shared inventories to smart annotation	2020-09-21 14:36:34 +02:00
aignatov-bio	545e13304a	Show smart annotation for archived projects/experiments	2020-09-21 14:09:11 +02:00
Alex Kriuchykhin	e19efe3975	Merge pull request #2850 from okriuchykhin/ok_SCI_4997 ... Add Create and Update endpoints for projects [SCI-4997]	2020-09-21 13:22:12 +02:00
Alex Kriuchykhin	9fda2dd97e	Merge pull request #2855 from okriuchykhin/ok_SCI_5030 ... Fix task archiving and moving [SCI-5030]	2020-09-21 10:49:37 +02:00
Mojca Lorber	d9a78d20d7	Update empty states for smart annotation results and dismiss button	2020-09-18 08:50:01 +02:00
Oleksii Kriuchykhin	e456661a98	Fix task archiving and moving [SCI-5030]	2020-09-17 17:15:41 +02:00
aignatov-bio	644f30fb10	Fix syntax for uglifier	2020-09-17 15:35:12 +02:00
aignatov-bio	ec9446d0cb	Disable autostrip attrbiutes on status change	2020-09-17 15:26:48 +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	d560470df2	Merge pull request #2844 from aignatov-bio/ai-sci-4950-implement-remember-selection-of-smart-annotation ... Add remembered state for smart annotation [SCI-4950]	2020-09-17 14:49:35 +02:00
aignatov-bio	8dbc69aa31	Remove console.log	2020-09-17 14:48:26 +02:00
Urban Rotnik	462fb12a41	Update SQL query	2020-09-17 13:30:27 +02:00
Urban Rotnik	777afd0e9b	Add improved search for smart annotations	2020-09-17 13:19:52 +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