okriuchykhin e7fb1bc716 Merge pull request #967 from okriuchykhin/ok_SCI_1966 ... Merge gilson-iot-rails4 to master [SCI-1966]		2018-02-12 11:02:17 +01:00
..
assets	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
controllers	Merge pull request #967 from okriuchykhin/ok_SCI_1966	2018-02-12 11:02:17 +01:00
datatables	Merge pull request #911 from mlorb/ml-sci-1797	2018-01-05 16:03:55 +01:00
helpers	Fixed newline styling, now code is styled in newlines, and since \n doesnt work i change it to <br> with gsub and that allows code to be written into multiple lines	2018-02-07 14:46:25 +01:00
javascript	Comment react-hijack code	2018-02-06 08:00:29 +01:00
mailers
models	Improve files handling in protocol clonning [SCI-2003]	2018-02-01 15:44:08 +01:00
permissions	removes unneeded permissions	2018-01-24 16:34:48 +01:00
serializers
services	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
utilities	Merge pull request #951 from okriuchykhin/ok_SCI_1949	2018-01-23 14:02:54 +01:00
views	Merge pull request #990 from Zanz2/code_formatting_sci1822	2018-02-08 08:52:44 +01:00