1219 commits

Author	SHA1	Message	Date
aignatov-bio	ddfe8231d8	Merge branch 'features/2fa' into develop	2020-07-22 11:56:36 +02:00
Alex Kriuchykhin	eb7fe360ff	Merge pull request #2729 from urbanrotnik/ur-sci-4853 ... Remove :not_shared permission level for TeamRepository entity [SCI-4853]	2020-07-20 11:49:07 +02:00
Mojca Lorber	f7083a000a	Add devise lockable to user	2020-07-14 14:49:51 +02:00
aignatov-bio	c592954400	Add UX	2020-07-13 16:05:23 +02:00
Urban Rotnik	07e2df8951	Remove :not_shared permission level for TeamRepository entity	2020-07-13 12:56:26 +02:00
Miha Mencin	12a8d50098	Merge pull request #2722 from okriuchykhin/ok_SCI_4845 ... Fix missing unshared inventories with snapshots in reports [SCI-4845]	2020-07-10 09:21:58 +02:00
aignatov-bio	fef6e5f1db	Add recovery strategy for 2fa	2020-07-09 17:01:00 +02:00
Oleksii Kriuchykhin	7efe5c32eb	Fix missing unshared and unassigned inventories with snapshots in reports [SCI-4845]	2020-07-09 15:38:38 +02:00
aignatov-bio	6245e19069	Merge pull request #2718 from biosistemika/master ... Merge master to develop	2020-07-09 12:56:31 +02:00
aignatov-bio	13f7653667	Merge branch 'develop' into features/2fa	2020-07-07 13:05:45 +02:00
Miha Mencin	6726a19cbe	Merge pull request #2695 from okriuchykhin/ok_SCI_4738 ... Add repository snapshots to export all [SCI-4738]	2020-07-02 15:18:47 +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
Oleksii Kriuchykhin	166a0ddd34	Improve code styling [SCI-4738]	2020-06-29 11:43:23 +02:00
Urban Rotnik	de8aca9dbd	Rename column	2020-06-29 10:42:19 +02:00
Miha Mencin	bfdf53c514	Merge pull request #2673 from urbanrotnik/ur-sci-4749 ... Fix valdiation for snapshot selection [SCI-4749]	2020-06-29 09:42:37 +02:00
Urban Rotnik	88f54b16d7	Add 2fa fields to user	2020-06-24 17:58:58 +02:00
Oleksii Kriuchykhin	7ea577d8d4	Merge branch 'features/inventory-archiving' into develop	2020-06-24 14:04:54 +02:00
Urban Rotnik	2f4bf95373	Revert scrope	2020-06-24 11:42:59 +02:00
Urban Rotnik	91af7135c1	Update scopes for repository items	2020-06-23 18:24:46 +02:00
Urban Rotnik	6de322498b	Delegate archived methods to parent repository	2020-06-23 17:16:02 +02:00
Urban Rotnik	e89bf58e1c	Refactory restore inventory service	2020-06-23 08:24:52 +02:00
Mojca Lorber	22a45237be	Remove doubled code	2020-06-22 15:41:24 +02:00
Mojca Lorber	be19190ff1	Revert default_scope for active repositories	2020-06-22 14:57:35 +02:00
Urban Rotnik	07ca1de737	Fix valdiation for snapshot selection	2020-06-22 07:30:49 +02:00
Mojca Lorber	6e8062179c	Implement archiving and restoring of whole inventories	2020-06-18 18:07:23 +02:00
aignatov-bio	323929b270	Add restore/delete buttons	2020-06-18 14:09:29 +02:00
Urban Rotnik	b498aa54d3	Merge pull request #2661 from urbanrotnik/ur-sci-4740-default-scope ... Update default scope [SCI-4740] [SCI-4687][SCI-4746]	2020-06-18 14:07:10 +02:00
Urban Rotnik	a05be67d3a	Merge pull request #2652 from urbanrotnik/ur-sci-4703-archived-tag ... Add archived tags to assigned repository rows [SCI-4703]	2020-06-18 13:47:57 +02:00
Urban Rotnik	123375f494	Update scopes in reports	2020-06-18 09:33:12 +02:00
Urban Rotnik	d5b82f857e	Add tag for DOCX	2020-06-18 08:52:59 +02:00
Oleksii Kriuchykhin	86b2eea383	Add repository snapshots to export all [SCI-4738]	2020-06-17 23:21:56 +02:00
Urban Rotnik	83bd8c3ad4	Add default scope for non archived repositories	2020-06-16 09:18:22 +02:00
Urban Rotnik	868c1c1fa0	Improve row state passing	2020-06-15 13:42:16 +02:00
Urban Rotnik	15342cd8f2	Fix update_canvas	2020-06-15 10:52:35 +02:00
Urban Rotnik	9bac0fb867	Add archived tags to assigned repository rows	2020-06-10 14:48:03 +02:00
Urban Rotnik	26db4f3515	Add Archive and Restore service	2020-06-09 18:50:36 +02:00
Urban Rotnik	ebbce8d09e	Add restore columns to migrations	2020-06-09 18:43:22 +02:00
mlorb	75f2a49cc4	Merge branch 'features/inventory-archiving' into ml-sci-4689	2020-06-08 16:30:24 +02:00
Mojca Lorber	a9a278409c	Fix test	2020-06-08 16:22:37 +02:00
Urban Rotnik	9b114a50c3	Merge pull request #2642 from urbanrotnik/ur-sci-4721-counter-fix ... Fix assigned items counter [SCI-4721]	2020-06-08 09:10:44 +02:00
Urban Rotnik	17620e3e86	Merge pull request #2631 from urbanrotnik/ur-sci-4534-not-visible-checklist ... Export and import checklist items with delimiter [SCI-4534]	2020-06-08 09:10:26 +02:00
Mojca Lorber	42d6d727b9	Add archive to repository rows	2020-06-04 23:29:37 +02:00
aignatov-bio	4a6d7d0e12	Add archived inventories	2020-06-04 19:07:10 +02:00
Mojca Lorber	d3806e53a5	Add archive to repository	2020-06-04 15:44:47 +02:00
Urban Rotnik	c2ecc1749e	Fix assigned items counter	2020-06-04 15:36:31 +02:00
Oleksii Kriuchykhin	f1f26587c0	Fix appearence of snapshots from another my_module in report [SCI-4728]	2020-06-04 09:42:22 +02:00