Commit Graph

265 Commits

Author SHA1 Message Date
ivan cbc4c15101 Ivan - Fix issues with release block 2 part 2 2016-12-04 23:51:45 -03:00
AntonyAntonio d40327f0ce Guillermo - ban-on-signup[skip ci] 2016-12-04 04:08:42 -03:00
ivan f6ae50ef87 guillermo- banning architecture [skip ci] 2016-11-30 19:16:18 -03:00
ivan f3c1882a13 guillermo- delete-user [skip ci] 2016-11-30 17:30:00 -03:00
ivan 5907cbda00 guillermo- get-user [skip ci] 2016-11-30 14:13:57 -03:00
ivan 8ab6240385 guillermo- get-users [skip ci] 2016-11-30 03:33:46 -03:00
ivan 94fd359098 Ivan - Add articles paths [skip ci] 2016-11-22 22:27:05 -03:00
ivan 9aceff4313 Ivan - Fixes for Deploy 2016-11-20 23:01:38 -03:00
ivan c8ee619000 Merge branch 'master' into OS-116-Ticket-events
# Conflicts:
#	tests/init.rb
2016-11-20 19:02:47 -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 Diaz 323b481c62 Merged in OS-116-Ticket-events (pull request #78)
OS-116 ticket events
2016-11-20 21:59:18 +00:00
AntonyAntonio 66281df491 Guillermo - staff-get-all-tickets[skip ci] 2016-11-19 22:54:08 -03:00
Ivan Diaz b0bb56fae2 Merged in change-profile-pic-url (pull request #76)
init-settings.php edited online with Bitbucket
2016-11-08 19:48:25 +00:00
Ivan Diaz faf2544d1d init-settings.php edited online with Bitbucket 2016-11-05 16:56:33 +00:00
ivan 83e3672f55 Ivan - Add Get all tickets and search [skip ci] 2016-11-04 19:10:32 -03:00
AntonyAntonio 7693f030f0 Guillermo - staff-get-all-tickets[skip ci] 2016-10-22 00:40:56 -03:00
ivan 47f9042c15 Guillermo - Ticket-seen [skip ci] 2016-10-21 16:38:08 -03:00
ivan 221288402e Guillermo - Ticket-seen [skip ci] 2016-10-21 16:12:17 -03:00
AntonyAntonio ef3bd809aa Guillermo - ticket-seen[skip ci] 2016-10-21 01:08:06 -03:00
Ivan Diaz 20b3f6ebc0 GuilleSabe-ticket-seen[skip ci] 2016-10-20 18:34:06 -03:00
AntonyAntonio d9124eb21a Guillermo - staff-un-assign-ticket[skip ci] 2016-10-17 23:19:04 -03:00
ivan 73633278e6 guillermo- wip [skip ci] 2016-10-15 05:03:56 -03:00
ivan 920d7248f5 guillermo- path-ticket-change-priority [skip ci] 2016-10-15 04:32:38 -03:00
ivan 073a429231 guillermo- path-ticket-close and path-ticket-re-open [skip ci] 2016-10-15 03:23:12 -03:00
ivan ea586072eb guillermo- path- tickets-change-department [skip ci] 2016-10-15 01:32:44 -03:00
ivan 59099a3bbf guillermo- path- staff-get-ticket [skip ci] 2016-10-14 21:59:11 -03:00
ivan fd42574d15 guillermo- path- staff-un-assign-ticket [skip ci] 2016-10-14 16:32:32 -03:00
ivan 5034ba71a3 guillermo- path- staff-un-assign-ticket [skip ci] 2016-10-14 16:12:54 -03:00
ivan 6083c8731d Ivan - Add delete custom response [skip ci] 2016-10-13 20:29:36 -03:00
ivan db97ee09b7 guillermo - add asign staff ticket [skip ci] 2016-10-07 19:03:21 -03:00
ivan 2eed29e910 Merge branch 'master' into OS-79-assign-ticket-to-staff 2016-10-07 17:40:55 -03:00
ivan 84b33ea871 Ivan - Add CustomResponse model and paths [skip ci] 2016-10-03 16:44:41 -03:00
Ivan Diaz 4f127b1d21 Ivan - Add text editor to text area [skip ci] 2016-09-30 18:47:04 -03:00
ivan 4512d4b484 Ivan - Create Ticket::addEvent function [skip ci] 2016-09-29 14:46:31 -03:00
ivan 0bed4bef45 Ivan - Add events to backend [skip ci] 2016-09-29 14:34:20 -03:00
ivan cc7c5bfb3d Ivan - STAFF LOGIN - Add Staff login to backend [skip ci] 2016-09-25 01:16:10 -03:00
ivan 9fadaa74f0 Ivan - Add staff DataStore [skip ci] 2016-09-24 16:26:37 -03:00
ivan 06ad75b688 Ivan - Backend - Fixes to make frontend work with API [skip ci] 2016-09-09 02:24:12 -03:00
ivan 7b6f9e28c8 Ivan - Backend - Add validator to /ticket/get [skip ci] 2016-09-09 00:41:59 -03:00
ivan da7aad3576 Ivan - Backend - Create /user/get path [skip ci] 2016-09-09 00:38:58 -03:00
ivan e22b3d999c Ivan - Backend - Create /ticket/get path [skip ci] 2016-09-03 21:46:08 -03:00
Ivan Diaz 62cb8df2b6 Merged in captcha (pull request #39)
Funcionalidad de Captcha [Frontend/Backend]
2016-08-30 16:28:56 -03:00
AntonyAntonio 2f157fe2c6 (Guillermo) ticketnumber stage 1 [skip ci] 2016-08-20 21:16:07 -03:00
ivan 5972427cf2 Merge branch 'master' into captcha 2016-08-20 19:22:17 -03:00
ivan 4f5f91994d Ivan - Backend - Add Captcha validation [skip ci] 2016-08-20 18:24:22 -03:00
ivan 4b7ece614f Ivan - Backend - Add /system/get-settings path[skip ci] 2016-08-20 18:06:41 -03:00
AntonyAntonio 54eb3e89e8 (Guillermo) ticketnumber stage 1 [skip ci] 2016-08-16 23:49:40 -03:00
AntonyAntonio 2aa2c59722 (Guillermo) actualization recover-password [skip ci] 2016-08-15 20:15:09 -03:00
AntonyAntonio 23604cc713 (Guillermo) add ruby testing for user-edit [skip ci] 2016-08-09 23:54:39 -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
Ivan Diaz 4d5ce7022e Merged in settings-options-backend (pull request #29)
Settings options backend
2016-08-02 15:09:16 -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 Diaz 1b7b449ae6 Merged master into add-name-to-signup 2016-07-27 11:12:36 -03:00
ivan d23fba451e Ivan - Add smtp settings [skip ci] 2016-07-27 01:04:29 -03:00
ivan e0dd5cbf39 Ivan - Add name to user bean [skip ci] 2016-07-27 00:50:20 -03:00
ivan 4ccbd75759 Ivan - Add initial settings and initial mail templates [skip ci] 2016-07-26 18:30:51 -03:00
Ivan Diaz 8fa096f662 Merged in remember-me-frontend (pull request #25)
Remember me frontend
2016-07-25 21:19:30 -03:00
AntonyAntonio 7497bd0d6c guillermo - code review changes again [skip ci] 2016-07-25 14:36:29 -03:00
AntonyAntonio 1f39e4d845 Merge branch 'master' into Recover-Password
Conflicts:
	server/models/ERRORS.php
2016-07-25 11:00:43 -03:00
AntonyAntonio dc3df30ef6 (Guillermo) recover password 2016-07-22 04:44:55 -03:00
Ivan Diaz 63813f2425 Merged in validation-user-sign-up (pull request #23)
Validation user sign up
2016-07-21 21:49:36 -03:00
Ivan Diaz 9d378d07e5 Ivan - Add local storage class [skip ci] 2016-07-20 20:39:36 -03:00
Ivan Diaz d648aff2b3 Ivan - Add local storage class [skip ci] 2016-07-20 18:38:20 -03:00
AntonyAntonio 8b8ac11b97 (Guillermo) recover password 2016-07-20 01:38:34 -03:00
ivan b3cd09ba00 Ivan - Update remember logic using local storage [skip ci] 2016-07-20 01:31:07 -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
AntonyAntonio 5fd68fdc6e (Guillermo) code review changes 2016-07-19 16:41:04 -03:00
AntonyAntonio 8fc5ed0e57 (Guillermo) code review changes 2016-07-19 02:38:43 -03:00
AntonyAntonio 70b42ed39d (Guillermo) code review changes 2016-07-19 02:35:37 -03:00
Ivan Diaz 35a968652a [AntonyAntonio] - Add remember me test [skip ci] 2016-07-16 03:57:42 -03:00
Ivan Diaz 5949c85aeb [AntonyAntonio] - Add remember me test [skip ci] 2016-07-16 03:54:29 -03:00
Ivan Diaz 342aab48b7 [AntonyAntonio] - Add remember me test [skip ci] 2016-07-15 22:16:22 -03:00
AntonyAntonio 466bb85d34 (Guillermo) code review changes 2016-07-15 17:12:06 -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
AntonyAntonio 533e34c395 (Guillermo) Add-email-sender-class 2016-07-13 20:30:23 -03:00
ivan 2a5fbae490 Ivan - Fix email sender issues [skip ci] 2016-07-08 18:00:52 -03:00
ivan 9312baa3b0 Ivan - Fix master phpunit build: Add validations to comment 2016-07-08 04:46:28 -03:00
ivan ab6b2326b9 Ivan - Fix master phpunit build: Undesired property 2016-07-08 04:27:17 -03:00
Ivan Diaz 89b2e52e87 Merged in create-ticket/comment (pull request #18)
Create ticket/comment
2016-07-08 04:02:55 -03:00
ivan 672bcd33a5 Ivan - Fix list-owning issues [skip ci] 2016-07-05 20:47:50 -03:00
ivan 09e163f00a Ivan - Fix list-owning issues [skip ci] 2016-07-05 20:40:30 -03:00
ivan 19638d27c8 Ivan - Implement respect/validation for validation 2016-07-04 16:08:16 -03:00
ivan 265b0c9bc2 Ivan - Implement respect/validation for validation [skip ci] 2016-07-04 15:57:00 -03:00
AntonyAntonio 94743f58ee (Guillermo) Add-email-sender-class 2 2016-07-04 15:47:28 -03:00
AntonyAntonio fad653ed7b (Guillermo) Add-email-sender-class 2016-07-04 04:09:32 -03:00
ivan f4450e81de Ivan - Update ownCommentList logic for tickets [skip ci] 2016-07-03 21:32:34 -03:00
Ivan Diaz ea65ea35d1 [Ivan Diaz] - Ticket comment WIP [skip ci] 2016-06-30 18:03:17 -03:00
AntonyAntonio 8253577cc3 (Guillermo) Create path /ticket/create X 2016-06-21 02:00:31 -03:00
AntonyAntonio 839265e852 (Guillermo) Create path /ticket/create 2016-06-21 00:19:44 -03:00
AntonyAntonio 9295554dd1 (Guillermo) Create path /ticket/create 2016-06-21 00:11:52 -03:00
Ivan Diaz d19f8132e0 [Guillermo Giu] - Add tests for 'ticket/create' controller 2016-06-17 18:43:10 -03:00
Ivan Diaz ba15c81178 [AntonyAntonio] - Add functionality 'ticket/create' controller [skip ci] 2016-06-17 17:44:04 -03:00
Ivan Diaz 86fc4ab0b6 [AntonyAntonio] - Add initial 'ticket/create' controller [skip ci] 2016-06-17 17:16:10 -03:00
Ivan Diaz c4341002ef [AntonyAntonio] - Add initial 'ticket/create' controller [skip ci] 2016-06-17 16:28:38 -03:00
Ivan Diaz 953aa52584 [Ivan Diaz] - OS-#39 - Add User/Ticket/Comment classes 2016-05-14 19:08:30 -03:00
Ivan Diaz e7445a1c21 [Ivan Diaz] - Remove isAdmin property form user model 2016-04-28 21:23:27 -03:00
Ivan Diaz b44f6f18dc [Ivan Diaz] - Add logout path 2016-04-28 21:20:42 -03:00
Ivan Diaz 993c618c9f [Ivan Diaz] - Move folder architecture 2016-04-17 18:44:24 -03:00
Ivan Diaz b9eefa3213 [Ivan Diaz] - Remaname server folder to api 2016-01-27 13:40:25 -03:00
Ivan Diaz ce19284159 [Ivan Diaz] - Create libraries Controller and Session 2016-01-14 23:45:22 -03:00
Ivan Diaz c1b1ce20df [Ivan Diaz] - Update DataStore model and User model 2015-11-27 19:57:13 -03:00
Ivan Diaz 4873613799 [Ivan Diaz] - Code Updates 2015-11-18 21:57:59 -03:00
Ivan Diaz 4331a14004 [Ivan Diaz] - Add response object and errors class 2015-11-02 23:20:38 -03:00
Ivan Diaz 36fd8a4585 [Ivan Diaz] - Add server changes 2015-11-01 18:46:13 -03:00
Ivan Diaz 504c4227b8 [Ivan Diaz] - Add working login response 2015-11-01 18:43:35 -03:00
Ivan Diaz 001427008b [Ivan Diaz] - Add APIUtils and php api initial configuration 2015-10-30 23:20:35 -03:00
Ivan Diaz 0244585193 [Ivan Diaz] - Update server folder structure 2015-10-28 20:47:40 -03:00