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

532 Commits

Author SHA1 Message Date
Ivan Diaz a314f6d989 Merged in OS-96-user/get-users (pull request #85) 
OS-96 user/get users
 2016-12-04 16:04:18 +00:00
AntonyAntonio d40327f0ce Guillermo - ban-on-signup[skip ci] 2016-12-04 04:08:42 -03:00
ivan e962afba67 guillermo- add all test #os-101 #os-96 #os-97 #os-100[skip ci] 2016-12-01 15:07:11 -03:00
Ivan Diaz efa715751c Merged in os-103-ban-users (pull request #84) 
Ivan - frontend Add ban users [skip ci]
 2016-12-01 17:08:47 +00:00
ivan f6ae50ef87 guillermo- banning architecture [skip ci] 2016-11-30 19:16:18 -03:00
ivan f3c1882a13 guillermo- delete-user [skip ci] 2016-11-30 17:30:00 -03:00
ivan 5907cbda00 guillermo- get-user [skip ci] 2016-11-30 14:13:57 -03:00
ivan 8ab6240385 guillermo- get-users [skip ci] 2016-11-30 03:33:46 -03:00
ivan 7f94773abb Ivan - Fix conflicts [skip ci] 2016-11-29 19:51:37 -03:00
ivan 793c11fe0f Merge branch 'master' into os-103-ban-users 
# Conflicts:
#	client/src/core-components/search-box.js
#	client/src/data/languages/en.js
 2016-11-29 19:50:04 -03:00
Ivan Diaz 5c4eef12e5 Merged in OS-102-user-view (pull request #83) 
Ivan - Add user view [skip ci]
 2016-11-29 22:47:53 +00:00
ivan d7eb9f702f Ivan - frontend Add ban users [skip ci] 2016-11-29 19:47:29 -03:00
ivan 116fb6ce44 Ivan - Add user delete fixture [skip ci] 2016-11-28 20:00:10 -03:00
Ivan Diaz b2ac69a8ad Merged in OS-99-list-users-view (pull request #82) 
OS-99 list users view
 2016-11-28 22:58:35 +00:00
ivan 55e6f344c3 Ivan - Add user view [skip ci] 2016-11-28 19:56:42 -03:00
ivan d5cdbd723f Ivan - Add sorting arrows to table and list users [skip ci] 2016-11-28 16:04:38 -03:00
ivan 9c027c91c0 Ivan - Add list users view with search [skip ci] 2016-11-28 15:37:27 -03:00
ivan b0bb878e4b Ivan - WIP 2016-11-25 14:46:01 -03:00
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