Commit Graph

102 Commits

Author SHA1 Message Date
Ivan Diaz 484bfd4e99 Ivan - Fix enabling user system [skip ci] 2017-03-04 02:57:51 -03:00
ivan 3de5196dd5 Ivan - Add XSS protection backend [skip ci] 2017-03-02 02:56:42 -03:00
ivan 7f1047b311 Ivan - Fix test issues [skip ci] 2017-02-25 03:42:10 -03:00
ivan 5126b40538 Ivan - Fix AreYouSure design, fix stats, rename get-api-keys, use allow-attachment, fix login verificationToken, fix deletion, fix ticket view permission, fix last events when empty, fix configuration in frontend, fix system preferences and my account 2017-02-24 03:56:25 -03:00
Ivan Diaz 2189c18a3c Ivan - Fix some staff edition issues [skip ci] 2017-02-18 19:47:19 -03:00
ivan 8d0da0e451 Ivan - Fix ruby tests 2017-02-18 15:55:09 -03:00
ivan f9ad440bf2 Ivan - Fix download get 2017-02-15 16:14:27 -03:00
ivan 222dbdea04 Ivan - Fix download get 2017-02-15 03:08:48 -03:00
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
AntonyAntonio 6ff0dbdf6b Guillermo - Add user system test [skip ci] 2017-01-16 21:05:11 -03:00
AntonyAntonio e44792c3de Ivan - Add csv file [skip ci] 2017-01-16 20:06:22 -03:00
AntonyAntonio c4b63aab43 Guillermo - disable-user-system [skip ci] 2017-01-16 18:04:26 -03:00
AntonyAntonio 8ce33a2e40 Guillermo - disable-user-system [skip ci] 2017-01-16 17:11:45 -03:00
AntonyAntonio 1c0c16f7f6 Merge branch 'master' into OS156-Disable-user-system
Conflicts:
	server/controllers/system.php
	server/controllers/system/init-settings.php
	server/data/ERRORS.php
	server/libs/Controller.php
	tests/init.rb
2017-01-16 16:13:40 -03:00
AntonyAntonio fdd35ed2c1 Guillermo - disable-user-system [skip ci] 2017-01-16 16:07:53 -03:00
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
Ivan Diaz dffe4a87a0 Ivan - Add file upload and download test [skip ci] 2017-01-13 21:58:59 -03:00
AntonyAntonio 0108414a70 Guillermo - registration api keys [skip ci] 2017-01-13 17:06:49 -03:00
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
Ivan Diaz db63948db7 Ivan - Add file upload test [skip ci] 2017-01-13 14:40:21 -03:00
AntonyAntonio 087a24c75c Guillermo - stast architecture [skip ci] 2017-01-13 13:46:57 -03:00
ivan f2401dcec7 Ivan - Fix file uploader issues, add file upload in ticket creation [skip ci] 2017-01-12 18:29:50 -03:00
AntonyAntonio 5f5a2be76b Guillermo - stast architecture [skip ci] 2017-01-12 18:26:06 -03:00
AntonyAntonio 8763264a01 Merge branch 'master' into OS-144Stats-Architecture
Conflicts:
	server/controllers/system.php
	server/controllers/system/init-settings.php
	tests/init.rb
2017-01-12 17:10:37 -03:00
ivan 134540fed9 Ivan - Add Database Backup, FileDownloader, FileUploader and LinearCongruentialGenerator classes [skip ci] 2017-01-12 16:45:01 -03:00
AntonyAntonio b8d24b601d Guillermo - stats architecture [skip ci] 2017-01-12 16:30:58 -03:00
ivan a7ef5c10f2 Merge branch 'master' into OS4#150Enable-registration
# Conflicts:
#	server/controllers/system/get-settings.php
2017-01-11 03:49:32 -03:00
Ivan Diaz 1ca57e1b76 Ivan - Add deploy on dev 3 changes and fixes [skip ci] 2017-01-10 17:07:49 -03:00
AntonyAntonio 397246aa4b Guillermo - paths enable/disable registration[skip ci] 2017-01-10 16:04:25 -03:00
Ivan Diaz 91e539a053 Ivan - Fix master type [skip ci] 2017-01-06 18:40:33 -03:00
AntonyAntonio d7cd5086bd Guillermo - tests get/edit/recover-mail-templates [skip ci] 2017-01-03 21:06:45 -03:00
AntonyAntonio 78e3a4383a Guillermo - path and tests staff/last-events [skip ci] 2017-01-03 19:02:08 -03:00
AntonyAntonio af4853ed51 Guillermo - path and tests staff/last-events [skip ci] 2017-01-03 18:52:18 -03:00
AntonyAntonio e317bbea38 Merge branch 'master' into OS141create-Log-Architectur
Conflicts:
	server/controllers/staff/delete.php
	tests/system/edit-settings.rb
2016-12-29 18:54:17 -03:00
Ivan Diaz 8be3fddac5 Merged in OS175-registration-with-verification-token (pull request #102)
Os175 registration with verification token
2016-12-29 17:35:23 -03:00
AntonyAntonio 93fbd1cbf0 Guillermo - add TESTS log [skip ci] 2016-12-29 17:25:45 -03:00
AntonyAntonio c7cdfd7318 Guillermo - add creatae log architecture [skip ci] 2016-12-29 02:04:35 -03:00
AntonyAntonio b718598f32 Guillermo - add creatae log architecture [skip ci] 2016-12-28 21:55:00 -03:00
Ivan Diaz 5874cf279e Merged in fix-some-bugs (pull request #103)
Fix some bugs
2016-12-27 16:05:42 -03:00
AntonyAntonio 4e92a0d7a0 Merge branch 'master' into OS175-registration-with-verification-token
Conflicts:
	tests/system/edit-settings.rb
2016-12-26 00:27:50 -03:00
AntonyAntonio e24f46c278 Guillermo - add path /user/verify [skip ci] 2016-12-23 01:56:01 -03:00
AntonyAntonio be2e492aa4 Guillermo - add path /user/verify [skip ci] 2016-12-23 01:27:21 -03:00
ivan 91f8394ef6 Ivan - Add 6000 as max characters for commit [skip ci] 2016-12-21 17:07:34 -03:00
AntonyAntonio 69c3410e03 Guillermo - add test supported languages [skip ci] 2016-12-21 01:09:35 -03:00
AntonyAntonio 83edf85f3d Guillermo - path edit-settings tests[skip ci] 2016-12-19 23:17:35 -03:00
ivan 05380fdfda Ivan - Add transfer to department [skip ci] 2016-12-13 20:19:17 -03:00
Ivan Diaz 763e83331b Merged in OS-124-departments-paths (pull request #93)
Guillermo -   department parths/ department tests
2016-12-12 17:47:33 -03:00
AntonyAntonio 496dc9d939 Guillermo - department parths/ department tests[skip ci] 2016-12-12 02:12:17 -03:00
AntonyAntonio 1d90b80c90 Guillermo - department add owners property add tests[skip ci] 2016-12-10 19:06:21 -03:00
ivan 895fbf011f GUILLERMO - all test staff [skip ci] 2016-12-08 03:21:37 -03:00