Urban Rotnik 80cd01c2e5 Merge pull request #1587 from urbanrotnik/ur-SCI-3207-remove-search-field ... Comment out search field for global activities [SCI-3207]		2019-03-26 12:37:07 +01:00
..
assets	Merge pull request #1583 from aignatov-bio/ai-sci-3203-show-selection-left	2019-03-26 09:37:12 +01:00
controllers	Merge branch 'master' into features/global-activities	2019-03-25 14:35:24 +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 branch 'master' into features/global-activities	2019-03-25 14:35:24 +01:00
javascript	Add missing semicolon [SCI-2856]	2019-03-11 15:13:08 +01: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' into features/global-activities	2019-03-25 14:35:24 +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	Merge branch 'master' into features/global-activities	2019-03-25 14:35:24 +01:00
utilities	removing activity creation from demo project	2019-03-25 15:45:10 +01:00
views	Merge pull request #1587 from urbanrotnik/ur-SCI-3207-remove-search-field	2019-03-26 12:37:07 +01:00