Eileen has uploaded a new change for review. https://gerrit.wikimedia.org/r/297346
Change subject: Upgrade to 4.7.9 ...................................................................... Upgrade to 4.7.9 4.7.9 includes the upstreaming of the rest of the Giant Rabbit reports work and multiple dedupe fixes Reports https://github.com/civicrm/civicrm-core/pull/8529 https://github.com/civicrm/civicrm-core/pull/8506 Dedupe & logging https://github.com/civicrm/civicrm-core/pull/8508 https://github.com/civicrm/civicrm-core/pull/8456 (Many of these changes were already in our repo prior to this PR) Patches expected to be in 4.7.10 & included here: CRM-19034 Remove line that makes all countries upper case https://github.com/civicrm/civicrm-core/pull/8664/files Remaining WMF-specific patches: aaee68ddadb7 (Not in civicrm-core repo) Remove autoload_static as it won't phplint on 5.3 for us. 84B50852d57c (Not in civicrm-core repo) Knock out a couple of trait files coz php5.3 (packages repo) alter logging 08c668d version update 198ea0c wmf-sunset-patch alter exception behaviour 82346ea Revert "add smartGroup title in select clause" 28c2974 Fix another slow point b0f4417 To be upstreamed - further custom data perms issue cf2b1d3 quick hack to group safety ccae236 Hack for running GenCode d145228 Add script for compiling deployment repo 8b7d69c Deployment file adds: gitreview, settings.location, readme, submodules 1f513c4 Increase time out while doing exports 4a2f0b5 Return more rows per query and use unbuffered query to manage the memory 416a9bf Don't create SQL function at runtime 3c3e80a Merge from master :Include custom fields in default export 21ab0d6 wmf-sunset patch skip process greetings on contact create 7c3e683 wmf-sunset patch add extra columns to contribution recur tab e1277a3 wmf: CRM-17158 block empty searches unless deliberate e37ccc2 wmf: CRM-10700 use DELETE FROM instead of TRUNCATE 0099c01 wmf: CRM-17157 allow more than 2 decimal places in currency Change-Id: I7bd176c72c5bb10b8aaa8c3fcf6140e6abdc4ef8 Fix typeo Change-Id: I76efe624e9c8df5c90a7767033390884c3968f0c --- M CRM/Admin/Form/Setting.php M CRM/Admin/Form/Setting/Miscellaneous.php M CRM/Batch/BAO/Batch.php M CRM/Case/XMLProcessor/Report.php M CRM/Contact/BAO/Group.php M CRM/Contact/BAO/Query.php M CRM/Contact/Form/DedupeFind.php M CRM/Contact/Form/Merge.php M CRM/Contact/Form/Search/Advanced.php M CRM/Contact/Page/AJAX.php M CRM/Contact/Page/DedupeFind.php M CRM/Contact/Page/DedupeMerge.php M CRM/Contribute/BAO/Contribution.php M CRM/Contribute/BAO/Contribution/Utils.php M CRM/Contribute/BAO/ContributionPage.php M CRM/Contribute/BAO/ContributionRecur.php M CRM/Contribute/DAO/Contribution.php M CRM/Contribute/Form/Contribution/Confirm.php M CRM/Contribute/Form/Contribution/Main.php M CRM/Contribute/Form/ContributionBase.php M CRM/Contribute/Form/ContributionView.php M CRM/Core/BAO/Block.php M CRM/Core/BAO/CustomValueTable.php M CRM/Core/BAO/Mapping.php M CRM/Core/BAO/PrevNextCache.php M CRM/Core/BAO/UFField.php M CRM/Core/Component.php M CRM/Core/Form.php M CRM/Core/Form/Search.php M CRM/Core/I18n.php M CRM/Core/I18n/Form.php M CRM/Core/OptionGroup.php M CRM/Core/OptionValue.php M CRM/Core/Payment/BaseIPN.php M CRM/Core/Payment/ProcessorForm.php M CRM/Core/PseudoConstant.php M CRM/Core/Resources.php M CRM/Core/Session.php M CRM/Core/Smarty.php M CRM/Core/Smarty/plugins/function.crmNavigationMenu.php M CRM/Core/xml/Menu/Contact.xml M CRM/Dedupe/BAO/RuleGroup.php M CRM/Dedupe/Finder.php M CRM/Dedupe/Merger.php M CRM/Event/Form/ManageEvent/EventInfo.php M CRM/Event/Form/Registration/Register.php M CRM/Financial/BAO/ExportFormat.php M CRM/Financial/BAO/ExportFormat/CSV.php M CRM/Financial/BAO/ExportFormat/IIF.php M CRM/Financial/BAO/FinancialAccount.php M CRM/Financial/BAO/FinancialTypeAccount.php M CRM/Financial/DAO/FinancialAccount.php M CRM/Financial/Form/Payment.php M CRM/Mailing/BAO/TrackableURL.php M CRM/Member/BAO/Query.php M CRM/Member/Form/Membership.php M CRM/Member/Form/MembershipRenewal.php M CRM/Price/BAO/LineItem.php M CRM/Price/BAO/PriceSet.php M CRM/Profile/Page/MultipleRecordFieldsListing.php M CRM/Report/BAO/ReportInstance.php M CRM/Report/Form.php M CRM/Report/Form/Activity.php M CRM/Report/Form/ActivitySummary.php M CRM/Report/Form/Instance.php M CRM/Report/Form/Pledge/Detail.php M CRM/Report/Page/Instance.php M CRM/Upgrade/Incremental/php/FourSeven.php A CRM/Upgrade/Incremental/sql/4.7.9.mysql.tpl M CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl M CRM/Utils/Geocode/Google.php M CRM/Utils/System.php M CRM/Utils/System/WordPress.php M Civi/API/Kernel.php M Civi/API/Subscriber/PermissionCheck.php M api/v3/Domain.php M api/v3/Job.php M api/v3/MembershipStatus.php M api/v3/Profile.php M api/v3/RuleGroup.php M api/v3/examples/Contribution/Create.php M api/v3/utils.php M civicrm-version.php M drupal/civicrm.info M drupal/modules/civicrm_contact_ref/civicrm_contact_ref.info M drupal/modules/civicrm_engage/civicrm_engage.info M drupal/modules/civicrm_group_roles/civicrm_group_roles.info M drupal/modules/civicrm_member_roles/civicrm_member_roles.info M drupal/modules/civicrm_og_sync/civicrm_og_sync.info M drupal/modules/civicrm_rules/civicrm_rules.info M drupal/modules/civicrmtheme/civicrmtheme.info M install/civicrm.php M install/index.php M install/template.html M js/crm.searchForm.js M settings/Core.setting.php M sql/civicrm.mysql M sql/civicrm_data.mysql M sql/civicrm_generated.mysql M sql/civicrm_navigation.mysql M templates/CRM/Admin/Form/Preferences/Address.tpl M templates/CRM/Admin/Form/Setting/Miscellaneous.tpl M templates/CRM/Contact/Form/DedupeFind.tpl M templates/CRM/Contact/Form/Merge.tpl M templates/CRM/Custom/Page/CustomDataView.tpl M templates/CRM/Member/Form/Search.hlp M templates/CRM/Member/Form/Search/Common.tpl M templates/CRM/Report/Form/Fields.tpl M templates/CRM/Report/Form/Tabs/Instance.tpl M templates/CRM/common/dedupe.tpl M templates/CRM/common/navigation.js.tpl M templates/CRM/common/paymentBlock.tpl M templates/CRM/common/tasks.tpl M templates/CRM/common/version.tpl 114 files changed, 1,496 insertions(+), 590 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm refs/changes/46/297346/1 -- To view, visit https://gerrit.wikimedia.org/r/297346 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76efe624e9c8df5c90a7767033390884c3968f0c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm/civicrm Gerrit-Branch: master Gerrit-Owner: Eileen <emcnaugh...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
