Mike Koch 65452902bb Merge remote-tracking branch 'origin/master' into 2-6-0 ...

Conflicts:
	admin/manage_knowledgebase.php
	inc/header.inc.php
	inc/headerAdmin.inc.php
	install/mods-for-hesk/sql/installSql.php

2016-05-04 23:42:53 -04: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

treemenu

Initial Hesk UI Commit

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

admin_functions.inc.php

Update headers

2016-04-18 18:57:07 -04:00

attachments.inc.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

common.inc.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

email_functions.inc.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

header.inc.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

headerAdmin.inc.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

htmLawed.php

#202 Use htmLawed to help prevent XSS

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

knowledgebase_functions.inc.php

Update headers

2016-04-18 18:57:07 -04:00

pipe_functions.inc.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

posting_functions.inc.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

print_tickets.inc.php

Update headers

2016-04-18 18:57:07 -04:00

profile_functions.inc.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

show_admin_nav.inc.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

show_search_form.inc.php

Update headers

2016-04-18 18:57:07 -04:00

status_functions.inc.php

Update headers

2016-04-18 18:57:07 -04:00

ticket_list.inc.php

Update headers

2016-04-18 18:57:07 -04:00

view_attachment_functions.inc.php

Enforce file limits

2015-12-28 22:05:20 -05:00