Merge remote-tracking branch 'remotes/upstream/master'
Showing
- civicrm.php 2 additions, 2 deletionscivicrm.php
- civicrm/CRM/ACL/BAO/ACL.php 14 additions, 21 deletionscivicrm/CRM/ACL/BAO/ACL.php
- civicrm/CRM/ACL/DAO/ACL.php 6 additions, 3 deletionscivicrm/CRM/ACL/DAO/ACL.php
- civicrm/CRM/ACL/DAO/ACLCache.php 14 additions, 5 deletionscivicrm/CRM/ACL/DAO/ACLCache.php
- civicrm/CRM/ACL/DAO/EntityRole.php 6 additions, 3 deletionscivicrm/CRM/ACL/DAO/EntityRole.php
- civicrm/CRM/ACL/Form/ACL.php 7 additions, 6 deletionscivicrm/CRM/ACL/Form/ACL.php
- civicrm/CRM/ACL/Form/EntityRole.php 1 addition, 2 deletionscivicrm/CRM/ACL/Form/EntityRole.php
- civicrm/CRM/Activity/ActionMapping.php 8 additions, 0 deletionscivicrm/CRM/Activity/ActionMapping.php
- civicrm/CRM/Activity/BAO/Activity.php 67 additions, 131 deletionscivicrm/CRM/Activity/BAO/Activity.php
- civicrm/CRM/Activity/BAO/ActivityContact.php 12 additions, 3 deletionscivicrm/CRM/Activity/BAO/ActivityContact.php
- civicrm/CRM/Activity/BAO/Query.php 1 addition, 1 deletioncivicrm/CRM/Activity/BAO/Query.php
- civicrm/CRM/Activity/Controller/Search.php 3 additions, 0 deletionscivicrm/CRM/Activity/Controller/Search.php
- civicrm/CRM/Activity/DAO/Activity.php 6 additions, 3 deletionscivicrm/CRM/Activity/DAO/Activity.php
- civicrm/CRM/Activity/DAO/ActivityContact.php 6 additions, 3 deletionscivicrm/CRM/Activity/DAO/ActivityContact.php
- civicrm/CRM/Activity/Form/Activity.php 5 additions, 3 deletionscivicrm/CRM/Activity/Form/Activity.php
- civicrm/CRM/Activity/Form/Task.php 2 additions, 4 deletionscivicrm/CRM/Activity/Form/Task.php
- civicrm/CRM/Activity/Form/Task/SearchTaskHookSample.php 0 additions, 73 deletionscivicrm/CRM/Activity/Form/Task/SearchTaskHookSample.php
- civicrm/CRM/Activity/Page/AJAX.php 1 addition, 1 deletioncivicrm/CRM/Activity/Page/AJAX.php
- civicrm/CRM/Activity/Tokens.php 3 additions, 2 deletionscivicrm/CRM/Activity/Tokens.php
- civicrm/CRM/Admin/Form/Job.php 11 additions, 2 deletionscivicrm/CRM/Admin/Form/Job.php
Loading
Please register or sign in to comment