Ivan Diaz 7b95c54257 Merge branch 'master' into os-147-151-file-architecture-and-backup ... Conflicts: server/controllers/system.php server/data/ERRORS.php tests/init.rb		2017-01-14 21:45:43 -03:00
..
add-api-key.rb	Guillermo - registration api keys [skip ci]	2017-01-13 17:06:49 -03:00
add-department.rb	Guillermo - add TESTS log [skip ci]	2016-12-29 17:25:45 -03:00
delete-api-key.rb	Guillermo - registration api keys [skip ci]	2017-01-13 17:06:49 -03:00
delete-department.rb	Guillermo - add TESTS log [skip ci]	2016-12-29 17:25:45 -03:00
disable-registration.rb	Guillermo - paths enable/disable registration[skip ci]	2017-01-10 16:04:25 -03:00
edit-department.rb	Guillermo - add TESTS log [skip ci]	2016-12-29 17:25:45 -03:00
edit-mail-template.rb	Guillermo - tests get/edit/recover-mail-templates [skip ci]	2017-01-03 21:06:45 -03:00
edit-settings.rb	Ivan - Fix file uploader issues, add file upload in ticket creation [skip ci]	2017-01-12 18:29:50 -03:00
enable-registration.rb	Guillermo - paths enable/disable registration[skip ci]	2017-01-10 16:04:25 -03:00
file-upload-download.rb	Ivan - Add file upload and download test [skip ci]	2017-01-13 21:58:59 -03:00
get-all-keys.rb	Guillermo - registration api keys [skip ci]	2017-01-13 17:06:49 -03:00
get-mail-templates.rb	Guillermo - tests get/edit/recover-mail-templates [skip ci]	2017-01-03 21:06:45 -03:00
get-settings.rb	Ivan - Add deploy on dev 3 changes and fixes [skip ci]	2017-01-10 17:07:49 -03:00
get-stats.rb	Ivan - Add file upload and download test [skip ci]	2017-01-13 21:58:59 -03:00
init-settings.rb	Ivan - Fix issues with mail templating and add it to ruby tests [skip ci]	2016-07-27 00:44:07 -03:00
recover-mail-template.rb	Guillermo - tests get/edit/recover-mail-templates [skip ci]	2017-01-03 21:06:45 -03:00