Anton Ignatov ba1d6d45ca Fix merging issues		2019-07-12 15:47:15 +02:00
..
assets	Fix merging issues	2019-07-12 15:47:15 +02:00
controllers	Fix merging issues	2019-07-12 15:47:15 +02:00
datatables	Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]	2018-12-13 11:18:09 +01:00
helpers	Inital refactor for Assets model	2019-07-12 15:02:06 +02:00
javascript	Add croppie tool to avatar editing [SCI-3502] (#1801)	2019-05-31 15:44:27 +02:00
mailers	Set version for HTTParty dependency, add opts in mailer	2019-02-19 11:23:01 +01:00
middlewares
models	Fix merging issues	2019-07-12 15:47:15 +02:00
permissions	Remove blank line	2018-10-26 11:00:13 +02:00
serializers	Futher refactoring of old Paperclip methods [SCI-3539]	2019-07-09 10:28:15 +02:00
services	Inital refactor for Assets model	2019-07-12 15:02:06 +02:00
utilities	Merge branch 'activestorage_migration' into features/marvinjs-integration	2019-07-12 15:00:07 +02:00
views	Inital refactor for Assets model	2019-07-12 15:02:06 +02:00