Zanz2 1d4ce42f23 fixed according to PR		2018-01-26 15:29:13 +01:00
..
assets	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
controllers	A red error messagge is now displayed when selecting no protocol and pressing upload on protocols io import, and after the modal is closed the messagge is gone	2018-01-25 15:54:38 +01:00
datatables	Merge pull request #911 from mlorb/ml-sci-1797	2018-01-05 16:03:55 +01:00
helpers	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
javascript	1. fixes failing unit and integration tests	2018-01-23 14:54:15 +01:00
mailers
models	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
permissions	rename create_teams	2018-01-05 16:47: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	fixed according to PR	2018-01-26 15:29:13 +01:00