ivan
|
d8e48fc190
|
Merge branch 'master' into OS-78-My-tickets-view
# Conflicts:
# client/src/data/languages/en.js
|
2016-10-30 15:13:18 -03:00 |
maxred
|
5d887e63f4
|
Max - deletes comments [skip ci]
|
2016-10-29 00:49:06 -03:00 |
|
ivan
|
32b4775a49
|
Ivan - Add test to ticket list[skip ci]
|
2016-10-28 22:57:58 -03:00 |
Max Red
|
940b72bf6f
|
Max - add i18n [skip ci]
|
2016-10-28 21:21:06 -03:00 |
|
Max Red
|
59bfdf1128
|
Max - add styling to tooltip [skip ci]
|
2016-10-28 20:04:50 -03:00 |
|
Max Red
|
af29c62d82
|
Max - create info tooltip WIP [skip ci]
|
2016-10-28 19:21:55 -03:00 |
|
Max Red
|
0388ba1329
|
Max - fix typos [skip ci]
|
2016-10-28 18:09:50 -03:00 |
|
Max Red
|
c17034f182
|
Max - call ticket seen from both admin and client [skip ci]
|
2016-10-28 17:59:50 -03:00 |
|
ivan
|
5112aac650
|
Maxi - Minor fixes [skip ci]
|
2016-10-28 13:21:16 -03:00 |
|
ivan
|
b712cd645b
|
Ivan - Fix styling [skip ci]
|
2016-10-28 04:04:15 -03:00 |
|
ivan
|
1966697a21
|
Ivan - Add all tickets and new tickets[skip ci]
|
2016-10-28 04:01:03 -03:00 |
|
ivan
|
343b455905
|
Ivan - Minor tweak demo[skip ci]
|
2016-10-28 03:30:04 -03:00 |
|
ivan
|
3179b29158
|
Ivan - Add my tickets department dropdown, fix loading, add filter, merge master[skip ci]
|
2016-10-28 03:28:11 -03:00 |
|
ivan
|
22cd244846
|
Merge branch 'master' into OS-78-My-tickets-view
# Conflicts:
# client/src/data/languages/en.js
# client/src/reducers/admin-data-reducer.js
|
2016-10-27 20:54:54 -03:00 |
|
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
|
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 |