okriuchykhin e608d629c7 Merge pull request #1068 from okriuchykhin/ok_SCI_2217 ... Refactor file preview modal [SCI-2217]		2018-04-05 00:18:43 +02:00
..
assets	Merge pull request #1068 from okriuchykhin/ok_SCI_2217	2018-04-05 00:18:43 +02:00
controllers	Merge latest changes from ux-release-1 [SCI-2217]	2018-04-04 14:20:34 +02:00
datatables	Fix fa icons [SCI-2217]	2018-03-30 17:03:44 +02:00
helpers	Merge pull request #1068 from okriuchykhin/ok_SCI_2217	2018-04-05 00:18:43 +02:00
javascript	Merge latest changes from ux-release-1 [SCI-2217]	2018-04-04 14:20:34 +02:00
mailers
models	fixes failing specs	2018-04-04 14:44:32 +02:00
permissions	refactor smart annotation parser, adds repository item to smart annotation parser [fixes SCI-2222]	2018-03-29 15:55:26 +02:00
serializers	Add default settings migration and concern	2017-08-10 11:30:57 +02:00
services	Merge pull request #1073 from ZmagoD/zd_SCI_2206	2018-04-04 15:39:59 +02:00
utilities	Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2024_fix_custom_repositores_import	2018-03-13 15:25:57 +01:00
views	Merge pull request #1068 from okriuchykhin/ok_SCI_2217	2018-04-05 00:18:43 +02:00