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

285 Commits

Author SHA1 Message Date
Max Red 2c3e5fe5e6 Max - error with spaces [skip ci] 2016-12-13 16:47:09 -03:00
Max Red 49b902fa12 Max - upsi, sin querer habia cambiado esto... [skip ci] 2016-12-13 16:44:02 -03:00
Max Red 02e799cc9f Max - Modifies frontend to make sure date is displayed correctly at each place and adds at when showing hours and minutes [skip ci] 2016-12-13 16:33:58 -03:00
ivan c66a73df8e Ivan - Add view restrictions for admin [skip ci] 2016-12-12 21:41:48 -03:00
ivan 69de6d57ee Ivan - Add department transfer dropdown when deleting [skip ci] 2016-12-12 19:36:02 -03:00
ivan 2d1ad93f3b Ivan - Add internationalization for departments view [skip ci] 2016-12-12 18:15:37 -03:00
ivan dbc7f155f4 Merge branch 'master' into os-125-admin-departments-view 
# Conflicts:
#	client/src/data/fixtures/staff-fixtures.js
 2016-12-12 18:05:12 -03:00
ivan 1b72c23844 Ivan - Update departments view styling [skip ci] 2016-12-12 18:02:28 -03:00
ivan a45f39adab Ivan - Use departmentId instead of id for edit-department and delete-department [skip ci] 2016-12-12 17:48:48 -03:00
ivan e3f50c28c6 Ivan - Add admin departments view [skip ci] 2016-12-12 17:45:53 -03:00
Max Red 3d2fe3f1c9 Max - modifies date transformer (transformToString now takes an extra argument) [skip ci] 2016-12-12 15:49:48 -03:00
Ivan Diaz 54151612f7 Ivan - Add my account and fix styling issues [skip ci] 2016-12-12 01:46:50 -03:00
Ivan Diaz 27b42c6112 Ivan - Complete staff edit component [skip ci] 2016-12-12 00:01:21 -03:00
Ivan Diaz c0d34c68fc Ivan - Add form [skip ci] 2016-12-10 19:41:21 -03:00
Ivan Diaz adfb1c7335 Merge branch 'master' into 114-staff-member-view 
Conflicts:
	client/src/data/languages/en.js
 2016-12-10 16:38:28 -03:00
Ivan Diaz 5ce4fa1f44 Ivan - Add API call to add staff modal [skip ci] 2016-12-10 16:33:49 -03:00
ivan 1e69ca3651 Ivan - Update checkbox styling, add custom scroll style for chrome [skip ci] 2016-12-09 18:59:26 -03:00
ivan 77f8976896 Ivan - Add Checkbox group component [skip ci] 2016-12-09 17:51:30 -03:00
ivan 8a5474ffc4 Max - Create add staff modal [skip ci] 2016-12-08 18:37:41 -03:00
Ivan Diaz 5f3eb6c00f Merged in OS-112-people-list (pull request #87) 
OS-112 people list
 2016-12-08 15:32:13 -03:00
Ivan Diaz 980904f86e Guillermo - staff/edit[skip ci] 2016-12-08 14:30:19 -03:00
Ivan Diaz 823126d930 Max - Delete some console.logs [skip ci] 2016-12-08 02:09:05 -03:00
Ivan Diaz 84c25e46c1 Max - Prettify StaggeredMotion [skip ci] 2016-12-08 01:55:57 -03:00
Ivan Diaz 7dbdac126f Max - Fix pagination bug by adding controlled pattern [skip ci] 2016-12-08 01:39:38 -03:00
Ivan Diaz 8722c85742 Max - Add CSS styling to dropdown and button [skip ci] 2016-12-08 01:27:50 -03:00
Ivan Diaz 80f4281ab1 Max - Add filter by department in staff members [skip ci] 2016-12-08 01:01:57 -03:00
ivan c2ab1f9b6e Max - WIP [skip ci] 2016-12-07 21:13:39 -03:00
ivan d67d9ebfb1 Max - WIP people list and admin panel staff members [skip ci] 2016-12-07 20:20:43 -03:00
ivan 74f230abbd Ivan - WIP [skip ci] 2016-12-06 21:56:45 -03:00
ivan 7954a1a12a Ivan - Fix fiture 2016-12-05 15:34:53 -03:00
ivan cbc4c15101 Ivan - Fix issues with release block 2 part 2 2016-12-04 23:51:45 -03:00
ivan 5b5b7c329a Ivan - fix minor issues [skip ci] 2016-12-04 22:40:08 -03:00
Ivan Diaz b4b94a883e Ivan - Add search article list [skip ci] 2016-12-04 14:10:16 -03:00
Ivan Diaz c774df46f4 Merge branch 'master' into os-107-create-articles-list 
Conflicts:
	client/src/data/languages/en.js
 2016-12-04 02:02:59 -03:00
Ivan Diaz efa6d75387 Ivan - Add margin breadcrumb [skip ci] 2016-12-04 01:59:31 -03:00
Ivan Diaz b1331ee97d Ivan - Add breadcrumb [skip ci] 2016-12-04 01:56:39 -03:00
Ivan Diaz 17f809aeca Ivan - Add articles in user dashboard [skip ci] 2016-12-03 20:26:57 -03:00
Ivan Diaz e676330334 Ivan - Add edit article functionality [skip ci] 2016-12-03 20:03:33 -03:00
ivan 1174be9e02 Ivan - Add article preview [skip ci] 2016-12-02 07:50:16 -03:00
ivan a193acd51a Ivan - Add articles reducer and view article view [skip ci] 2016-12-02 07:38:02 -03:00
ivan bbe7b0c3d5 Ivan - boton Add topic y list articles [skip ci] 2016-12-02 06:11:11 -03:00
ivan 0862889039 Ivan - add topic viewer drag n drop functionality [skip ci] 2016-12-02 05:06:41 -03:00
ivan fb43e904d6 Ivan - font awesome add missing files [skip ci] 2016-12-02 02:51:25 -03:00
ivan b737b28a64 Ivan - Add add article modal [skip ci] 2016-12-02 02:40:36 -03:00
ivan 43dcf6c76a Ivan - Change discard button label edit topic [skip ci] 2016-12-02 02:00:37 -03:00
ivan 5abb62da3a Ivan - Update font awesome, add edit topic form with icon and icon color components [skip ci] 2016-12-02 01:57:59 -03:00
Ivan Diaz 7b9b3392a3 Ivan - WIP [skip ci] 2016-12-01 15:34:22 -03:00
Ivan Diaz 88f7e82e77 Merge branch 'master' into os-107-create-articles-list 2016-11-30 03:07:47 -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 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 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 0324decae3 Max - WIP 2016-11-25 18:36:45 -03:00
ivan b0bb878e4b Ivan - WIP 2016-11-25 14:46:01 -03: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 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
ivan 89837b0726 Ivan - Add all ticket search and server pagination [skip ci] 2016-11-18 01:40:43 -03: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 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