Zmago Devetak 4e4cae9a48 Merge pull request #927 from ZmagoD/zd_SCI_1867 ... fix import protocol preview [fixes SCI-1867]		2018-01-08 14:21:44 +01:00
..
assets	Merge pull request #927 from ZmagoD/zd_SCI_1867	2018-01-08 14:21:44 +01:00
controllers	Merge branch 'gilson-iot-rails4'	2017-12-19 10:56:39 +01:00
datatables	Add ordering for column mappings in repositories	2017-07-26 13:35:54 +02:00
helpers	Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step	2017-12-12 09:53:24 +01:00
mailers	adds input_sanitizer helper in app mailer [fixes SCI-1185]	2017-04-07 15:01:26 +02:00
models	Merge branch 'gilson-iot-rails4'	2017-12-19 10:56:39 +01:00
services	Remove Creek XLSX parser gem as it causes conflicts [SCI-1891]	2017-12-19 16:17:11 +01:00
utilities	fix import protocol preview [fixes SCI-1867]	2018-01-05 15:30:11 +01:00
views	Fix experiment workflow image update indicator [SCI-1872]	2017-12-22 13:12:52 +01:00