Urban Rotnik 11a7a975af Merge branch 'features/scinote-improvements' into master-with-note-section		2019-04-23 14:50:03 +02:00
..
assets	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50:03 +02:00
controllers	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50: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	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50:03 +02:00
javascript	Add fontawesome checkmark before dropdown item	2019-03-26 12:35:17 +01:00
mailers	Set version for HTTParty dependency, add opts in mailer	2019-02-19 11:23:01 +01:00
middlewares
models	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50: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 user order bug (#1687)	2019-04-19 15:24:13 +02:00
utilities	Fix migration issues	2019-04-23 11:11:22 +02:00
views	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50:03 +02:00