ivan
|
83e3672f55
|
Ivan - Add Get all tickets and search [skip ci]
|
2016-11-04 19:10:32 -03:00 |
|
ivan
|
de161c8956
|
Merge branch 'master' into OS-87-path/staff/get-all-tickets
|
2016-11-03 15:05:22 -03:00 |
|
Ivan Diaz
|
cc1b5785fa
|
Merged in OS-78-My-tickets-view (pull request #74)
OS-78 my tickets view
|
2016-10-30 18:13:38 +00:00 |
|
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 |
|
Ivan Diaz
|
26db3b2af3
|
Merged in os-75-info-tooltip (pull request #73)
os-75 InfoTooltip
|
2016-10-30 18:11:53 +00: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 |
|
Ivan Diaz
|
81dde8de87
|
Merged in os-89-call-ticket-seen (pull request #72)
Max - call ticket seen from both admin and client [skip ci]
|
2016-10-28 21:15:20 +00: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 Diaz
|
5ade2f51d8
|
Merged in os-138-custom-response-field (pull request #71)
Os 138 custom response field
|
2016-10-27 20:32:39 +00: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 |
AntonyAntonio
|
7693f030f0
|
Guillermo - staff-get-all-tickets[skip ci]
|
2016-10-22 00:40:56 -03:00 |
|
Ivan Diaz
|
642409a47b
|
Merged in OS88-path-ticket-seen (pull request #70)
Os88 path ticket seen
|
2016-10-21 19:40:48 +00:00 |
|
Ivan Diaz
|
61ecc00faf
|
Merged in os-84-frontend-ticket-events (pull request #69)
Os 85 Frontend - Staff Ticket view
|
2016-10-21 19:40:18 +00:00 |
|
ivan
|
47f9042c15
|
Guillermo - Ticket-seen [skip ci]
|
2016-10-21 16:38:08 -03:00 |
|
ivan
|
221288402e
|
Guillermo - Ticket-seen [skip ci]
|
2016-10-21 16:12:17 -03:00 |
|
AntonyAntonio
|
ef3bd809aa
|
Guillermo - ticket-seen[skip ci]
|
2016-10-21 01:08:06 -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 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 |