Anton Ignatov 88e67a16c2 Merge branch 'master-with-note-section' into feature/marvinjs-integration		2019-05-02 16:16:03 +02:00
..
assets	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-02 16:16:03 +02:00
controllers	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-02 16:16:03 +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	Fix markup	2019-04-28 19:11:41 +02:00
javascript	Fix paths for highlightjs-github-theme [SCI-3377]	2019-04-24 12:35:01 +02:00
mailers	Set version for HTTParty dependency, add opts in mailer	2019-02-19 11:23:01 +01:00
middlewares	Rename sciNote -> SciNote (app/ folder)	2018-05-21 15:19:11 +02:00
models	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-02 16:16:03 +02:00
permissions	Remove blank line	2018-10-26 11:00:13 +02:00
serializers	Update API endpoints for new activities	2019-04-08 15:07:45 +02:00
services	Fix sorting by user name with search parameter in inventories [SCI-3391]	2019-04-25 16:29:41 +02:00
utilities	Merge branch 'master' into master-with-note-section	2019-04-30 12:07:59 +02:00
views	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-02 16:16:03 +02:00