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
..
article	Guillermo - add TESTS log [skip ci]	2016-12-29 17:25:45 -03:00
staff	Guillermo - path and tests staff/last-events [skip ci]	2017-01-03 19:02:08 -03:00
system	Merge branch 'master' into OS156-Disable-user-system	2017-01-17 15:03:48 -03:00
ticket	Ivan - Add Database Backup, FileDownloader, FileUploader and LinearCongruentialGenerator classes [skip ci]	2017-01-12 16:45:01 -03:00
user	Ivan - Add deploy on dev 3 changes and fixes [skip ci]	2017-01-10 17:07:49 -03:00
Gemfile	Ivan - Fix ticket creation and comment	2016-08-04 01:37:23 -03:00
clean_db.sh	[Guillermo Giu] - Add tests for 'ticket/create' controller	2016-06-17 18:43:10 -03:00
init.rb	Merge branch 'master' into OS156-Disable-user-system	2017-01-17 15:03:48 -03:00
libs.rb	Ivan - Add file upload and download test [skip ci]	2017-01-13 21:58:59 -03:00
run-tests.sh	Ivan - Backend - Add get-settings tests [skip ci]	2016-08-20 18:33:47 -03:00
scripts.rb	Guillermo - registration api keys [skip ci]	2017-01-13 17:06:49 -03:00