Commit Graph

121 Commits

Author SHA1 Message Date
Ivan Diaz 0c0e9c3e59 Add docker and make support 2018-03-27 23:30:18 -03:00
ivan 8f8c481d58 Revert "Revert "fix bug #58""
This reverts commit 4b3ea709c8.
2018-01-18 17:13:44 -03:00
Guillermo Giuliana f211bd9cea
Merge pull request #136 from guillegiu/master
fix bug #83
2018-01-17 22:10:28 -03:00
Guillermo a98d7ecdd1 Add htmlentities to department name 2018-01-16 20:23:32 -03:00
Guillermo 3d416f82bd fix bug 83 2018-01-12 23:08:07 -03:00
ivan 2d83116520 [HOTFIX] - Fix check-requirements to check files folder correctly 2018-01-11 18:51:07 -03:00
Guillermo 02b6993615 Fix edit settings test 2018-01-04 00:57:45 -03:00
ivan 5114b4420b Ivan - Fix edit staff myaccount verification 2017-06-28 05:52:45 -03:00
ivan 00801f3b61 Ivan - Fix issue #27, fix frontend<->backend data flow with staff editor, add 403 response 2017-06-25 19:03:56 -03:00
ivan fcb26fab60 Ivan - Fix comment bug #27 2017-06-25 06:07:14 -03:00
AntonyAntonio 91c3b4f396 Guillermo - Issue #20 2017-06-20 16:47:27 -03:00
ivan a59bea46c6 Merge branch 'master' of https://github.com/opensupports/opensupports 2017-06-13 18:17:28 -03:00
ivan d48d7ad875 Ivan - Add SMTP configuration to installation 2017-06-13 18:12:10 -03:00
AntonyAntonio 463853aa70 Guillermo - add new option for sending mails to staff when a new ticket is created 2017-06-10 03:27:22 -03:00
ivan cf1490711a Guillermo - fix bug #11 2017-06-07 14:18:58 -03:00
ivan e440b348d1 Ivan - Fix article deletion tests 2017-04-18 21:21:16 -03:00
ivan e49d93dbb0 Ivan - Fix Issues with installation process [skip ci] 2017-03-29 18:53:00 -03:00
ivan a244a58ebc Ivan - Add all mail templates [skip ci] 2017-03-16 20:00:21 -03:00
ivan 2a4590df2d Ivan - Fix installation tests [skip ci] 2017-03-15 16:17:06 -03:00
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