Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/184798
Change subject: Merge contrib-v4.4 into dev-v4.4
......................................................................
Merge contrib-v4.4 into dev-v4.4
TODO: fix conflict resolution to either remove or fix each of our
customizations.
Conflicts:
CRM/ACL/BAO/ACL.php
CRM/ACL/BAO/Cache.php
CRM/Contact/BAO/Contact.php
CRM/Contact/DAO/Contact.php
CRM/Contact/Form/Edit/CommunicationPreferences.php
CRM/Contact/Form/Search/Custom/DateAdded.php
CRM/Contribute/Form/Contribution.php
CRM/Contribute/xml/Menu/Contribute.xml
CRM/Core/BAO/CustomField.php
CRM/Core/BAO/CustomGroup.php
CRM/Core/BAO/UFGroup.php
CRM/Core/Block.php
CRM/Core/DAO.php
CRM/Core/DAO/Address.php
CRM/Core/DAO/Email.php
CRM/Core/I18n/Schema.php
CRM/Core/OptionGroup.php
CRM/Logging/Schema.php
CRM/Report/Form.php
api/api.php
api/v3/utils.php
css/civicrm.css
packages/HTML/QuickForm.php
templates/CRM/common/jcalendar.tpl
Change-Id: I326061c834e983ce2b8854ded4582761a4c6784f
---
M CRM/ACL/BAO/ACL.php
M CRM/ACL/BAO/Cache.php
M CRM/Contact/BAO/Contact.php
M CRM/Contact/DAO/Contact.php
M CRM/Contact/Form/Edit/CommunicationPreferences.php
M CRM/Contact/Form/Search/Custom/DateAdded.php
M CRM/Contribute/Form/Contribution.php
M CRM/Contribute/xml/Menu/Contribute.xml
M CRM/Core/BAO/CustomField.php
M CRM/Core/BAO/CustomGroup.php
M CRM/Core/BAO/UFGroup.php
M CRM/Core/Block.php
M CRM/Core/DAO.php
M CRM/Core/DAO/Address.php
M CRM/Core/DAO/Email.php
M CRM/Core/I18n/Schema.php
M CRM/Core/OptionGroup.php
M CRM/Logging/Schema.php
M CRM/Report/Form.php
M api/api.php
M api/v3/EntityTag.php
M api/v3/utils.php
M css/civicrm.css
M packages/HTML/QuickForm.php
M templates/CRM/common/jcalendar.tpl
25 files changed, 3,022 insertions(+), 4,297 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm
refs/changes/98/184798/1
--
To view, visit https://gerrit.wikimedia.org/r/184798
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I326061c834e983ce2b8854ded4582761a4c6784f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
