AntonyAntonio 35ac87ab88 Merge branch 'master' into OS156-Disable-user-system ... Conflicts: server/controllers/system.php tests/init.rb		2017-01-17 15:03:48 -03:00
..
validations	Guillermo - registration api keys [skip ci]	2017-01-13 17:06:49 -03:00
Controller.php	Merge branch 'master' into OS156-Disable-user-system	2017-01-17 15:03:48 -03:00
ControllerGroup.php	[Ivan Diaz] - Move folder architecture	2016-04-17 18:44:24 -03:00
DataStoreList.php	Ivan - Updates needed for dev3 deploy [skip ci]	2016-12-13 21:10:49 -03:00
Date.php	Guillermo - stats architecture [skip ci]	2017-01-12 16:30:58 -03:00
FileDownloader.php	Ivan - Add Database Backup, FileDownloader, FileUploader and LinearCongruentialGenerator classes [skip ci]	2017-01-12 16:45:01 -03:00
FileManager.php	Ivan - Add Database Backup, FileDownloader, FileUploader and LinearCongruentialGenerator classes [skip ci]	2017-01-12 16:45:01 -03:00
FileUploader.php	Ivan - Fix file uploader issues, add file upload in ticket creation [skip ci]	2017-01-12 18:29:50 -03:00
Hashing.php	Ivan - Add Database Backup, FileDownloader, FileUploader and LinearCongruentialGenerator classes [skip ci]	2017-01-12 16:45:01 -03:00
LinearCongruentialGenerator.php	Ivan - Fix file uploader issues, add file upload in ticket creation [skip ci]	2017-01-12 18:29:50 -03:00
MailSender.php	Ivan - dev3 deploy implementation fixes	2016-09-22 20:33:45 -03:00
Validator.php	Ivan - STAFF LOGIN - Add Staff login to backend [skip ci]	2016-09-25 01:16:10 -03:00