Zmago Devetak a6275062b7 Merge pull request #1126 from ZmagoD/zd_SCI_2344 ... adds new string truncation method [fixes SCI-2344]		2018-05-07 16:30:12 +02:00
..
assets	Merge pull request #1124 from ZmagoD/zd_SCI_2347	2018-05-04 09:34:49 +02:00
controllers	Merge pull request #1126 from ZmagoD/zd_SCI_2344	2018-05-07 16:30:12 +02:00
datatables	Merge branch 'master' into ux-release-1	2018-04-26 11:38:54 +02:00
helpers	Merge pull request #1126 from ZmagoD/zd_SCI_2344	2018-05-07 16:30:12 +02:00
javascript	Merge latest changes from ux-release-1 [SCI-2217]	2018-04-04 14:20:34 +02:00
mailers	adds input_sanitizer helper in app mailer [fixes SCI-1185]	2017-04-07 15:01:26 +02:00
middlewares	fixes bug with CSRF on file upload, fixes turbolink issues with remote form submition [fixes SCI-2284]	2018-04-10 13:19:53 +02:00
models	Merge pull request #1118 from ZmagoD/zd_SCI_2323	2018-05-03 14:36:44 +02:00
permissions	Merge branch 'master' into ux-release-1	2018-04-26 11:38:54 +02:00
serializers	Add default settings migration and concern	2017-08-10 11:30:57 +02:00
services	Merge pull request #1116 from ZmagoD/zd_SCI_2310	2018-05-03 14:34:29 +02:00
utilities	Change default repository state to Ruby representation	2018-04-20 12:31:22 +02:00
views	fixes per @mojca 's request	2018-05-03 16:21:29 +02:00