Merge branch 'develop', remote-tracking branch 'upstream' into issue/chunk-fetch-attachments
No related branches found
No related tags found
Showing
- include/.htaccess 1 addition, 0 deletionsinclude/.htaccess
- include/class.banlist.php 2 additions, 2 deletionsinclude/class.banlist.php
- include/class.canned.php 5 additions, 3 deletionsinclude/class.canned.php
- include/class.config.php 57 additions, 40 deletionsinclude/class.config.php
- include/class.filter.php 255 additions, 178 deletionsinclude/class.filter.php
- include/class.mailfetch.php 1 addition, 1 deletioninclude/class.mailfetch.php
- include/class.nav.php 33 additions, 29 deletionsinclude/class.nav.php
- include/class.pdf.php 13 additions, 1 deletioninclude/class.pdf.php
- include/class.ticket.php 15 additions, 16 deletionsinclude/class.ticket.php
- include/staff/banlist.inc.php 1 addition, 1 deletioninclude/staff/banlist.inc.php
- include/staff/filter.inc.php 20 additions, 14 deletionsinclude/staff/filter.inc.php
- include/staff/filters.inc.php 10 additions, 8 deletionsinclude/staff/filters.inc.php
- include/staff/login.tpl.php 6 additions, 0 deletionsinclude/staff/login.tpl.php
- include/staff/settings-alerts.inc.php 111 additions, 36 deletionsinclude/staff/settings-alerts.inc.php
- include/staff/settings-attachments.inc.php 0 additions, 108 deletionsinclude/staff/settings-attachments.inc.php
- include/staff/settings-autoresp.inc.php 3 additions, 2 deletionsinclude/staff/settings-autoresp.inc.php
- include/staff/settings-dates.inc.php 0 additions, 70 deletionsinclude/staff/settings-dates.inc.php
- include/staff/settings-emails.inc.php 111 additions, 103 deletionsinclude/staff/settings-emails.inc.php
- include/staff/settings-kb.inc.php 10 additions, 6 deletionsinclude/staff/settings-kb.inc.php
- include/staff/settings-system.inc.php 62 additions, 17 deletionsinclude/staff/settings-system.inc.php
Loading
Please register or sign in to comment