Commit Graph

155 Commits

Author SHA1 Message Date
ivan 93366c02da Ivan - Add custom response field [skip ci] 2016-10-27 16:34:44 -03:00
ivan 037f004d0c Ivan - Add custom response field [skip ci] 2016-10-26 12:46:17 -03:00
ivan e89283e5d3 Ivan - Ticket viewer Minor tweaks [skip ci] 2016-10-20 22:40:15 -03:00
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 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