Mike Koch f53065f7f6 Merge branch '3-3-0' into '357-calendar-planning-phase-two' ...

# Conflicts:
#   api/BusinessLogic/Security/UserContext.php
#   api/BusinessLogic/Security/UserPrivilege.php
#   api/index.php
#   language/en/text.php

2018-01-29 01:46:16 +00:00

..

custom

#6 Added comment to designate beginning of custom nav elements

2014-04-26 14:14:28 -04:00

html2text

#365 Add html2text dependency, initial implementation

2015-10-16 22:01:56 -04:00

recaptcha

Fix reCAPTCHA for some users

2015-10-19 23:33:15 -04:00

ticket

More work on ticket table

2016-08-08 22:06:29 -04:00

tiny_mce/3.5.11/plugins/autolink

Fixes #516 Add autolink plugin to auto-generate URL when entering in messages

2017-04-02 21:15:34 -04:00

treemenu

Initial Hesk UI Commit

2014-03-23 16:03:30 -04:00

admin_functions.inc.php

Update pages for HESK 2.7.4

2017-11-20 22:16:46 -05:00

attachments.inc.php

#544 Start updating to HESK 2.7.3

2017-04-11 20:58:34 -04:00

common.inc.php

Service messages now appear in their proper locations

2017-11-28 13:03:06 -05:00

custom_fields.inc.php

Getting started adding custom field descriptions

2017-09-18 22:04:50 -04:00

email_functions.inc.php

Update pages for HESK 2.7.4

2017-11-20 22:16:46 -05:00

footer.inc.php

Move users online to top navbar

2017-01-02 16:03:20 -05:00

header.inc.php

Add missing CSS, update installer

2017-11-05 20:32:25 -05:00

headerAdmin.inc.php

Audit trail now displays for users who can manage calendar

2018-01-25 22:07:28 -05:00

htmLawed.php

#202 Use htmLawed to help prevent XSS

2015-08-01 16:38:54 -04:00

knowledgebase_functions.inc.php

#544 Rest of the 2.7.3 updates

2017-04-11 20:58:35 -04:00

mail_functions.inc.php

Fix 'from' on email header

2016-11-17 20:57:50 -05:00

pipe_functions.inc.php

Update pages for HESK 2.7.4

2017-11-20 22:16:46 -05:00

posting_functions.inc.php

Update pages for HESK 2.7.4

2017-11-20 22:16:46 -05:00

print_tickets.inc.php

HESK 2.7.0 RC1 -> Final changes

2016-11-18 12:57:17 -05:00

profile_functions.inc.php

Permission groups seem to be good to go?

2017-09-18 13:04:26 -04:00

show_admin_nav.inc.php

Working on permission template -> group conversion

2017-09-17 22:07:01 -04:00

show_search_form.inc.php

HESK 2.7.0 RC1 -> Final changes

2016-11-18 12:57:17 -05:00

status_functions.inc.php

HESK 2.7.0 RC1 -> Final changes

2016-11-18 12:57:17 -05:00

ticket_list.inc.php

Add bootstrap-select to all dropdowns in green, change background on ticket list

2017-09-12 22:04:10 -04:00

users_online.inc.php

Move users online to top navbar

2017-01-02 16:03:20 -05:00

view_attachment_functions.inc.php

Fix URL

2017-05-29 22:03:46 -04:00