Skip to content
Snippets Groups Projects
  1. Feb 10, 2015
  2. Feb 09, 2015
  3. Feb 02, 2015
  4. Jan 30, 2015
  5. Jan 26, 2015
  6. Jan 23, 2015
  7. Jan 20, 2015
    • Peter Rotich's avatar
      oops: bug fix · c7170011
      Peter Rotich authored
      c7170011
    • Peter Rotich's avatar
      oops: ticket filters · f64e2467
      Peter Rotich authored
      Refactor filter.yaml and related code base
      Move isBanned routine to banlist class and make it banlist specific
      Refactor how canned responses get list of filters
      f64e2467
  8. Jan 16, 2015
  9. Jan 15, 2015
  10. Jan 14, 2015
  11. Jan 13, 2015
  12. Jan 12, 2015
  13. Jan 09, 2015
  14. Jan 07, 2015
    • Jared Hancock's avatar
      lint: Fix a couple lint reported issues · cd8acd70
      Jared Hancock authored
      cd8acd70
    • Jared Hancock's avatar
    • Jared Hancock's avatar
      Merge remote branch 'upstream/develop' into develop-next · 2f48c682
      Jared Hancock authored
      Apply changes made to v1.9.5
      
      Conflicts:
      	attachment.php
      	include/ajax.draft.php
      	include/ajax.tickets.php
      	include/class.attachment.php
      	include/class.dept.php
      	include/class.dynamic_forms.php
      	include/class.faq.php
      	include/class.file.php
      	include/class.http.php
      	include/class.nav.php
      	include/class.page.php
      	include/class.staff.php
      	include/class.thread.php
      	include/class.ticket.php
      	include/client/faq.inc.php
      	include/client/tickets.inc.php
      	include/staff/cannedresponses.inc.php
      	include/staff/categories.inc.php
      	include/staff/category.inc.php
      	include/staff/department.inc.php
      	include/staff/departments.inc.php
      	include/staff/directory.inc.php
      	include/staff/emails.inc.php
      	include/staff/faq-view.inc.php
      	include/staff/faq.inc.php
      	include/staff/group.inc.php
      	include/staff/groups.inc.php
      	include/staff/helptopic.inc.php
      	include/staff/page.inc.php
      	include/staff/pages.inc.php
      	include/staff/slaplan.inc.php
      	include/staff/slaplans.inc.php
      	include/staff/staff.inc.php
      	include/staff/staffmembers.inc.php
      	include/staff/system.inc.php
      	include/staff/team.inc.php
      	include/staff/teams.inc.php
      	include/staff/template.inc.php
      	include/staff/tickets.inc.php
      	include/staff/users.inc.php
      	scp/attachment.php
      	scp/canned.php
      2f48c682
  15. Jan 06, 2015
Loading