Zanz2 ef0733b886 Merge pull request #988 from Zanz2/red_error_msg_sci1993 ... Accidentally deleted this off master, identical to the branch before [SCI-1993]		2018-02-07 13:08:45 +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 #988 from Zanz2/red_error_msg_sci1993	2018-02-07 13:08:45 +01:00
datatables	Merge pull request #911 from mlorb/ml-sci-1797	2018-01-05 16:03:55 +01:00
helpers	Merge pull request #983 from Zanz2/gen_rep_empty_sci-2000	2018-02-06 14:34:31 +01:00
javascript	Comment react-hijack code	2018-02-06 08:00:29 +01:00
mailers	adds input_sanitizer helper in app mailer [fixes SCI-1185]	2017-04-07 15:01:26 +02:00
models	fix bug with ajax error caused to the other user when deleting column in custom repository	2018-01-29 16:01:33 +01:00
permissions	removes unneeded permissions	2018-01-24 16:34:48 +01:00
serializers	Add default settings migration and concern	2017-08-10 11:30:57 +02:00
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	re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches	2018-02-07 11:17:53 +01:00