Oleksii Kriuchykhin 1b902ff4b3 Merge branch 'develop' into ok_SCI_3988		2020-01-07 15:26:30 +01:00
..
assets	Merge branch 'develop' into ok_SCI_3988	2020-01-07 15:26:30 +01:00
controllers	Merge pull request #2276 from biosistemika/master	2019-12-20 17:39:46 +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 #2263 from okriuchykhin/ok_SCI_4142	2019-12-12 16:12:40 +01:00
javascript	Comment out index.jsx	2019-07-02 18:07:12 +02:00
jobs/active_storage	Generate all preview for assets at same time	2019-10-10 14:17:02 +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 'develop' into ok_SCI_3988	2020-01-07 15:26:30 +01:00
permissions	Separate view/edit/modify permissions SCI-4058	2019-11-20 17:12:47 +01:00
serializers	Add update result(file) and create result(file) API endpoint	2019-11-18 11:11:38 +01:00
services	Merge branch 'develop' into ok_SCI_3988	2020-01-07 15:26:30 +01:00
utilities	Fix TinyMCE import from ELN	2019-10-07 16:21:11 +02:00
views	Merge branch 'SCI-4058-disable-inventory-delition-for-normal-user' into release/1.17.9	2019-12-17 14:48:50 +01:00