2775 commits

Author	SHA1	Message	Date
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
Urban Rotnik	073979534c	Merge branch 'features/task-flows' into develop_to_task_flows	2020-08-04 16:43:05 +02:00
Urban Rotnik	e221d960e7	Revert "Merge pull request #2767 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard" ... This reverts commit 8b6d57058c, reversing changes made to 957ac92669.	2020-08-04 15:07:22 +02:00
Urban Rotnik	7c14da70d9	Merge branch 'features/task-flows' into develop_to_task_flows	2020-08-04 14:50:46 +02:00
Urban Rotnik	6853caa0c8	Merge pull request #2760 from aignatov-bio/ai-sci-4894-small-2fa-fixes ... Small 2fa fixes [SCI-4894]	2020-08-04 11:23:08 +02:00
Urban Rotnik	cce76f6f0f	Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults ... Add ordering for result page [SCI-4895]	2020-08-04 11:17:43 +02:00
Alex Kriuchykhin	e965844a9e	Merge pull request #2755 from aignatov-bio/ai-sci-4837-implement-new-statuses-in-preports ... Add new statuses to reports [SCI-4837]	2020-08-04 09:49:55 +02:00
Alex Kriuchykhin	a9bc5b664a	Merge pull request #2750 from aignatov-bio/ai-sci-4835-add-status-flow-modal ... Add modal for status flow [SCI-4835]	2020-08-04 09:47:40 +02:00
Urban Rotnik	aaae33e603	Merge pull request #2764 from aignatov-bio/ai-sci-4766-add-start-date-filter-to-dashboard ... Add start date to current task dashboard filter [SCI-4766]	2020-08-03 11:56:24 +02:00
Urban Rotnik	868f2e8242	Merge pull request #2765 from aignatov-bio/ai-sci-4878-fix-activities-on-task-tab ... Fix CSS for activities on task page [SCI-4878]	2020-08-03 11:31:47 +02:00
Urban Rotnik	ac3c06d882	Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items ... Add export for assigned items [SCI-4748]	2020-08-03 11:30:31 +02:00
aignatov-bio	536367362c	Add statuses to dashboard filters	2020-07-31 10:59:10 +02:00
aignatov-bio	73911cf7ce	Fix CSS for activities on task page	2020-07-30 13:30:23 +02:00
aignatov-bio	2f5231e832	Add start date to current task dashboard filter	2020-07-29 16:09:23 +02:00
aignatov-bio	15b5f9bb68	Add ordering for result page	2020-07-28 15:39:29 +02:00
aignatov-bio	68fc6ec58a	Add sorting my module statuses	2020-07-27 16:36:21 +02:00
aignatov-bio	6bd12e0397	Add modal for status flow	2020-07-27 13:48:21 +02:00
aignatov-bio	33e3e3d301	Small 2fa fixes	2020-07-27 13:42:51 +02:00
Urban Rotnik	025378cd0e	Fix translations and JS	2020-07-23 15:53:46 +02:00
Alex Kriuchykhin	d4408f6af7	Merge pull request #2738 from aignatov-bio/ai-sci-4732-add-pagination-to-results ... Add pagination to results page [SCI-4732]	2020-07-23 14:45:10 +02:00
aignatov-bio	a0d19b5d98	Add new statuses to reports	2020-07-23 14:24:30 +02:00
Urban Rotnik	077f5eefdb	Merge pull request #2753 from urbanrotnik/ur-sci-4890-inventory-empty-text-value ... Fix undefined text cell [SCI-4890]	2020-07-23 12:56:43 +02:00
Alex Kriuchykhin	cb9fe04584	Merge pull request #2745 from aignatov-bio/ai-sci-4785-fix-inventories-activity-filters ... Fix global activities filters [SCI-4785]	2020-07-23 10:09:36 +02:00
aignatov-bio	b214d2df77	Merge pull request #2746 from aignatov-bio/ai-sci-4815-fix-margins-on-view-switch ... Fix switch view margins [SCI-4815]	2020-07-23 08:57:20 +02:00
Urban Rotnik	51ca828399	Fix undefined text cell	2020-07-22 17:27:36 +02:00
Urban Rotnik	512d6f3229	Add actions for update status, clean old complete actions	2020-07-22 16:12:34 +02:00
Urban Rotnik	aacee14fc6	Add Status button	2020-07-22 15:30:47 +02:00
aignatov-bio	1d3055011f	Merge branch 'features/tinymce-tables' into develop	2020-07-22 13:41:43 +02:00
aignatov-bio	ddfe8231d8	Merge branch 'features/2fa' into develop	2020-07-22 11:56:36 +02:00
Urban Rotnik	7019e42736	Merge pull request #2743 from urbanrotnik/ur-sci-4816-change-font-size-email ... Fix font size in dropdown [SCI-4816]	2020-07-20 15:50:10 +02:00
aignatov-bio	691b8ec327	Fix switch view margins	2020-07-20 15:17:24 +02:00
aignatov-bio	75930b99c3	Fix global activities filters	2020-07-20 15:01:00 +02:00
Urban Rotnik	748dd7912b	Fix font size in dropdown	2020-07-20 11:36:25 +02:00