Andrej e1a90348d5 Resolve conflicts after navigator merge		2023-05-16 10:49:40 +02:00
..
assets	Resolve conflicts after navigator merge	2023-05-16 10:49:40 +02:00
components	Fix dates formatting in report templates [SCI-5774]	2021-05-31 11:51:04 +02:00
controllers	Merge pull request #5398 from aignatov-bio/ai-sci-8405-improve-navigation-in-archive-state	2023-05-16 10:38:37 +02:00
datatables	Display all protocol templates for team admin [SCI-8379] (#5391)	2023-05-16 10:29:00 +02:00
helpers	Merge branch 'develop' into features/navigation-refactor-v2	2023-05-16 10:22:11 +02:00
javascript	Merge pull request #5398 from aignatov-bio/ai-sci-8405-improve-navigation-in-archive-state	2023-05-16 10:38:37 +02:00
jobs	Fix changing of project default user role by automatically assigned user [SCI-7969] (#5343)	2023-04-24 16:27:59 +02:00
mailers
middlewares
models	Merge branch 'develop' into features/navigation-refactor-v2	2023-05-16 10:22:11 +02:00
permissions	Update permissions for team owner to see all protocols and can manage users [SCI-8380] (#5371)	2023-05-09 16:23:29 +02:00
serializers	Fix large asset preview [SCI-8433] (#5408)	2023-05-16 10:24:08 +02:00
services	Merge branch 'develop' into features/navigation-refactor-v2	2023-05-16 10:22:11 +02:00
utilities	Fix inclusion of InputSanitizeHelper in SmartAnnotation utility (#5365)	2023-05-04 16:59:32 +02:00
views	Display all protocol templates for team admin [SCI-8379] (#5391)	2023-05-16 10:29:00 +02:00