tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
864 Commits 77 Branches 19 Tags 15 MiB
Commit Graph

864 Commits

Author SHA1 Message Date
ivan 2703f82253 Ivan - Fix master issues. Improve error handling 2016-11-24 18:02:18 -03:00
Ivan Diaz 9ec10a356b Merged in OS-105-topic-articles-models (pull request #81) 
OS-105 topic articles models
 2016-11-24 17:13:50 +00:00
ivan 94fd359098 Ivan - Add articles paths [skip ci] 2016-11-22 22:27:05 -03:00
ivan d227b3f34d Ivan - Create article and topic datastore [skip ci] 2016-11-21 16:55:05 -03:00
Ivan Diaz 8c25561f8a Merged in OS-93-admin-tIcket-deploy (pull request #80) 
Ivan - Fixes for Deploy
 2016-11-21 02:48:37 +00:00
ivan ee5d2b4ad1 Ivan - Fix fixtures [skip ci] 2016-11-20 23:05:53 -03:00
ivan 9aceff4313 Ivan - Fixes for Deploy 2016-11-20 23:01:38 -03:00
Ivan Diaz 79dcbe030e Merged in OS-116-Ticket-events (pull request #79) 
Ivan - Fix authorUser/authorStaff issues, fix date, add tests for ticket events
 2016-11-20 22:48:33 +00:00
ivan c8ee619000 Merge branch 'master' into OS-116-Ticket-events 
# Conflicts:
#	tests/init.rb
 2016-11-20 19:02:47 -03:00
ivan 8b3c8bf284 Ivan - Fix authorUser/authorStaff issues, fix date, add tests for ticket events [skip ci] 2016-11-20 19:00:39 -03:00
Ivan Diaz 323b481c62 Merged in OS-116-Ticket-events (pull request #78) 
OS-116 ticket events
 2016-11-20 21:59:18 +00:00
Ivan Diaz 43ceca55e5 Merged in os-163-add-search (pull request #77) 
Ivan - Add all ticket search and server pagination [skip ci]
 2016-11-20 19:09:32 +00:00
AntonyAntonio 66281df491 Guillermo - staff-get-all-tickets[skip ci] 2016-11-19 22:54:08 -03:00
ivan 89837b0726 Ivan - Add all ticket search and server pagination [skip ci] 2016-11-18 01:40:43 -03:00
Ivan Diaz b0bb56fae2 Merged in change-profile-pic-url (pull request #76) 
init-settings.php edited online with Bitbucket
 2016-11-08 19:48:25 +00:00
Ivan Diaz c193aecc6b Merged in OS-87-path/staff/get-all-tickets (pull request #75) 
OS-87 path/staff/get all tickets
 2016-11-07 21:59:23 +00:00
Ivan Diaz 7610293398 user-fixtures.js edited online with Bitbucket [skip ci] 2016-11-05 17:05:20 +00:00
Ivan Diaz 141197ba73 ticket-fixtures.js edited online with Bitbucket [skip ci] 2016-11-05 17:03:13 +00:00
Ivan Diaz cef6ccd9e3 staff-fixtures.js edited online with Bitbucket 2016-11-05 17:01:04 +00:00
Ivan Diaz faf2544d1d init-settings.php edited online with Bitbucket 2016-11-05 16:56:33 +00:00
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
Ivan Diaz 1f7efd4086 Ivan - Add all ticket events to Ticketevent datastore [skip ci] 2016-10-23 15:31:48 -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