Zanz2 e782f13a7d Merge branch 'master' of github.com:Zanz2/scinote-web into size_limit_small_SCI-1810		2017-11-16 15:14:01 +01:00
..
assets	change text for avatar size on my profile page	2017-11-15 14:21:04 +01:00
controllers	Fixed unit error;Now when comparing file size, both are in bytes	2017-11-16 01:34:38 +01:00
datatables	Add ordering for column mappings in repositories	2017-07-26 13:35:54 +02:00
helpers	Merge pull request #866 from biosistemika/protocols-io-import	2017-11-13 11:53:28 +01:00
mailers	adds input_sanitizer helper in app mailer [fixes SCI-1185]	2017-04-07 15:01:26 +02:00
models	Allow import of the sample with missing non mandatory fields [SCI-1819]	2017-11-15 16:40:14 +01:00
services	Move duplicated code to service [SCI-1665]	2017-10-17 14:46:16 +02:00
utilities	Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json	2017-11-06 14:53:01 +01:00
views	Merge pull request #878 from Zanz2/protocol_description_fix	2017-11-16 01:11:52 +01:00