Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-19-17-34-09
authorKurund Jalmi <kurund@yahoo.com>
Sun, 19 Jul 2015 13:09:39 +0000 (18:39 +0530)
committerKurund Jalmi <kurund@yahoo.com>
Sun, 19 Jul 2015 13:09:39 +0000 (18:39 +0530)
commitf85b80630e8324121dcdef2d7aacd432946b541f
treefccd8701908e20725b6c9f31c321b952da1eee31
parent955cd29bbce98dc582b9909e7018ddab95601512
parent575b3ee0d53c806321c58f203f64bb49f2d87190
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-19-17-34-09

Conflicts:
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Core/BAO/CustomQuery.php
CRM/Core/BAO/Mapping.php
CRM/Member/Form/Membership.php
bower.json
sql/civicrm_generated.mysql
templates/CRM/Contribute/Form/Contribution/Main.tpl
xml/version.xml
36 files changed:
CRM/Admin/Form/ScheduleReminders.php
CRM/Case/Form/Activity.php
CRM/Contact/BAO/Contact.php
CRM/Contact/BAO/Query.php
CRM/Contact/BAO/Relationship.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Contribute/Form/Contribution/Main.php
CRM/Contribute/Form/ContributionPage/Custom.php
CRM/Contribute/Import/Parser/Contribution.php
CRM/Core/BAO/ConfigSetting.php
CRM/Core/BAO/CustomField.php
CRM/Core/BAO/Mapping.php
CRM/Core/DAO.php
CRM/Core/Payment.php
CRM/Core/Payment/AuthorizeNetIPN.php
CRM/Core/xml/Menu/Admin.xml
CRM/Event/Page/ManageEvent.php
CRM/Export/BAO/Export.php
CRM/Logging/Schema.php
CRM/Member/Form/Membership.php
CRM/Price/BAO/PriceSet.php
CRM/Utils/System.php
Civi/API/Subscriber/ChainSubscriber.php
ang/crmUi.js
api/v3/utils.php
bower.json
composer.json
settings/Core.setting.php
templates/CRM/Contribute/Form/Contribution/Main.tpl
templates/CRM/Member/Form/Membership.tpl
tests/phpunit/CiviTest/CiviUnitTestCase.php
tests/phpunit/WebTest/Event/AddEventTest.php
tests/phpunit/api/v3/SyntaxConformanceTest.php
tests/phpunit/api/v3/UtilsTest.php