Commit Graph

494 Commits

Author SHA1 Message Date
AntonyAntonio 5a409a5f81 Guillermo - add tooltip [skip ci] 2016-09-02 19:37:46 -03:00
Ivan Diaz 4dbc06bea2 Merged in info-card-implementation (pull request #43)
Ivan - Frontend - Fix Card component style issues, add header to main-home-page-portal
2016-08-31 15:16:19 -03:00
ivan 13cb79b559 Merge branch 'master' into info-card-implementation
# Conflicts:
#	client/src/data/languages/en.js
2016-08-31 15:14:25 -03:00
AntonyAntonio d8f01dba8e (Guillermo) info card add components [skip ci] 2016-08-31 01:50:41 -03:00
Ivan Diaz e0ae9d113e Merged in dashboard-view-ticket (pull request #42)
Dashboard view ticket
2016-08-30 16:43:54 -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 157cce4b5e Ivan - Backend - Fix captcha test 2016-08-30 16:13:31 -03:00
ivan d186685673 Ivan - Backend - Restore old version google-captcha 2016-08-30 15:44:16 -03:00
ivan 12cf0df27f Ivan - Backend - Fix captcha tests 2016-08-30 15:41:35 -03:00
ivan d1f1909cc3 Ivan - Backend - Fix captcha tests 2016-08-30 15:35:10 -03:00
ivan b3d3cfef83 Merge branch 'master' into dashboard-view-ticket
# Conflicts:
#	client/src/data/languages/en.js
#	client/src/scss/_vars.scss
2016-08-30 15:30:10 -03:00
ivan e971dbea08 Ivan - Frontend - Fix Card component style issues, add header to main-home-page-portal [skip ci] 2016-08-30 15:28:14 -03:00
Ivan Diaz eae0a6b24a Merged in InfoCard (pull request #41)
(Guillermo)  info card add components  [skip ci]
2016-08-30 15:17:41 -03:00
ivan d5514fe62e Ivan - Frontend - Create ticket viewer implementation with comments [skip ci] 2016-08-30 14:53:28 -03:00
ivan 3a9d009fff Ivan - Frontend - Ticket Chat like style [skip ci] 2016-08-24 23:32:30 -03:00
ivan e09f029818 Ivan - Frontend - Add comments icon [skip ci] 2016-08-24 20:36:29 -03:00
ivan 41a4a3f00d Ivan - Frontend - Dashboard Ticket viewer base [skip ci] 2016-08-24 20:00:41 -03:00
AntonyAntonio f754251622 (Guillermo) info card add components [skip ci] 2016-08-24 17:59:18 -03:00
Ivan Diaz fb7693d77e Merged in TicketNumber-Stage-I (pull request #40)
Ticketnumber stage i
2016-08-22 16:52:29 -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 Diaz e87c38b743 Merged in create-ticket-form (pull request #38)
Create ticket form
2016-08-20 19:21:24 -03:00
ivan 44d9ea5575 Ivan - Frontend - Use get-settings instead of get-configs [skip ci] 2016-08-20 19:21:05 -03:00
ivan 8a87e8118d Ivan - Backend - Add unit test for captcha validation [skip ci] 2016-08-20 19:19:18 -03:00
ivan 10d6eebc69 Ivan - Backend - Add get-settings tests [skip ci] 2016-08-20 18:33:47 -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
ivan 7dc7e14168 Ivan - Frontend - Add captcha and departments from globals [skip ci] 2016-08-20 17:30:07 -03:00
ivan d638465ea6 Ivan - Create Ticket Form - Add FormField tests [skip ci] 2016-08-19 17:14:27 -03:00
ivan 2c0e7546ed Ivan - Create Ticket Form - Fix form tests [skip ci] 2016-08-19 13:24:36 -03:00
ivan d88dd59ab5 Ivan - Create Ticket Form - Fix some test adding swap to Array.prototype [skip ci] 2016-08-18 23:38:22 -03:00
ivan ac5975cf8b Ivan - Create Ticket Form - Dispatch getUserData after successfull email sending[skip ci] 2016-08-18 23:32:36 -03:00
ivan fbb6d69696 Ivan - Create Ticket Form - Create and implement Header component [skip ci] 2016-08-18 23:28:25 -03:00
ivan 97a35862fe Ivan - Create Ticket Form - Add optional create ticket without login [skip ci] 2016-08-18 23:04:35 -03:00
ivan ef20687f1a Ivan - Create Ticket Form - Add /ticket/create fixture and add ticket create form logic [skip ci] 2016-08-18 22:56:29 -03:00
Ivan Diaz cd49405f61 Merged in frontend-table-component (pull request #37)
Frontend table component + Implementation
2016-08-18 22:55:13 -03:00
ivan 569fd3556d Ivan - Create Ticket Form - Fix layout issues [skip ci] 2016-08-18 22:26:05 -03:00
ivan 5527a46d5f Ivan - Create Ticket Form - Remove required from department, update DropDown focus [skip ci] 2016-08-18 22:10:07 -03:00
ivan 6b7a71cefc Ivan - Create Ticket Form - Delete TextArea component, improve TextEditor, create FormField (abstraction for Form), update styling of form, add new input and dropdown types [skip ci] 2016-08-18 21:24:13 -03:00
ivan 9813dd0ebd Ivan - Create Ticket Form - Fix TextEditor issues [skip ci] 2016-08-18 17:49:52 -03:00
Ivan Diaz 99e9392c45 Ivan - Add text editor to text area [skip ci] 2016-08-18 14:16:19 -03:00
ivan 95290e97f7 Ivan - Create Ticket Form - Create Basic TextEditor component using draft.js [skip ci] 2016-08-17 22:29:47 -03:00
ivan 8b6266c6c8 Ivan - Table Component - Add /user/get fixture, retrieve all tickets from api with USER_DATA action, update header styling, add close session to menu, update tests [skip ci] 2016-08-17 18:04:48 -03:00
AntonyAntonio 54eb3e89e8 (Guillermo) ticketnumber stage 1 [skip ci] 2016-08-16 23:49:40 -03:00
ivan cfb65f2306 Ivan - Table Component - Add tabbable property to menu [skip ci] 2016-08-16 21:01:36 -03:00
ivan fc11eb8cb1 Ivan - Table Component - Remove /app path [skip ci] 2016-08-16 20:03:56 -03:00
ivan c9c9d7c80c Ivan - Table Component - Working table in dashboard [skip ci] 2016-08-16 19:41:14 -03:00
ivan 307946ff22 Ivan - Table Component - Add object mapping for tables [skip ci] 2016-08-16 14:46:57 -03:00
Ivan Diaz 8c56912a7e Merged in Actualizar-recover-password (pull request #36)
(Guillermo)  actualization recover-password   [skip ci]
2016-08-16 14:13:06 -03:00
AntonyAntonio 2aa2c59722 (Guillermo) actualization recover-password [skip ci] 2016-08-15 20:15:09 -03:00