Miha Mencin d03ef2cd2a Merge branch 'master' into features/templates		2019-02-28 09:41:20 +01:00
..
assets	Merge branch 'master' into features/templates	2019-02-28 09:41:20 +01:00
controllers	Merge pull request #1514 from biosistemika/features/system-notifications	2019-02-21 16:38:58 +01: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 pull request #1434 from mz3944/mz-SCI-2903	2019-01-21 09:50:34 +01:00
javascript	Fix fontawesome package paths [SCI-2253]	2018-07-31 13:52:21 +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 pull request #1532 from biosistemika/mm-sci-3031-remove-duplicated-relations	2019-02-27 19:53:25 +01:00
permissions	Remove blank line	2018-10-26 11:00:13 +02:00
serializers	Changing double quotes to single quotes	2019-01-31 10:31:03 +01:00
services	Fixed, trying to save object instead name	2019-02-27 10:43:46 +01:00
utilities	Merge branch 'master' into features/templates	2019-02-28 09:41:20 +01:00
views	Revert "Task info section improvements [SCI - 3058]"	2019-02-27 21:00:11 +01:00