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

504 Commits

Author SHA1 Message Date
AntonyAntonio aad2561b6a Guillermo - idioma [skip ci] frances como tu hermana 2017-02-08 00:40:42 -03:00
AntonyAntonio bfd10541a3 Guillermo - idioma [skip ci] indio como tu abuela 2017-02-07 20:57:09 -03:00
AntonyAntonio 73a4a9bd47 Guillermo - idioma [skip ci] aleman como tu vieja 2017-02-07 18:13:13 -03:00
AntonyAntonio 38f71212a6 Guillermo - disable-user-system [skip ci] chinese 2017-02-07 03:55:54 -03:00
AntonyAntonio 6057c40f4a Guillermo - disable-user-system [skip ci] chinese 2017-01-31 22:59:02 -03:00
AntonyAntonio 72d556549e Guillermo - disable-user-system [skip ci] chinese 2017-01-29 00:15:23 -03:00
Ponzio Juan Cruz c40dbebecf es.js edited online with Bitbucket 2017-01-29 00:58:10 +00:00
Ivan Diaz 9c8605fef4 Merge branch 'master' into os-152-add-advanced-settings 
Conflicts:
	client/src/data/fixtures/system-fixtures.js
	client/src/data/languages/en.js
 2017-01-26 17:35:49 -03:00
AntonyAntonio 85f1bef0b3 Guillermo - disable-user-system [skip ci] パスワ 2017-01-25 01:14:33 -03:00
Ivan Diaz 5e51536f25 Ivan - Add api keys [skip ci] 2017-01-22 06:52:03 -03:00
ivan 796571c8a1 Ivan - Update some texts [skip ci] 2017-01-21 19:06:13 -03:00
ivan 09c6453d46 Ivan - Fix some issues related to no user system [skip ci] 2017-01-21 02:00:04 -03:00
ivan c18142f2ba Ivan - Add home link and english keys for no user system [skip ci] 2017-01-21 01:54:13 -03:00
ivan 6109e1ac73 Ivan - Add article list for no user system [skip ci] 2017-01-21 01:42:48 -03:00
ivan eff51acc90 Merge branch 'master' into os-157-disable-user-system-views 
# Conflicts:
#	client/src/data/languages/en.js
 2017-01-21 00:34:45 -03:00
ivan 9db530f2dd Ivan - Add ticket view page for no user system[skip ci] 2017-01-21 00:20:25 -03:00
Ivan Diaz 4e0669c4ae Ivan - WIP [skip ci] 2017-01-20 22:01:18 -03:00
Ivan Diaz ec18363058 Ivan - Add check ticket page [skip ci] 2017-01-19 19:48:55 -03:00
Ivan Diaz 4119509cc4 Ivan - Add create ticket for no user system [skip ci] 2017-01-19 17:37:51 -03:00
ivan cf7dbffbf3 Max Red - WIP [skip ci] 2017-01-17 23:51:22 -03:00
ivan 18b736dea7 Max Red - add items from fixtures to registration api keys [skip ci] 2017-01-17 21:39:16 -03:00
Ivan Diaz d3ecbacf2d Merged in os-146-add-stats-component (pull request #124) 
Os 146 add stats component
 2017-01-17 16:54:04 -03:00
Ivan Diaz e20760e8bb Ivan - Update home page for user system disabled [skip ci] 2017-01-17 16:27:46 -03:00
ivan e04d967c14 Max Red - space things up adding some css [skip ci] 2017-01-17 16:12:49 -03:00
ivan bce56d7b05 Max Red - make toggle list unselectable and not able to change cursor view [skip ci] 2017-01-17 15:53:43 -03:00
ivan 26d26320c9 Max Red - deleted console.logs from system-fixtures [skip ci] 2017-01-17 15:52:12 -03:00
ivan f1c82dc384 Max Red - beautified code a little bit more replacing another for for another map [skip ci] 2017-01-17 15:50:33 -03:00
ivan fda6e798a0 Max Red - problems with displaying stats in admin-panel-my-account view, Ivan fixed it [skip ci] 2017-01-17 15:26:18 -03:00
ivan 4fb1c32cbc Max Red - beautified code by replacing a for for a map (: [skip ci] 2017-01-17 15:09:00 -03:00
ivan a40121111e Max Red - modified registration setting in fixtures [skip ci] 2017-01-17 14:58:28 -03:00
ivan ee5ba9dfad Max Red - WIP [skip ci] 2017-01-17 14:55:00 -03:00
ivan 577ce49d6f Max Red - Created top bars [skip ci] 2017-01-16 20:07:41 -03:00
ivan e32717a1a6 Max Red - Added toggle buttons [skip ci] 2017-01-16 18:05:07 -03:00
ivan bcb9b5b7ac Max Red - deleted filters and custom fields [skip ci] 2017-01-16 17:00:48 -03:00
ivan 73c8d94626 Max Red - renamed user-system to advanced-settings [skip ci] 2017-01-16 16:58:46 -03:00
ivan a70778db9c Max Red - disable registration and fixed a message in en.js[skip ci] 2017-01-16 16:06:19 -03:00
ivan 1019b4ff96 Max Red - Delete redundant css [skip ci] 2017-01-16 12:39:07 -03:00
ivan 9fbf53d586 Max Red - Beautify code, replacing another for using .map [skip ci] 2017-01-16 12:20:22 -03:00
ivan 7c19ef1716 Max Red - Beautify code, replacing a for using .map [skip ci] 2017-01-16 12:04:47 -03:00
ivan 8584be0924 Max Red - Changed colors [skip ci] 2017-01-15 20:10:02 -03:00
ivan 371b7973b2 Max Red - Ivan changed some things (problems with userId in my-account) and I kept abstacting the component, and applied it to staff-editor [skip ci] 2017-01-15 19:46:08 -03:00
ivan da928f9b6f Max Red - Added abstraction to the component in order to work in view-staff page [skip ci] 2017-01-15 18:33:00 -03:00
ivan ebb3516df3 Max Red - Starting refactoring of component stats [skip ci] 2017-01-15 17:20:48 -03:00
ivan 30f1526f1c Max Red - Added even even more more basic scss [skip ci] 2017-01-15 15:47:13 -03:00
ivan 0500666174 Max Red - Added even more basic scss [skip ci] 2017-01-15 15:07:07 -03:00
ivan 1f6e3ae028 Max Red - Added basic scss [skip ci] 2017-01-15 00:07:02 -03:00
Ivan Diaz 35d9a166cf Ivan - Add file download component [skip ci] 2017-01-14 21:44:20 -03:00
ivan fd2c20ac9f Max Red - Added all functionality to the component [skip ci] 2017-01-14 21:31:02 -03:00
ivan 19f25657ef Max Red - Corrected to work even if the response of system/get-stats is not the full week/month/year etc.. [skip ci] 2017-01-14 18:47:04 -03:00
ivan 9861bfb023 Max Red - Added functionality to dropdown [skip ci] 2017-01-14 18:41:19 -03:00
ivan 7022dfeabf Max Red - Showing real data in graph taken from fixtures [skip ci] 2017-01-14 17:20:04 -03:00
Ivan Diaz d575882bf2 Ivan - Add file uploader component [skip ci] 2017-01-14 16:39:22 -03:00
ivan 8c50cc97c9 Max Red - Create stats state, and display correct values in the toggle list [skip ci] 2017-01-14 15:15:26 -03:00
ivan 1e69e6f4f8 Max Red - Finished StatsChart component, started full component [skip ci] 2017-01-14 14:17:35 -03:00
ivan d12194cd34 Max Red - beautify code and add functionality [skip ci] 2017-01-14 14:00:02 -03:00
ivan 4f7118c2e5 Max Red - Abstracting StatsChart, modified demo page [skip ci] 2017-01-14 01:45:21 -03:00
ivan 8221a06048 Max Red - WIP second layout [skip ci] 2017-01-13 17:06:52 -03:00
ivan 1944f7109d Merge branch 'master' into os-146-add-stats-component 
# Conflicts:
#	client/src/data/languages/en.js
 2017-01-13 15:19:39 -03:00
ivan 6a22ba711e Max Red - WIP first layout [skip ci] 2017-01-13 15:17:43 -03:00
Ivan Diaz 3743ec5e67 Merged in os-145-toggle-list (pull request #117) 
Os 145 toggle list
 2017-01-13 12:06:28 -03:00
ivan 139a474693 Max Red - beautify code and set default selected indices to an empty array [skip ci] 2017-01-13 10:33:17 -03:00
Ivan Diaz 27dd28aa04 es.js created online with Bitbucket 2017-01-12 14:48:44 +00:00
Ivan Diaz 3299c3dd8d Ivan - Deploy changes [skip ci] 2017-01-11 00:21:27 -03:00
ivan 6fc460d4b6 Max Red - Modified some things, I don't know which [skip ci] 2017-01-10 18:27:53 -03:00
Ivan Diaz 42c1e81fbc Ivan - Fix login test 2017-01-10 17:10:28 -03:00
Ivan Diaz 1ca57e1b76 Ivan - Add deploy on dev 3 changes and fixes [skip ci] 2017-01-10 17:07:49 -03:00
ivan b75660ec1d Max Red - Created first layout and functionality of ToggleList component [skip ci] 2017-01-10 16:45:58 -03:00
Ivan Diaz c248c8d486 Ivan - Add verification for admin view [skip ci] 2017-01-10 13:34:16 -03:00
Ivan Diaz ae946a7397 Ivan - Add verification token for frontend user view [skip ci] 2017-01-10 13:14:35 -03:00
Ivan Diaz e9854341f0 Merged in 184-add-info-tooltip-form-fields (pull request #113) 
184 add info tooltip form fields
 2017-01-06 16:36:37 -03:00
ivan 4213c77e6e Ivan Diaz - Fix activity list minor issues [skip ci] 2017-01-05 21:31:43 -03:00
Ivan Diaz 9288067958 Ivan - Add language list validation [skip ci] 2017-01-05 18:22:36 -03:00
ivan 5ea4137e41 Max Red - Finally we did it! [skip ci] 2017-01-05 18:01:56 -03:00
Ivan Diaz e78808eb6c Ivan - Language selection for system preferences [skip ci] 2017-01-05 17:15:20 -03:00
ivan 1465a53616 Merge branch 'master' into os-143-last-activity 
# Conflicts:
#	client/src/data/languages/en.js
 2017-01-05 16:27:19 -03:00
Ivan Diaz 9098a36df2 Ivan - Add some infobox to system fixtures [skip ci] 2017-01-05 16:11:53 -03:00
ivan e0b10f5cae Max Red - created activity-list component [skip ci] 2017-01-05 16:10:38 -03:00
ivan 53aa8cc7f6 Max Red - Created menu type 'horizontal-list-bright', modified fixtures and add button load more with functionality [skip ci] 2017-01-05 15:45:46 -03:00
Ivan Diaz 35efa73fdb Merge branch 'master' into 184-add-info-tooltip-form-fields 2017-01-05 15:05:46 -03:00
Ivan Diaz 1e7b2e86e9 Merge branch 'master' into OS-130-create-system-preferences-view 
Conflicts:
	client/src/data/languages/en.js
 2017-01-05 14:53:41 -03:00
Ivan Diaz d550e01358 Ivan - Add formfield infotooltip and staff editor level info [skip ci] 2017-01-05 14:49:10 -03:00
ivan ff8ae643b3 Max Red - Created activity-row component [skip ci] 2017-01-05 14:42:48 -03:00
ivan 6ddac56bc5 Max Red - Create system and staff fixtures for last-events and get-logs [skip ci] 2017-01-05 13:31:09 -03:00
ivan 68fe99f395 Max Red - Add functionality to "Discard changes" button, modified fixtures [skip ci] 2017-01-04 19:28:53 -03:00
ivan 3af899efcd Max Red - Add default language select [skip ci] 2017-01-04 18:39:15 -03:00
ivan f6a0ab29a0 Max Red - Modified fixtures, added recoverSettings and modified visual layout [skip ci] 2017-01-04 17:57:20 -03:00
Ivan Diaz 8e05054ef4 Ivan - Remove debugger [skip ci] 2017-01-04 17:42:51 -03:00
Ivan Diaz 251af39615 Merge branch 'master' into os-136-email-templates-view 2017-01-04 17:29:52 -03:00
Ivan Diaz c1671b7e1a Ivan - Complete email templates view [skip ci] 2017-01-04 17:16:07 -03:00
Ivan Diaz a86fdc72ee Ivan - Update system fixtures for email templates 2017-01-04 15:46:57 -03:00
ivan 37ae4b1bfe Merge branch 'master' into OS-130-create-system-preferences-view 2017-01-04 15:28:51 -03:00
ivan a077a19639 Max Red - Admin panel system preferences first layout WIP [skip ci] 2017-01-04 15:27:16 -03:00
Ivan Diaz 28ae0d1bd1 Merged in 133-language-architecture-frontend (pull request #106) 
Ivan - Add supported and allowed languages architecture for frontend
 2017-01-04 15:08:41 -03:00
ivan 088f1de941 Ivan - Email templates view initial approach [skip ci] 2017-01-02 14:23:19 -03:00
Ivan Diaz 6b3a24370a Ivan - Add supported and allowed languages architecture for frontend [skip ci] 2016-12-31 15:34:29 -03:00
ivan 6f58c28af5 Merge branch 'master' into OS-129-maintenancemode 
# Conflicts:
#	client/src/data/languages/en.js
 2016-12-27 18:41:53 -03:00
ivan 1d224dd5b1 Ivan - Add maintenance mode styling [skip ci] 2016-12-27 18:34:59 -03:00
Ivan Diaz 5874cf279e Merged in fix-some-bugs (pull request #103) 
Fix some bugs
 2016-12-27 16:05:42 -03:00
ivan e842755b9e Ivan - Add maintenance mode structure [skip ci] 2016-12-27 16:05:24 -03:00
ivan 42cd025433 Ivan - Add delete button for staff [skip ci] 2016-12-26 01:30:04 -03:00
ivan cb7885f5d9 Ivan - Add messages to staff editor [skip ci] 2016-12-26 01:07:40 -03:00
ivan 0fd70ec441 Ivan - Add error messages for admin articles view [skip ci] 2016-12-23 17:07:21 -03:00
ivan 5b68997437 Ivan - Add error messages for admin users view [skip ci] 2016-12-23 04:28:32 -03:00
ivan 6351666258 Ivan - Add error messages for admin tickets view [skip ci] 2016-12-23 00:18:41 -03:00
ivan d2c2327a60 Ivan - Add message for ticket comment error [skip ci] 2016-12-21 19:16:21 -03:00
ivan b6af2f44ab Ivan - Improve ticketinfo styling [skip ci] 2016-12-21 18:56:54 -03:00
ivan 84810ba57d Ivan - Improve TicketInfo style [skip ci] 2016-12-21 18:55:12 -03:00
ivan 750251311c Ivan - Improve tooltip styling and animation [skip ci] 2016-12-21 18:33:10 -03:00
ivan 91f8394ef6 Ivan - Add 6000 as max characters for commit [skip ci] 2016-12-21 17:07:34 -03:00
ivan 7ef2eec14b Ivan - Add icon to drag and drop [skip ci] 2016-12-20 23:26:46 -03:00
ivan 04f1d12e7d Ivan - Fix drag and drop os-172 multiple topics [skip ci] 2016-12-16 01:58:27 -03:00
ivan e0d1fd0e40 Ivan - Add delete article button[skip ci] 2016-12-16 01:22:26 -03:00
ivan 0d921472e2 Ivan - Fix bug os-171 - fixed width for add article modal[skip ci] 2016-12-16 01:02:34 -03:00
ivan 65630d1b15 Ivan - Add pagination to table [skip ci] 2016-12-15 18:33:54 -03:00
Ivan Diaz 839bc0bf9e Merged in OS-168-update-dates (pull request #97) 
OS-168 update dates
 2016-12-13 22:06:58 -03:00
ivan 8d2033ec31 Ivan - Updates needed for dev3 deploy [skip ci] 2016-12-13 21:10:49 -03:00
Max Red 5dd9ae10a9 Max - makes second paremeter of DateTransformer.transformToString optional [skip ci] 2016-12-13 20:33:58 -03:00
Ivan Diaz 4ef41d08a0 Merged in os-127-view-restrictions (pull request #95) 
Ivan - Add view restrictions for admin
 2016-12-13 20:19:40 -03:00
Max Red 0dff819838 Max - error with spaces #2 [skip ci] 2016-12-13 16:48:53 -03:00
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