Merge remote branch 'adriane/features_prs/develop-next' into v111
Conflicts: include/class.export.php scp/tickets.php
Showing
- account.php 4 additions, 0 deletionsaccount.php
- assets/default/css/theme.css 1 addition, 1 deletionassets/default/css/theme.css
- images/oscar-favicon-16x16.png 0 additions, 0 deletionsimages/oscar-favicon-16x16.png
- images/oscar-favicon-32x32.png 0 additions, 0 deletionsimages/oscar-favicon-32x32.png
- include/ajax.forms.php 7 additions, 1 deletioninclude/ajax.forms.php
- include/ajax.orgs.php 1 addition, 1 deletioninclude/ajax.orgs.php
- include/ajax.tickets.php 1 addition, 1 deletioninclude/ajax.tickets.php
- include/ajax.users.php 1 addition, 2 deletionsinclude/ajax.users.php
- include/class.auth.php 5 additions, 3 deletionsinclude/class.auth.php
- include/class.category.php 102 additions, 7 deletionsinclude/class.category.php
- include/class.cron.php 7 additions, 1 deletioninclude/class.cron.php
- include/class.dept.php 110 additions, 17 deletionsinclude/class.dept.php
- include/class.dynamic_forms.php 3 additions, 2 deletionsinclude/class.dynamic_forms.php
- include/class.email.php 8 additions, 0 deletionsinclude/class.email.php
- include/class.export.php 79 additions, 20 deletionsinclude/class.export.php
- include/class.filter.php 72 additions, 2 deletionsinclude/class.filter.php
- include/class.filter_action.php 61 additions, 13 deletionsinclude/class.filter_action.php
- include/class.format.php 9 additions, 2 deletionsinclude/class.format.php
- include/class.forms.php 82 additions, 10 deletionsinclude/class.forms.php
- include/class.http.php 3 additions, 0 deletionsinclude/class.http.php
Loading
Please register or sign in to comment