ivan
|
fff2bca646
|
Merge branch 'master' into os-84-frontend-ticket-events
|
2016-10-20 22:34:25 -03:00 |
ivan
|
bcb83e52b6
|
Ivan - Add ticket view to admin dashboard [skip ci]
|
2016-10-20 22:33:55 -03:00 |
ivan
|
82cb246eeb
|
Max - Add My Tickets List [skip ci]
|
2016-10-20 18:47:35 -03:00 |
ivan
|
3997faae53
|
Max - Add My Tickets title and description [skip ci]
|
2016-10-20 16:43:01 -03:00 |
ivan
|
3f9df559db
|
Ivan - Change dates from int to strings [skip ci]
|
2016-10-20 15:57:40 -03:00 |
ivan
|
ebe53c0794
|
Merge branch 'master' into os-74-table-sorter
# Conflicts:
# client/src/core-components/table.js
# client/src/data/fixtures/user-fixtures.js
|
2016-10-20 15:38:00 -03:00 |
ivan
|
9b83fde4fc
|
Ivan - Add admin panel ticket viewer [skip ci]
|
2016-10-20 15:32:57 -03:00 |
ivan
|
2e9aae777b
|
Ivan - Fix DropDown z-index issue [skip ci]
|
2016-10-18 20:48:25 -03:00 |
ivan
|
a876e83108
|
Ivan - Change name TicketAction => TicketEvent [skip ci]
|
2016-10-18 20:47:36 -03:00 |
ivan
|
3b8bcc8438
|
Ivan - Add editable ticket view [skip ci]
|
2016-10-18 20:42:49 -03:00 |
ivan
|
5e25905e3c
|
Ivan - wip [skip ci]
|
2016-10-15 19:37:29 -03:00 |
Ivan Diaz
|
8d972a17ee
|
Ivan - Frontend - WIP[skip ci]
|
2016-10-15 05:06:34 -03:00 |
Ivan Diaz
|
831c6ed64e
|
Ivan - Frontend - Add ticket actions styling [skip ci]
|
2016-10-15 04:08:14 -03:00 |
ivan
|
1337564d87
|
Ivan - Add Loading to table [skip ci]
|
2016-10-13 21:42:37 -03:00 |
ivan
|
a51bc5c3ad
|
Ivan - Fix modal positioning [skip ci]
|
2016-10-13 21:25:10 -03:00 |
ivan
|
01c1c6bfd6
|
Ivan - Solve disable button color issue [skip ci]
|
2016-10-13 18:04:17 -03:00 |
ivan
|
cc4858715d
|
Ivan - Add language selector using FormField [skip ci]
|
2016-10-13 17:58:48 -03:00 |
ivan
|
b6f2fa0b81
|
Ivan - CustomResponses add api call [skip ci]
|
2016-10-13 17:18:00 -03:00 |
ivan
|
665273f0a9
|
Ivan - Custom responses add buttons [skip ci]
|
2016-10-12 01:21:28 -03:00 |
ivan
|
d75ad2e165
|
Ivan - Add form form custom responses [skip ci]
|
2016-10-12 00:08:20 -03:00 |
ivan
|
23ccc17a85
|
Ivan - Add language icon for custom responses [skip ci]
|
2016-10-11 20:48:35 -03:00 |
ivan
|
b306d1cd9b
|
Ivan - Create LanguageSelector component (abstraction from header) [skip ci]
|
2016-10-11 20:24:52 -03:00 |
ivan
|
7e74fbe360
|
Ivan - Add admin data reducer with custom response data [skip ci]
|
2016-10-11 19:46:38 -03:00 |
ivan
|
a10aebfdf5
|
Ivan - Implement loading on custom responses [skip ci]
|
2016-10-11 17:42:38 -03:00 |
ivan
|
ec770b5223
|
Ivan - Add loading component [skip ci]
|
2016-10-11 16:37:30 -03:00 |
ivan
|
2a3ea5006a
|
Ivan - Add listing component for custom responses [skip ci]
|
2016-10-11 12:47:22 -03:00 |
ivan
|
c63fce6a26
|
Maxi - Add table sorter [skip ci]
|
2016-09-30 18:54:29 -03:00 |
Ivan Diaz
|
f9fd2f0f57
|
Ivan - Add text editor to text area [skip ci]
|
2016-09-30 17:51:28 -03:00 |
AntonyAntonio
|
73dd6b0adf
|
Guillermo - Tooltip-ticket-number [skip ci]
|
2016-09-30 00:13:47 -03:00 |
AntonyAntonio
|
4006eb4799
|
Guillermo - Tooltip-ticket-number [skip ci]
|
2016-09-30 00:00:05 -03:00 |
AntonyAntonio
|
bbfcda7522
|
Merge branch 'master' into OS-27-tooltip-ticket-number
Conflicts:
client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.js
|
2016-09-29 22:27:59 -03:00 |
AntonyAntonio
|
727df19609
|
Guillermo - add-edit-password-frontend-message [skip ci]
|
2016-09-29 22:24:08 -03:00 |
ivan
|
bbb1fe6111
|
antonyantonio - add priority ticket backend[skip ci]
|
2016-09-29 18:27:16 -03:00 |
ivan
|
842afe49eb
|
Ivan - STAFF LOGIN - Fix issues and improve frontend login [skip ci]
|
2016-09-25 01:30:38 -03:00 |
ivan
|
116c974f9c
|
Ivan - STAFF LOGIN - Add horizontal and horizontal-list menu [skip ci]
|
2016-09-24 21:33:09 -03:00 |
ivan
|
b5dcaa9009
|
Ivan - STAFF LOGIN - Add header for staff panel with profile pic and menu [skip ci]
|
2016-09-24 20:19:24 -03:00 |
ivan
|
3936e772d7
|
Ivan - STAFF LOGIN - Add session architecture for staff login [skip ci]
|
2016-09-24 18:16:55 -03:00 |
ivan
|
e3650f146f
|
Ivan - STAFF LOGIN - Add all routes for admin panel [skip ci]
|
2016-09-24 17:53:34 -03:00 |
ivan
|
528814be07
|
Ivan - STAFF LOGIN - Add staff login fixtures [skip ci]
|
2016-09-24 16:35:26 -03:00 |
ivan
|
bf7513740c
|
Ivan - dev3 deploy implementation fixes
|
2016-09-23 21:42:31 -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 Diaz
|
c86d04e0cd
|
Merged in OS-65-table-pagination (pull request #49)
OS-65 table pagination
|
2016-09-22 11:17:40 -03:00 |
Ivan Diaz
|
98e9c65890
|
Merged in FRONT-35-edit--profile-form (pull request #50)
FRONT-35 edit profile form
|
2016-09-22 11:17:19 -03:00 |
ivan
|
cb3c54ebca
|
Ivan - Frontend - Clean code tweak [skip ci]
|
2016-09-20 21:19:28 -03:00 |
ivan
|
36a8e77d8b
|
Merge branch 'master' into OS-65-table-pagination
|
2016-09-20 21:14:33 -03:00 |
ivan
|
d39c6e0698
|
Ivan - Frontend - Add table pagination tests [skip ci]
|
2016-09-20 21:13:28 -03:00 |
ivan
|
7e0addf09c
|
Ivan - Frontend - Add table pagination [skip ci]
|
2016-09-20 19:23:33 -03:00 |
Ivan Diaz
|
be9919baef
|
Merged in dropdown-accesibility (pull request #48)
Dropdown accesibility
|
2016-09-19 14:22:35 -03:00 |
AntonyAntonio
|
132886f06b
|
Guillermo - add-edit-password-frontend-message [skip ci]
|
2016-09-16 20:34:04 -03:00 |
AntonyAntonio
|
1487df9a93
|
Guillermo - add-edit-password-frontend-areyousure [skip ci]
|
2016-09-16 20:06:53 -03:00 |
AntonyAntonio
|
3bd5db9bf0
|
Guillermo - add-edit-password-frontend [skip ci]
|
2016-09-16 19:53:41 -03:00 |
ivan
|
75a839dea7
|
Ivan - Frontend - Update menu tests [skip ci]
|
2016-09-15 11:36:48 -03:00 |
ivan
|
7bad36f107
|
Ivan - Frontend - Add dropdown tests [skip ci]
|
2016-09-15 11:33:57 -03:00 |
ivan
|
e85f38fbde
|
Guillermo/Ivan - Frontend - Add edit-email form [skip ci]
|
2016-09-14 20:03:15 -03:00 |
ivan
|
61716f42a7
|
Ivan - Frontend - Add dropdown accessibility and fix related issues [skip ci]
|
2016-09-14 00:03:39 -03:00 |
ivan
|
86543cd818
|
Merge branch 'master' into improve-text-editing
# Conflicts:
# client/src/core-components/text-editor.js
|
2016-09-13 22:04:30 -03:00 |
ivan
|
f7093b04d9
|
Ivan - Frontend - Fix tests [skip ci]
|
2016-09-13 21:11:02 -03:00 |
ivan
|
c737c7a9a1
|
Ivan - Frontend - Fix react-rte validation issues [skip ci]
|
2016-09-13 19:39:39 -03:00 |
ivan
|
a0c5b30d0c
|
Ivan - Frontend - Add react-rte editor support [skip ci]
|
2016-09-13 19:27:22 -03:00 |
ivan
|
a6492cbd64
|
Ivan - Frontend - Fix Button tests [skip ci]
|
2016-09-09 18:22:54 -03:00 |
ivan
|
a0b4457676
|
Ivan - Frontend - Create static method for open modal, improve animation, add accessibility [skip ci]
|
2016-09-09 18:22:17 -03:00 |
ivan
|
8f5852a0d0
|
Ivan - Frontend - Add animation to modal [skip ci]
|
2016-09-09 16:27:31 -03:00 |
ivan
|
3be644e898
|
Ivan - Frontend - Create modals and add example to demo page [skip ci]
|
2016-09-09 16:18:38 -03:00 |
ivan
|
f91b957d0f
|
Ivan - Frontend - Fix frontend unit testing [skip ci]
|
2016-09-09 02:31:49 -03:00 |
ivan
|
06ad75b688
|
Ivan - Backend - Fixes to make frontend work with API [skip ci]
|
2016-09-09 02:24:12 -03:00 |
Ivan Diaz
|
3418adb028
|
Merged in new-component-tooltip (pull request #44)
New component tooltip
|
2016-09-04 20:13:48 -03:00 |
AntonyAntonio
|
cbf4dc66f3
|
Guillermo - add tooltip [skip ci]
|
2016-09-03 14:09:46 -03:00 |
AntonyAntonio
|
5a409a5f81
|
Guillermo - add tooltip [skip ci]
|
2016-09-02 19:37:46 -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
|
d186685673
|
Ivan - Backend - Restore old version google-captcha
|
2016-08-30 15:44:16 -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
|
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
|
44d9ea5575
|
Ivan - Frontend - Use get-settings instead of get-configs [skip ci]
|
2016-08-20 19:21:05 -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
|
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 |
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 |