Mike Koch
|
4173c366e6
|
Merge branch 'master' into tiny-mce-for-tickets
# Conflicts:
# admin/admin_settings.php
# admin/admin_settings_save.php
# language/en/text.php
# modsForHesk_settings.inc.php
|
9 years ago |
|
Mike Koch
|
222258a591
|
#202 Add TinyMCE to manage canned page
|
9 years ago |
|
Mike Koch
|
84dda62e71
|
#209 Start working on TinyMCE for manage canned
|
9 years ago |
Mike Koch
|
03de74dea7
|
Merge pull request #293 from mkoch227/improve-statuses-ui
Improve Statuses UI
|
9 years ago |
Mike Koch
|
e708c722a2
|
#202 Add TinyMCE to ticket template page
|
9 years ago |
|
Mike Koch
|
4f65200405
|
#209 Add setting for status sort to settings page
|
9 years ago |
|
Mike Koch
|
9db20734ca
|
#209 Everything uses the new status_functions
|
9 years ago |
|
Mike Koch
|
a131b7842e
|
#209 Add sort property, and statuses page honors sort
|
9 years ago |
|
Mike Koch
|
c9360fd538
|
#209 Update search and export pages to show new status table
Still need to fix searching and need to test exporting
|
9 years ago |
|
Mike Koch
|
6b83e852d0
|
#209 Support new status table
|
9 years ago |
|
Mike Koch
|
22e8a8efe9
|
#209 View ticket on admin side now supports new statuses
|
9 years ago |
|
Mike Koch
|
f056e83b40
|
#209 Statuses can now be sorted
|
9 years ago |
|
Mike Koch
|
bb00445ae2
|
#209 Build modals at end to prevent nested forms, provide suggestions from language file
|
9 years ago |
|
Mike Koch
|
90903e8491
|
#209 Start implementing move up/down
|
9 years ago |
|
Mike Koch
|
14ad6cd4f2
|
#209 Statuses can now be deleted
|
9 years ago |
|
Mike Koch
|
1a825b81af
|
#209 Statuses can now be edited
|
9 years ago |
|
Mike Koch
|
05be7d7041
|
#209 Some performance tweaks; also use function for rest of page
|
9 years ago |
|
Mike Koch
|
2b6807137f
|
#209 Add ability get status text based on xref or fallback
|
9 years ago |
|
Mike Koch
|
03718e2632
|
#209 New statuses can be created to the xref table
|
9 years ago |
|
Mike Koch
|
15c2e7d983
|
#209 Mockup for create status modal is complete, add table for status text
|
9 years ago |
|
Mike Koch
|
e64eebad81
|
#209 Some more UI changes. Still need to setup modals.
|
9 years ago |
|
Mike Koch
|
84e2be3a8c
|
#209 Remove unused save actions
|
9 years ago |
|
Mike Koch
|
35a3f80890
|
#209 Only show move up/down if at the right point
|
9 years ago |
|
Mike Koch
|
2e3d9ccded
|
#209 Remove form-related fields from the table
|
9 years ago |
|
Mike Koch
|
98e589dfb4
|
#209 Tweak the statuses UI
- Remove "Language Key" input field
- Add panels to separate content
- Add pencil icon w/tooltip that will soon hold a way to edit the name
|
9 years ago |
|
Mike Koch
|
5068c5ba2d
|
#208 Add TinyMCE to client side and fix edit post for admin
|
9 years ago |
|
Mike Koch
|
ffabc4e67d
|
#202 Only decode HTML if rich text is enabled
|
9 years ago |
|
Mike Koch
|
01964b61b8
|
Closes #281 Always show custom field selection when editing canned response
|
9 years ago |
|
Mike Koch
|
f75cc87c10
|
#208 Fix rendering of HTML and for signatures
|
9 years ago |
|
Mike Koch
|
9dd83e9f41
|
#208 Don't use TinyMCE for custom fields
|
9 years ago |
|
Mike Koch
|
fc5b47072b
|
#202 Start adding TinyMCE to admin pages.
Still need to fix canned responses on admin_ticket though
|
9 years ago |
|
Mike Koch
|
035c5f092a
|
#202 Add setting for rich text
|
9 years ago |
|
Mike Koch
|
c73f97e0de
|
Merge branch 'master' into tiny-mce-for-tickets
|
9 years ago |
|
Mike Koch
|
5b27b9c464
|
#202 Display HTML-formatted versions of ticket messages
Should add conditional to parse the HTML or to leave it alone, depending on the helpdesk's setting
|
9 years ago |
|
Mike Koch
|
5c3fca0682
|
#218 Add settings area for quick help sections
|
9 years ago |
|
Mike Koch
|
7afb51164a
|
Closes #274 Add setting for setting category sort
|
9 years ago |
|
Mike Koch
|
9edb0095a4
|
#274 Add category sort property for dropdowns and table
|
9 years ago |
|
Mike Koch
|
8a9045df40
|
Merge pull request #267 from mkoch227/large-space-when-requesting-location
Display map div only after getting location
|
9 years ago |
|
Mike Koch
|
a202808f0b
|
Merge pull request #268 from mkoch227/knowledgebase-footer
Hopefully fixed the footer...again
|
9 years ago |
|
Mike Koch
|
306efad3a0
|
Merge pull request #269 from mkoch227/fix-reply-layout
Fix response layouts
|
9 years ago |
|
Mike Koch
|
0373f60936
|
[MFH-2] Fix status validation #resolve
|
9 years ago |
|
Mike Koch
|
47f4978d5b
|
Closes #263 Fix response layouts
|
9 years ago |
|
Mike Koch
|
5b1961159b
|
Closes #259 Hopefully fixed the footer...again
|
9 years ago |
|
Mike Koch
|
9986e41c5c
|
Closes #262 Display map div only after getting location
|
9 years ago |
|
Mike Koch
|
72a8d22982
|
Some tweaks to permission templates
|
9 years ago |
|
Mike Koch
|
40afa50bca
|
#255 Update headers
|
9 years ago |
|
Mike Koch
|
139853e0d4
|
#255 Update code for 2.6.3
|
9 years ago |
|
Mike Koch
|
cc58d84311
|
#196 Add template name to table
|
9 years ago |
|
Mike Koch
|
81553d4885
|
#196 Patch up some permission stuff
|
9 years ago |
|
Mike Koch
|
9a5bc49ac1
|
#196 Fix some "custom" template stuff
|
9 years ago |