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 Diaz
|
20b3f6ebc0
|
GuilleSabe-ticket-seen[skip ci]
|
2016-10-20 18:34:06 -03:00 |
ivan
|
3997faae53
|
Max - Add My Tickets title and description [skip ci]
|
2016-10-20 16:43:01 -03:00 |
Ivan Diaz
|
44cf49c813
|
Merged in os-74-table-sorter (pull request #68)
Os 74 table sorter
|
2016-10-20 19:02:48 +00: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 Diaz
|
96c01cc357
|
Merged in OS-86-path-staff-get-new-tickets (pull request #67)
OS-86 path staff get new tickets
|
2016-10-18 17:38:00 +00:00 |
AntonyAntonio
|
2e1b7d78f2
|
Guillermo - staff-get-new-tickets[skip ci]
|
2016-10-18 00:35:16 -03:00 |
AntonyAntonio
|
d9124eb21a
|
Guillermo - staff-un-assign-ticket[skip ci]
|
2016-10-17 23:19:04 -03:00 |
ivan
|
5e25905e3c
|
Ivan - wip [skip ci]
|
2016-10-15 19:37:29 -03:00 |
ivan
|
0642e04b31
|
Merge branch 'master' into os-84-frontend-ticket-events
|
2016-10-15 15:29:25 -03:00 |
Ivan Diaz
|
8d972a17ee
|
Ivan - Frontend - WIP[skip ci]
|
2016-10-15 05:06:34 -03:00 |
ivan
|
73633278e6
|
guillermo- wip [skip ci]
|
2016-10-15 05:03:56 -03:00 |
Ivan Diaz
|
ef2eff8c6f
|
Merged in os-84-frontend-ticket-events (pull request #66)
Ivan - Frontend - Add ticket actions styling
|
2016-10-15 07:37:22 +00:00 |
Ivan Diaz
|
03105ebf9b
|
Merged in OS-95-Path-ticket-change-priority (pull request #65)
guillermo- path-ticket-change-priority
|
2016-10-15 07:36:17 +00:00 |
ivan
|
920d7248f5
|
guillermo- path-ticket-change-priority [skip ci]
|
2016-10-15 04:32:38 -03:00 |
Ivan Diaz
|
831c6ed64e
|
Ivan - Frontend - Add ticket actions styling [skip ci]
|
2016-10-15 04:08:14 -03:00 |
Ivan Diaz
|
798ffaf1dc
|
Merged in OS-82-path-ticket-re-open (pull request #64)
guillermo- path-ticket-close and path-ticket-re-open
|
2016-10-15 06:29:44 +00:00 |
ivan
|
073a429231
|
guillermo- path-ticket-close and path-ticket-re-open [skip ci]
|
2016-10-15 03:23:12 -03:00 |
Ivan Diaz
|
6961b3c6a0
|
Merged in OS-81-ticket-change-department (pull request #63)
guillermo- path- tickets-change-department
|
2016-10-15 04:55:20 +00:00 |
ivan
|
ea586072eb
|
guillermo- path- tickets-change-department [skip ci]
|
2016-10-15 01:32:44 -03:00 |
Ivan Diaz
|
be586ddf2f
|
Merged in OS-77-staff-get-tickets (pull request #62)
guillermo- path- staff-get-ticket [skip ci]
|
2016-10-15 01:23:55 +00:00 |
ivan
|
17d395f8d6
|
guillermo- path- staff-get-ticket [skip ci]
|
2016-10-14 22:22:28 -03:00 |
ivan
|
59099a3bbf
|
guillermo- path- staff-get-ticket [skip ci]
|
2016-10-14 21:59:11 -03:00 |
Ivan Diaz
|
a42e00ad9b
|
Merged in os-80-staff-un-assign-ticket (pull request #61)
Os 80 staff un assign ticket
|
2016-10-14 19:35:02 +00: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 Diaz
|
f94ac300bd
|
Merged in OS-92-custom-responses-view (pull request #60)
OS-92 custom responses view
|
2016-10-14 16:06:36 +00: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
|
6083c8731d
|
Ivan - Add delete custom response [skip ci]
|
2016-10-13 20:29:36 -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 Diaz
|
884bea6713
|
Merged in OS-79-assign-ticket-to-staff (pull request #59)
OS-79 assign ticket to staff
|
2016-10-10 14:26:52 -03:00 |
ivan
|
dcea795f89
|
guillermo - add asign staff ticket [skip ci]
|
2016-10-07 20:32:22 -03:00 |