2359 commits

Author	SHA1	Message	Date
Oleksii Kriuchykhin	53be6a95c4	Fix projects filter mark, titles and comments mark [SCI-5332]	2021-01-06 11:28:39 +01:00
aignatov-bio	ef57489cd9	Update repositories sidebar [SCI-5329] (#3031) ... * Update repositories sidebar [SCI-5329]	2021-01-06 10:13:10 +01:00
Oleksii Kriuchykhin	c83327b720	Fix project buttons visibility [SCI-5318]	2021-01-05 14:29:20 +01:00
Oleksii Kriuchykhin	696b8d19f0	Fix new project creation and archiving [SCI-5321][SCI-5326]	2021-01-05 14:14:01 +01:00
Alex Kriuchykhin	a8991356b5	Merge pull request #3033 from okriuchykhin/ok_SCI_5341 ... Fix restore action for experiments and tasks [SCI-5341]	2021-01-05 10:09:39 +01:00
aignatov-bio	0d1939e405	Initialize pdf preview on galery swtich [SCI-5342] (#3044)	2021-01-04 13:40:05 +01:00
Oleksii Kriuchykhin	738f668ba9	Disable comment adding for archived objects [SCI-5339]	2020-12-30 11:46:56 +01:00
Oleksii Kriuchykhin	f76eb170a1	Fix restore action for experiments and tasks [SCI-5341]	2020-12-28 22:21:38 +01:00
aignatov-bio	b3faa170fb	PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018) ... * Add PDF Preview [SCI-5299]	2020-12-22 15:25:30 +01:00
Oleksii Kriuchykhin	67b3f853d7	Merge branch 'develop' into features/folders	2020-12-18 14:51:21 +01:00
Urban Rotnik	d3e38c89f8	Update BE sorting for archived fodlers&projects ... SCI-5306	2020-12-18 11:27:17 +01:00
Urban Rotnik	7c0ad021de	Update sorting dropdown	2020-12-18 11:08:38 +01:00
Urban Rotnik	63a41b123d	Fix dropdown JS bug, fix folders_search, apply all new filters to search ... SCI-5306	2020-12-18 09:43:11 +01:00
Urban Rotnik	87ca79717c	Add separate sorting for active/archived view ... [SCI-5306]	2020-12-18 08:41:51 +01:00
mlorb	f6f7211d77	Update styling for projects filters and fix some js bugs [SCI-5210] (#3012) ... * Update styling for projects filters and fix some js bugs * Fix hound	2020-12-17 23:13:45 +01:00
Urban Rotnik	ad4ee65f6b	Merge pull request #3007 from urbanrotnik/ur-sci-5300 ... Connect manage users modal with new projects cards [SCI-5300]	2020-12-17 13:48:10 +01:00
Urban Rotnik	d4c84a38e5	Fix css ... [SCI-5274]	2020-12-17 13:11:30 +01:00
Urban Rotnik	19f16555c6	Add checkbox and restore button ... [SCI-5275]	2020-12-17 13:11:20 +01:00
Urban Rotnik	cd7b94b434	Fix users/comments tab showing ... [SCI-5274]	2020-12-17 13:08:58 +01:00
Urban Rotnik	9a7ffb0645	Add Tags modal to archived tags screen ... [SCI-5274]	2020-12-17 13:08:57 +01:00
Oleksii Kriuchykhin	0c65f3f7c2	Implement sorting on the project screen (when filterin/searching) [SCI-5281]	2020-12-17 12:43:09 +01:00
aignatov-bio	329a5bff0b	Fix repository text field rendering [SCI-5304] (#3015)	2020-12-15 12:23:19 +01:00
aignatov-bio	30cfe78805	Add edit modal for project folders [SCI-5265] (#3002) ... Add edit modal for project folders [SCI-5265]	2020-12-14 15:54:18 +01:00
Urban Rotnik	398978c69a	Connect users modal to projects index page	2020-12-11 13:07:45 +01:00
Mojca Lorber	5cdab422df	Update layout of the navigation for experiments, tasks list and task page	2020-12-10 15:15:36 +01:00
Urban Rotnik	207659a2c1	Fix markup [SCI-5266]	2020-12-10 13:36:38 +01:00
Urban Rotnik	152990b4d6	Add archived mode for Projects ... [SCI-5266]	2020-12-09 08:51:55 +01:00
aignatov-bio	6a44e23697	Add projects sidebar [SCI-5178] (#2995) ... * Add projects sidebar navigation [SCI-5178]	2020-12-08 16:07:26 +01:00
Alex Kriuchykhin	7a4f60f25e	Merge pull request #2989 from mlorb/ml-sci-5240 ... [SCI-5240] Implement Create new folder function	2020-12-04 09:57:05 +01:00
mlorb	9693f84bbd	Implement actions dropdown on project card [SCI-5132] [SCI-5179] (#2968) ... * Implement actions dropdown on project card * make comments counter to work	2020-12-04 09:38:34 +01:00
Mojca Lorber	d9fdb20a99	Fix hound	2020-12-03 12:57:45 +01:00
Mojca Lorber	9253cf5ade	Change javascript for modal handeling and some other small fixes	2020-12-03 12:53:19 +01:00
mlorb	74f0f0474a	Merge branch 'features/folders' into ml-sci-5240	2020-12-03 12:50:19 +01:00
Urban Rotnik	478d43f9ce	Merge pull request #2987 from urbanrotnik/ur-sci-5208 ... Projects cards and list view with filters [SCI-5208]	2020-12-03 12:30:37 +01:00
Urban Rotnik	3700faa04a	Update proejcts grid, include breadcrumbs, fix JS ... [SCI-5208]	2020-12-03 12:29:28 +01:00
Oleksii Kriuchykhin	9546b8f71d	Prepare backend for the improved navigation [SCI-5177]	2020-12-03 10:19:11 +01:00
Mojca Lorber	d7e3b57d0d	[SCI-5240] Implement Create new folder function	2020-12-01 09:59:08 +01:00
Oleksii Kriuchykhin	78e050ccc0	Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171]	2020-11-27 14:27:24 +01:00
Urban Rotnik	fcb82fd0d2	Merge pull request #2984 from okriuchykhin/ok_SCI_5204 ... Project filters: add text field to the filters [SCI-5204]	2020-11-27 12:04:46 +01:00
Oleksii Kriuchykhin	1553d32c6e	Project filters: add text field to the filters [SCI-5204]	2020-11-26 21:29:45 +01:00
aignatov-bio	c6f4d23a78	Fix protocol preview file background	2020-11-26 15:35:06 +01:00
aignatov-bio	60359b595c	Add button disabling	2020-11-26 14:37:12 +01:00
aignatov-bio	b0ebdceb08	Fix typo	2020-11-26 14:04:26 +01:00
Urban Rotnik	85b22cd486	Fix syntax	2020-11-26 12:31:45 +01:00
Urban Rotnik	efd4f8abde	Add members dropdown on project filters flyout	2020-11-26 12:29:43 +01:00
Urban Rotnik	34fbcb8f56	Add clear functionallity to projects filters	2020-11-26 09:23:22 +01:00
aignatov-bio	1979883004	Add delete asset confirmation modal	2020-11-25 12:50:34 +01:00
Mojca Lorber	2a8c98b7ec	Implement ESC button to exit full-screen modals	2020-11-24 23:20:53 +01:00
aignatov-bio	dc62e2780a	Merge pull request #2963 from aignatov-bio/ai-sci-5186-add-new-comments-layout ... Add comments sidebar layout [SCI-5186][SCI-5188][SCI-5189]	2020-11-24 11:25:36 +01:00
aignatov-bio	966bb7c9ed	Merge pull request #2972 from aignatov-bio/ai-sci-5229-replce-loading-spinner-with-new ... Replace loading spinner [SCI-5229]	2020-11-23 16:32:49 +01:00
aignatov-bio	624e9b1f82	Small fixes on current task dashboard	2020-11-23 14:29:04 +01:00
aignatov-bio	84d681ecce	Replace loading spinner	2020-11-23 14:14:54 +01:00
aignatov-bio	2449f2b500	Fix smart annotation for comments	2020-11-21 12:34:36 +01:00
aignatov-bio	77b7b1b231	Add errors handling and i18n	2020-11-21 12:31:49 +01:00
aignatov-bio	60ce51149d	Add CRUD to comments	2020-11-20 20:25:28 +01:00
aignatov-bio	da4b8aaf2f	Add comments list	2020-11-20 12:29:40 +01:00
Alex Kriuchykhin	f5860397f5	Merge pull request #2953 from okriuchykhin/ok_SCI_5183 ... Make folders selectable for 'Export all' functionality [SCI-5183]	2020-11-20 09:54:53 +01:00
Oleksii Kriuchykhin	4dc3473c5e	Fix showing/hiding export button on folder selection [SCI-5183]	2020-11-19 15:50:43 +01:00
aignatov-bio	483ff8f1f2	Merge pull request #2964 from biosistemika/features/office-file-previews ... Features/office file previews merge branch	2020-11-19 11:11:39 +01:00
Urban Rotnik	aba0034854	Convert some values to ems	2020-11-19 09:25:26 +01:00
Urban Rotnik	e893d40eea	Add filters flyout for projects	2020-11-19 09:23:35 +01:00
aignatov-bio	2294d396f9	Add comments sidebar layout	2020-11-18 16:26:01 +01:00
Oleksii Kriuchykhin	6dfeae2283	Make folders selectable for 'Export all' functionality [SCI-5183]	2020-11-13 14:39:10 +01:00
Mojca Lorber	aadbff94ae	Fix double init	2020-11-11 11:07:43 +01:00
Mojca Lorber	1618d79144	Merge branch 'develop' into ml-sci-5152	2020-11-11 10:47:43 +01:00
aignatov-bio	71ddf680b2	Add highlight to report table	2020-11-10 15:15:18 +01:00
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
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
Mojca Lorber	9893e8d5c8	Add 403 error handling to current tasks dashboard widget	2020-11-06 10:39:04 +01:00
Mojca Lorber	8ee8f7b4d2	Expose the new step button on task	2020-11-05 16:14:40 +01:00
Oleksii Kriuchykhin	40ab03c38d	Fix cucumber tests for table results [SCI-5047]	2020-11-04 16:46:18 +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	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
Mojca Lorber	04e3b67968	Change the way buttons are toggled	2020-10-30 18:47:01 +01:00
Mojca Lorber	a52315fc79	Merge branch 'develop' into ml-sci-5033	2020-10-29 18:28:25 +01:00
aignatov-bio	12991e8fd3	Commit add asset preview mode switcher to step	2020-10-29 16:42:05 +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	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
Oleksii Kriuchykhin	13fcfedf41	Refactor experiment workflow image generation [SCI-5063]	2020-10-29 13:16:09 +01:00
Urban Rotnik	54f38c8ded	Move validation before request	2020-10-29 08:45:55 +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
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
Mojca Lorber	ec41bdd414	Move open mobile app button to main navigation	2020-10-26 09:28:44 +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
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
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	e7d2d78935	Add mark for active filters	2020-10-20 16:45:54 +02:00
Mojca Lorber	23f01ac6a9	Add 'Open in APP' button to the task	2020-10-19 12:17:03 +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
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	5d6c9e78fd	Refactor dashboard layout	2020-10-06 16:09:26 +02:00
Mojca Lorber	4e4a4a2c4e	Change Complete step button on task step	2020-10-02 15:02:42 +02:00
Urban Rotnik	fc8704b520	Add fileUtils for sizeCheck, add url to textarea data attribute	2020-09-30 13:20:11 +02:00
Urban Rotnik	dc0072e707	Support multiple file upload in TinyMCE fields	2020-09-29 08:21:31 +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
Urban Rotnik	8b10cde6b4	Fix DeepScan error	2020-09-09 13:51:11 +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
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
Urban Rotnik	d9b691103c	Add permission error message	2020-09-08 15:42:30 +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	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
Urban Rotnik	4eebfa5461	Controller action for card inline preview	2020-08-28 11:05:52 +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
aignatov-bio	21e4dcd96a	Add wopi preview for office files	2020-08-25 13:22:36 +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
aignatov-bio	19a0d05467	Fix for checklist ordering	2020-08-14 12:32:39 +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	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	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	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
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
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
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