aignatov-bio 005bfb2ba7 Fix merge conflicts		2020-07-22 12:37:18 +02:00
..
assets	Merge branch 'features/2fa' into develop	2020-07-22 11:56:36 +02:00
controllers	Fix merge conflicts	2020-07-22 12:37:18 +02:00
datatables	Merge branch 'develop' into features/new-task-layout	2020-05-15 14:27:56 +02:00
helpers	Revert FontAwesome in reports to CDN	2020-07-14 09:44:03 +02:00
javascript	Add basic UX to 2FA	2020-07-07 13:09:48 +02:00
jobs	Implement background processing of repository snapshots [SCI-4552]	2020-04-28 12:09:36 +02:00
mailers
middlewares
models	Merge branch 'features/2fa' into develop	2020-07-22 11:56:36 +02:00
permissions	Improve repository archive/restore actions [SCI-4780]	2020-06-24 11:32:20 +02:00
serializers	Fix smart annotation in inventory on edit	2020-06-12 11:17:50 +02:00
services	Fix issue with missing archived items on task page [SCI-4854]	2020-07-10 11:43:06 +02:00
utilities	Merge branch 'features/inventory-archiving' into develop	2020-06-24 14:04:54 +02:00
views	Merge branch 'features/2fa' into develop	2020-07-22 11:56:36 +02:00