Ivan Diaz 012103c2ad Merge branch 'master' into os-147-151-file-architecture-and-backup ... Conflicts: server/controllers/system.php server/controllers/system/init-settings.php server/data/ERRORS.php		2017-01-13 14:42:04 -03:00
..
add-department.php	Guillermo - add creatae log architecture [skip ci]	2016-12-28 21:55:00 -03:00
backup-database.php	Ivan - Add Database Backup, FileDownloader, FileUploader and LinearCongruentialGenerator classes [skip ci]	2017-01-12 16:45:01 -03:00
delete-department.php	Guillermo - add creatae log architecture [skip ci]	2016-12-28 21:55:00 -03:00
disable-registration.php	Merge branch 'master' of https://bitbucket.org/ivandiazwm/os4-react	2017-01-11 03:50:47 -03:00
download.php	Ivan - Add validations before download and upload on comment [skip ci]	2017-01-12 20:31:12 -03:00
edit-department.php	Guillermo - add creatae log architecture [skip ci]	2016-12-28 21:55:00 -03:00
edit-mail-template.php	Guillermo - path edit/recover-mail-templates [skip ci]	2017-01-03 20:35:46 -03:00
edit-settings.php	Guillermo - stats architecture [skip ci]	2017-01-11 04:25:26 -03:00
enable-registration.php	Merge branch 'master' of https://bitbucket.org/ivandiazwm/os4-react	2017-01-11 03:50:47 -03:00
get-logs.php	Ivan - Deploy changes [skip ci]	2017-01-11 00:21:27 -03:00
get-mail-templates.php	Guillermo - path get-mail-templates [skip ci]	2017-01-03 19:36:26 -03:00
get-settings.php	Merge branch 'master' into OS4#150Enable-registration	2017-01-11 03:49:32 -03:00
get-stats.php	Guillermo - stats architecture [skip ci]	2017-01-12 16:30:58 -03:00
init-settings.php	Merge branch 'master' into os-147-151-file-architecture-and-backup	2017-01-13 14:42:04 -03:00
recover-mail-template.php	Guillermo - path edit/recover-mail-templates [skip ci]	2017-01-03 20:35:46 -03:00