Alex Kriuchykhin 2c3c690713 Merge pull request #2113 from okriuchykhin/ok_SCI_3839 ... Remove the deprecated foreign keys from TinyMceAsset [SCI-3839]		2019-10-02 10:39:35 +02:00
..
assets	Merge pull request #2104 from aignatov-bio/ai-sci-3907-update-marvin-js-asset-in-result-on-cancel	2019-10-01 13:39:01 +02:00
controllers	Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934]	2019-10-01 13:06:01 +02:00
datatables
helpers	Merge branch 'master' into ok_SCI_3881	2019-09-16 11:56:49 +02:00
javascript	Comment out index.jsx	2019-07-02 18:07:12 +02:00
jobs/active_storage	Move file preview generation to delayed job [SCI-3891]	2019-09-23 21:07:03 +02:00
mailers
middlewares
models	Remove the deprecated foreign keys from TinyMceAsset [SCI-3839]	2019-10-01 15:49:37 +02:00
permissions	Merge branch 'master' into ok_SCI_3881	2019-09-16 11:56:49 +02:00
serializers	Fix tests for active storage	2019-07-26 15:58:51 +02:00
services	Fix docx report for active storage	2019-10-01 10:26:24 +02:00
utilities	Merge branch 'master' into ok_SCI_3881	2019-09-16 11:56:49 +02:00
views	Merge pull request #2103 from urbanrotnik/ur-sci-3936-permission-issue	2019-10-02 09:51:53 +02:00