Merge pull request #2256 from civicrm/master
merge master changes to doctrine branch
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- CRM/Activity/BAO/Activity.php 7 additions, 3 deletionsCRM/Activity/BAO/Activity.php
- CRM/Case/BAO/Case.php 33 additions, 3 deletionsCRM/Case/BAO/Case.php
- CRM/Case/Form/Activity.php 1 addition, 1 deletionCRM/Case/Form/Activity.php
- CRM/Case/Form/CaseView.php 1 addition, 1 deletionCRM/Case/Form/CaseView.php
- CRM/Case/Page/Tab.php 1 addition, 1 deletionCRM/Case/Page/Tab.php
- CRM/Contact/Form/Edit/CommunicationPreferences.php 3 additions, 1 deletionCRM/Contact/Form/Edit/CommunicationPreferences.php
- CRM/Core/BAO/Dashboard.php 11 additions, 0 deletionsCRM/Core/BAO/Dashboard.php
- CRM/Core/BAO/Website.php 1 addition, 1 deletionCRM/Core/BAO/Website.php
- CRM/Core/Session.php 1 addition, 1 deletionCRM/Core/Session.php
- CRM/Core/Smarty/plugins/function.crmAPI.php 1 addition, 1 deletionCRM/Core/Smarty/plugins/function.crmAPI.php
- CRM/Event/Form/ManageEvent.php 1 addition, 1 deletionCRM/Event/Form/ManageEvent.php
- CRM/Member/BAO/MembershipStatus.php 6 additions, 5 deletionsCRM/Member/BAO/MembershipStatus.php
- CRM/Report/Form/Event/ParticipantListing.php 4 additions, 0 deletionsCRM/Report/Form/Event/ParticipantListing.php
- CRM/Report/Form/Instance.php 9 additions, 1 deletionCRM/Report/Form/Instance.php
- CRM/Upgrade/Incremental/php/FourFour.php 44 additions, 0 deletionsCRM/Upgrade/Incremental/php/FourFour.php
- CRM/Utils/Array.php 1 addition, 1 deletionCRM/Utils/Array.php
- api/v3/UFField.php 1 addition, 1 deletionapi/v3/UFField.php
- api/v3/examples/SettingGetfields.php 67 additions, 19 deletionsapi/v3/examples/SettingGetfields.php
- js/crm.backbone.js 37 additions, 2 deletionsjs/crm.backbone.js
Loading
Please register or sign in to comment