Commit Graph

61 Commits

Author SHA1 Message Date
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 d4263d4b94 Ivan - Fix uploading of files 2017-02-18 15:28:23 -03:00
ivan f9ad440bf2 Ivan - Fix download get 2017-02-15 16:14:27 -03:00
ivan 6f1638e5fe Ivan - Update backend methods [skip ci] 2017-02-08 15:09:15 -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 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
AntonyAntonio 565c60c198 Guillermo - csv import [skip ci] 2017-01-15 17:33:33 -03:00
AntonyAntonio 8f2310f855 Merge branch 'master' into OS154-CSV-Import
Conflicts:
	server/controllers/system.php
2017-01-15 17:08:07 -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
AntonyAntonio 6eae5f9299 Guillermo - csv import [skip ci] 2017-01-14 18:19:21 -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 71984384cc Ivan - Add validations before download and upload on comment [skip ci] 2017-01-12 20:31:12 -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
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 Diaz 1ca57e1b76 Ivan - Add deploy on dev 3 changes and fixes [skip ci] 2017-01-10 17:07:49 -03:00
Ivan Diaz 839bc0bf9e Merged in OS-168-update-dates (pull request #97)
OS-168 update dates
2016-12-13 22:06:58 -03:00
ivan 8d2033ec31 Ivan - Updates needed for dev3 deploy [skip ci] 2016-12-13 21:10:49 -03:00
Max Red be3cdf25f9 Max - modifies backend date function [skip ci] 2016-12-12 15:56:25 -03:00
ivan 895fbf011f GUILLERMO - all test staff [skip ci] 2016-12-08 03:21:37 -03:00
ivan 2703f82253 Ivan - Fix master issues. Improve error handling 2016-11-24 18:02:18 -03:00
ivan 94fd359098 Ivan - Add articles paths [skip ci] 2016-11-22 22:27:05 -03:00
ivan 8b3c8bf284 Ivan - Fix authorUser/authorStaff issues, fix date, add tests for ticket events [skip ci] 2016-11-20 19:00:39 -03:00
ivan 684bdb1a25 Ivan - Add CustomResponse tests [skip ci] 2016-10-03 16:57:12 -03:00
ivan 84b33ea871 Ivan - Add CustomResponse model and paths [skip ci] 2016-10-03 16:44:41 -03:00
ivan cc7c5bfb3d Ivan - STAFF LOGIN - Add Staff login to backend [skip ci] 2016-09-25 01:16:10 -03:00
Ivan Diaz 060f1b7a12 Merged in OS-68-crear-admin-login (pull request #51)
Max Red - Create login page
2016-09-23 16:55:06 -03:00
ivan f8b27f98c6 Ivan - dev3 deploy implementation fixes 2016-09-22 20:33:45 -03:00
ivan 07bc533681 Max Red - Create login page [skip ci] 2016-09-22 18:23:53 -03:00
ivan da7aad3576 Ivan - Backend - Create /user/get path [skip ci] 2016-09-09 00:38:58 -03:00
Ivan Diaz 62cb8df2b6 Merged in captcha (pull request #39)
Funcionalidad de Captcha [Frontend/Backend]
2016-08-30 16:28:56 -03:00
ivan 4f5f91994d Ivan - Backend - Add Captcha validation [skip ci] 2016-08-20 18:24:22 -03:00
AntonyAntonio 54eb3e89e8 (Guillermo) ticketnumber stage 1 [skip ci] 2016-08-16 23:49:40 -03:00
AntonyAntonio 54da0699dd (Guillermo) path-user-edit and mailsender [skip ci] 2016-08-07 23:21:48 -03:00
ivan 3c3c11027d Ivan - Fix Recover Password validations 2016-08-04 16:01:24 -03:00
ivan 830e2115a3 Ivan - Add ruby api testing for comment/create 2016-08-04 15:41:22 -03:00
ivan 855c99398d Ivan - Fix ticket creation and comment 2016-08-04 01:37:23 -03:00
ivan d6853b3a4b Ivan - Fix all list/beanInstance functionality 2016-08-04 00:59:04 -03:00
Ivan Diaz a98cf9176b Merged in Full-ticket-create-logic (pull request #32)
(Guillermo)  full ticket create
2016-08-03 15:08:57 -03:00
AntonyAntonio 0fc5bac930 (Guillermo) full ticket create 2016-08-01 00:34:55 -03:00
ivan eccc0b5a29 Ivan - Implent NullDataStore pattern, refactor login controller, add get-setting and set-setting controllers 2016-07-27 13:58:19 -03:00
ivan d23fba451e Ivan - Add smtp settings [skip ci] 2016-07-27 01:04:29 -03:00
Ivan Diaz 4c075d3821 Merged in Add-email-sender-class (pull request #22)
Add email sender class
2016-07-19 17:49:21 -03:00
ivan 9a25e7b7ae Ivan - Add FakeSMTP support [skip ci] 2016-07-14 19:53:24 -03:00
ivan 8b810f7bd5 Ivan - Add MailTemplate and MailSender 2016-07-14 19:06:47 -03:00
AntonyAntonio 48fe22c536 (Guillermo) Add-email-sender-class 2016-07-14 03:34:13 -03:00
ivan 948b476c12 Merge branch 'master' into Add-email-sender-class
# Conflicts:
#	server/composer.json
#	server/controllers/user/signup.php
2016-07-14 01:45:50 -03:00