-
- Downloads
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-23-15-17-29
Conflicts: CRM/Core/BAO/ActionSchedule.php sql/civicrm_generated.mysql xml/version.xml
Showing
- CRM/Activity/BAO/Activity.php 3 additions, 1 deletionCRM/Activity/BAO/Activity.php
- CRM/Admin/Form/Setting/Localization.php 4 additions, 3 deletionsCRM/Admin/Form/Setting/Localization.php
- CRM/Campaign/BAO/Query.php 1 addition, 1 deletionCRM/Campaign/BAO/Query.php
- CRM/Campaign/Form/Survey/Results.php 1 addition, 1 deletionCRM/Campaign/Form/Survey/Results.php
- CRM/Case/XMLProcessor/Report.php 17 additions, 33 deletionsCRM/Case/XMLProcessor/Report.php
- CRM/Contact/BAO/ProximityQuery.php 36 additions, 15 deletionsCRM/Contact/BAO/ProximityQuery.php
- CRM/Contact/BAO/Query.php 4 additions, 2 deletionsCRM/Contact/BAO/Query.php
- CRM/Contact/Form/Edit/Address.php 1 addition, 1 deletionCRM/Contact/Form/Edit/Address.php
- CRM/Contact/Form/Inline/CustomData.php 2 additions, 1 deletionCRM/Contact/Form/Inline/CustomData.php
- CRM/Contact/Form/Task/SMSCommon.php 10 additions, 9 deletionsCRM/Contact/Form/Task/SMSCommon.php
- CRM/Contact/Page/Inline/CustomData.php 9 additions, 3 deletionsCRM/Contact/Page/Inline/CustomData.php
- CRM/Core/BAO/ActionSchedule.php 3 additions, 3 deletionsCRM/Core/BAO/ActionSchedule.php
- CRM/Core/Config.php 16 additions, 5 deletionsCRM/Core/Config.php
- CRM/Core/I18n/SchemaStructure_4_3_1.php 232 additions, 0 deletionsCRM/Core/I18n/SchemaStructure_4_3_1.php
- CRM/Core/Invoke.php 1 addition, 0 deletionsCRM/Core/Invoke.php
- CRM/Core/Payment/AuthorizeNetIPN.php 2 additions, 0 deletionsCRM/Core/Payment/AuthorizeNetIPN.php
- CRM/Core/Payment/BaseIPN.php 2 additions, 0 deletionsCRM/Core/Payment/BaseIPN.php
- CRM/Core/PseudoConstant.php 25 additions, 0 deletionsCRM/Core/PseudoConstant.php
- CRM/Core/Resources.php 2 additions, 2 deletionsCRM/Core/Resources.php
- CRM/Event/Badge/NameTent.php 1 addition, 1 deletionCRM/Event/Badge/NameTent.php
Loading
Please register or sign in to comment