1889 commits

Author	SHA1	Message	Date
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	04a6a2a250	Small fixes	2020-07-23 11:35:22 +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	005bfb2ba7	Fix merge conflicts	2020-07-22 12:37:18 +02:00
aignatov-bio	ddfe8231d8	Merge branch 'features/2fa' into develop	2020-07-22 11:56:36 +02:00
aignatov-bio	75930b99c3	Fix global activities filters	2020-07-20 15:01:00 +02:00
aignatov-bio	7c4bfad09b	Add pagination to results page	2020-07-16 15:47:19 +02:00
aignatov-bio	c592954400	Add UX	2020-07-13 16:05:23 +02:00
aignatov-bio	7d20bf6fea	Add recovery screen	2020-07-13 09:51:04 +02:00
aignatov-bio	fef6e5f1db	Add recovery strategy for 2fa	2020-07-09 17:01:00 +02:00
Urban Rotnik	721f3accbe	Merge pull request #2694 from urbanrotnik/ur-sci-4790 ... Show assigned users modal also for view only [SCI-4790]	2020-07-09 16:12:20 +02:00
Urban Rotnik	d2415c3b1d	Show assigned users modal also for view	2020-07-09 15:11:53 +02:00
Urban Rotnik	d8d0f7ef8e	Fix counter in assign dropdown menu on task	2020-07-09 14:50:37 +02:00
Urban Rotnik	b11f166c38	Fix cucumber tests	2020-07-09 13:14:07 +02:00
aignatov-bio	6245e19069	Merge pull request #2718 from biosistemika/master ... Merge master to develop	2020-07-09 12:56:31 +02:00
Urban Rotnik	950f65b90e	Merge pull request #2715 from urbanrotnik/ur-sci-4771-improve-report-layout ... Improve report layout [SCI-4771]	2020-07-09 11:48:33 +02:00
mlorb	efbef2c876	Merge pull request #2384 from mlorb/ml-sci-4261 ... Clean up controllers for manage repository columns [SCI-4261]	2020-07-09 09:18:23 +02:00
Mojca Lorber	de9df7f1b0	Add NotImplementedError	2020-07-08 13:28:12 +02:00
Urban Rotnik	d6f37ce28e	Merge pull request #2710 from urbanrotnik/ur-sci-4568-remove-flash-message ... Remove flash message for redirects from root url [SCI-4568]	2020-07-08 11:42:05 +02:00
Urban Rotnik	5d067077b1	Add logo and timestamp to PDF and Doc reports	2020-07-08 10:48:29 +02:00
aignatov-bio	be3a1994f8	Add basic UX to 2FA	2020-07-07 13:09:48 +02:00
aignatov-bio	13f7653667	Merge branch 'develop' into features/2fa	2020-07-07 13:05:45 +02:00
Urban Rotnik	ceddfdd978	Remove flash message for redirects from root url	2020-07-07 11:13:36 +02:00
aignatov-bio	b127d8c754	Improve active/archive switcher	2020-07-06 14:03:55 +02:00
aignatov-bio	9b33cbc104	Rename ensure 2fa method	2020-07-02 11:24:33 +02:00
aignatov-bio	46256c89c9	Fix tests	2020-07-01 15:44:52 +02:00
aignatov-bio	742fb0d27b	Small 2fa improvments	2020-07-01 14:41:55 +02:00
aignatov-bio	4b9881e31e	Add 2fa to user settings page	2020-07-01 13:25:06 +02:00
Urban Rotnik	62a4a5f203	Add 2fa login	2020-07-01 12:46:26 +02:00
Mojca Lorber	22b71bc9cb	Merge branch 'develop' into ml-sci-4261	2020-06-30 13:47:32 +02:00
Mojca Lorber	cf9c3be4cf	Move before actions in RepositoryColumnsController	2020-06-30 13:44:49 +02:00
aignatov-bio	1c34762af3	Merge pull request #2690 from aignatov-bio/ai-sci-4791-fix-shared-inventories-in-task-repositories-dropdown ... Fix repositories dropdown on task page [SCI-4791]	2020-06-29 09:51:51 +02:00
Alex Kriuchykhin	faa76a6442	Merge pull request #2660 from okriuchykhin/ok_SCI_4707_v2 ... Improve user input filtering on user settings page and for task tags [SCI-4707]	2020-06-29 09:30:45 +02:00
aignatov-bio	968963c24b	Fix repositories dropdown on task page	2020-06-26 11:19:40 +02:00
Oleksii Kriuchykhin	7ea577d8d4	Merge branch 'features/inventory-archiving' into develop	2020-06-24 14:04:54 +02:00
Alex Kriuchykhin	2a315ac106	Merge pull request #2681 from biosistemika/SCI-4780-replace-delete-button ... SCI-4780 replace delete button with archive button	2020-06-24 13:16:11 +02:00
Alex Kriuchykhin	e1b862a332	Merge pull request #2679 from urbanrotnik/ur-sci-4741-api-endopints-update ... Filter out non active repositories and rows [SCI-4741]	2020-06-24 12:51:13 +02:00
Alex Kriuchykhin	8a17b721db	Merge pull request #2678 from urbanrotnik/ur-sci-4878 ... Update all rows on repository archive/restore [SCI-4787]	2020-06-24 12:06:41 +02:00
Oleksii Kriuchykhin	8e0ed286fb	Improve repositories loading for archive/restore [SCI-4780]	2020-06-24 12:01:38 +02:00
Urban Rotnik	2f4bf95373	Revert scrope	2020-06-24 11:42:59 +02:00
Oleksii Kriuchykhin	29f62419bd	Improve repository archive/restore actions [SCI-4780]	2020-06-24 11:32:20 +02:00
aignatov-bio	5fc3146174	Update my module repositories dropdown list	2020-06-24 11:23:17 +02:00
miha	41bb825f33	SCI-4780 Added archive and restore items to repository actions dropdown, minor refactoring of controller	2020-06-23 22:59:21 +02:00
Urban Rotnik	c565cbe579	Filter out non active repositories and rows	2020-06-23 10:23:22 +02:00
Urban Rotnik	30de400cf9	Merge pull request #2676 from mlorb/ml-sci-4786 ... Revert default_scope for active repositories [SCI-4786]	2020-06-22 16:17:39 +02:00
Mojca Lorber	be19190ff1	Revert default_scope for active repositories	2020-06-22 14:57:35 +02:00
aignatov-bio	6f2d5b359e	Add action buttons to repository index	2020-06-19 15:54:45 +02:00
Mojca Lorber	3d59bbd50e	Fix default scope bugs	2020-06-18 18:08:53 +02:00
Mojca Lorber	6e8062179c	Implement archiving and restoring of whole inventories	2020-06-18 18:07:23 +02:00
aignatov-bio	e7659da0e7	Fix tests	2020-06-18 14:09:29 +02:00