Zmago Devetak 76c4202664 Merge pull request #1110 from ZmagoD/zd_SCI_2311 ... fixes controller action in manage_columns		2018-04-20 10:36:31 +02:00
..
assets	Merge pull request #1100 from mlorb/ml-sci-2303	2018-04-20 09:50:35 +02:00
controllers	Merge pull request #1110 from ZmagoD/zd_SCI_2311	2018-04-20 10:36:31 +02:00
datatables	Fix fa icons [SCI-2217]	2018-03-30 17:03:44 +02:00
helpers	Merge pull request #1099 from mlorb/ml-sci-2167	2018-04-19 16:11:37 +02:00
javascript	Merge latest changes from ux-release-1 [SCI-2217]	2018-04-04 14:20:34 +02:00
mailers
models	Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860	2018-04-12 13:16:46 +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
services	Merge pull request #1105 from ZmagoD/zd_SCI_2307	2018-04-19 17:58:48 +02:00
utilities	Merge pull request #1083 from ZmagoD/zd_SCI_2259	2018-04-19 17:17:54 +02:00
views	Merge pull request #1109 from ZmagoD/zd_SCI_2297_v3	2018-04-20 09:57:30 +02:00