2807 commits

Author	SHA1	Message	Date
Urban Rotnik	9f12c5f343	New cards and list layout	2020-11-06 13:01:52 +01:00
Oleksii Kriuchykhin	327baafcd7	Improve CSS structure for project toolbar [SCI-5129]	2020-11-04 16:10:40 +01:00
Oleksii Kriuchykhin	258c57870f	Implement the toolbar on the Team Projects page [SCI-5129]	2020-11-02 13:28:37 +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
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	aa1520bfb8	Merge branch 'develop' into jg_sci_2228	2020-10-22 14:21:39 +02:00
Urban Rotnik	2f99e3a464	Remove border, update copy	2020-10-21 09:58:35 +02:00
Urban Rotnik	e7d2d78935	Add mark for active filters	2020-10-20 16:45:54 +02:00
Mojca Lorber	5013f224ee	Fix ems	2020-10-14 13:16:38 +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	21fab4198c	Merge branch 'develop' into features/local	2020-10-01 11:52:59 +02:00
Oleksii Kriuchykhin	25a9f5c685	Add typeface-lato for shipping Lato fonts	2020-09-28 18:02:47 +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	23d6d93074	Fix css	2020-09-21 17:13:42 +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
Alex Kriuchykhin	04686d4ffc	Merge pull request #2842 from okriuchykhin/ok_SCI_5004 ... Add Completion and Uncompletion consequences [SCI-5004]	2020-09-15 12:56:27 +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
aignatov-bio	c10e2d231e	Update frontend permission check	2020-09-14 15:59:09 +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
aignatov-bio	18426b90be	Disable button when condition not fullfield	2020-09-10 13:40:52 +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
Mojca Lorber	eeb8f4a97a	Disable 'complete step' button on locked task	2020-09-09 14:32:37 +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
Urban Rotnik	8b10cde6b4	Fix DeepScan error	2020-09-09 13:51:11 +02:00
aignatov-bio	946b961b1a	Merge pull request #2819 from aignatov-bio/ai-sci-4975-add-permission-checks-for-statuses ... Add front-end checks for statuses [SCI-4975]	2020-09-09 13:21:04 +02:00
aignatov-bio	661220890f	Update error handling	2020-09-09 12:25:34 +02:00
aignatov-bio	f4a13a73cb	Refactor smart annotation front-end	2020-09-09 12:25:34 +02:00
aignatov-bio	5d9d7d6a12	Merge pull request #2829 from aignatov-bio/ai-sci-4983-add-descriptions-for-conditions ... Add description for conditions [SCI-4983]	2020-09-09 11:33:48 +02:00
Urban Rotnik	aa88b6bdb4	Move redirect to controller	2020-09-09 11:26:43 +02:00
Mojca Lorber	ea1510bcdd	Fix quotes	2020-09-09 10:27:32 +02:00
aignatov-bio	84682c6346	Merge pull request #2823 from mlorb/ml-sci-4575 ... Replace old arrow with new one [SCI-4575]	2020-09-09 09:05:39 +02:00
aignatov-bio	9a771da7f7	Merge pull request #2821 from mlorb/ml-sci-4578 ... Fix buttons visability on protocols page according to new styleguide [SCI-4578]	2020-09-09 09:05:26 +02:00
aignatov-bio	ae1bec2a95	Merge pull request #2818 from mlorb/ml-sci-4572 ... Change step checklist and table edit mode [SCI-4572]	2020-09-09 09:02:56 +02:00
aignatov-bio	bdb3caf5cf	Add i18n	2020-09-09 08:50:24 +02:00
Urban Rotnik	d9b691103c	Add permission error message	2020-09-08 15:42:30 +02:00
Mojca Lorber	7e9ef9496f	Update smart annotation appearance in the text	2020-09-07 18:30:54 +02:00
Oleksii Kriuchykhin	dea75553a3	Fix handling of duplicated step positions [SCI-4880]	2020-09-07 10:44:00 +02:00
Mojca Lorber	9dac4079f8	Replace old arrow with new one and remove redundant javascript for arrow collapsing	2020-09-04 14:43:30 +02:00
Mojca Lorber	24745203e1	Fix buttons visability on protocols page according to new styleguide	2020-09-03 17:05:25 +02:00
Mojca Lorber	1f0d9f3ad7	Fix buttons visability on reports page according to new styleguide	2020-09-03 16:19:02 +02:00
aignatov-bio	d85703113a	Add front-end checks	2020-09-03 14:34:34 +02:00
aignatov-bio	4c1e120f23	Merge pull request #2810 from aignatov-bio/ai-sci-4968-add-error-handling-for-state-change ... Add error handling for state change [SCI-4968]	2020-09-03 11:47:48 +02:00
aignatov-bio	39105a807a	Merge pull request #2816 from aignatov-bio/ai-sci-4960-fix-css-issue-for-status-flow ... Fix css for status flows [SCI-4970]	2020-09-03 09:46:19 +02:00
Mojca Lorber	06d75fb07e	Change step checklist and table edit mode	2020-09-02 18:04:37 +02:00
aignatov-bio	257329ce80	Fix css for status flows	2020-09-02 15:41:07 +02:00
Mojca Lorber	634dd2ae5e	Add css variable	2020-09-02 12:00:52 +02:00
Mojca Lorber	d57eb68f93	Fix tables header corners	2020-09-01 16:25:30 +02:00
Urban Rotnik	ed5869ff8e	Show status on task card	2020-09-01 14:56:48 +02:00
aignatov-bio	9ff5e8bd7d	Add task state change error handling and validation	2020-09-01 12:41:00 +02:00
Urban Rotnik	a259800590	Merge branch 'develop' into jg_sci_2228	2020-08-31 16:29:23 +02:00
aignatov-bio	c07ebe90fa	Add migration for task states	2020-08-27 11:34:59 +02:00
Oleksii Kriuchykhin	ed2eb81c68	Switch to position swapping when updating step position [SCI-4880]	2020-08-25 15:46:23 +02:00
Oleksii Kriuchykhin	a206890a8c	Fix step position adjusting on move and destroy [SCI-4880]	2020-08-25 15:46:21 +02:00
Urban Rotnik	5923a4c014	Merge branch 'develop' into features/task-flows	2020-08-25 15:30:22 +02:00
aignatov-bio	c3ddfd5bed	Merge pull request #2786 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard ... Fix dropdrown selector [SCI-4899]	2020-08-25 14:51:55 +02:00
Urban Rotnik	b6495becdb	Set stateDuration to 0	2020-08-24 15:51:35 +02:00
Alex Kriuchykhin	5006173d59	Merge pull request #2780 from aignatov-bio/ai-sci-4856-add-new-statuses-to-dashboard ... Add new statuses to dashboard [SCI-4856]	2020-08-24 11:09:57 +02:00
Mojca Lorber	059c8c88d9	Fix css for modal-body	2020-08-20 14:12:45 +02:00
aignatov-bio	19a0d05467	Fix for checklist ordering	2020-08-14 12:32:39 +02:00
Mojca Lorber	a91aa6ce46	Fix Collapse and expand buttons position	2020-08-13 13:18:50 +02:00
aignatov-bio	5360db76be	Fix dropdrown selector	2020-08-12 14:00:10 +02:00
aignatov-bio	56ff4e7702	Add new statuses to dashboard	2020-08-10 09:10:56 +02:00