HomePhabricator

Merge branch 'master' into deployment

Authored by Ejegg.

Description

Merge branch 'master' into deployment

Including some mistaken 4.6 commits and their reversion commits.

70588cc Set no_thank_you for Major Gifts importer
ef9b4bd 4.6 upgrade preparation, replace contribution_type with financial_type
df748bf T99836 CiviCRM 4.6 : add otion value for tag_used_for on install
d1f85ad T99836 add option value for tag_used for upgrading installs too.
0495eab T99836 remove code to add prevnext indexes
fc81f03 T99836 Civi46 remove call to pseudoconstant:locationType
20fa24d T99836 Civi46 remove call to psuedoconstnat:ContributionType
543255c T99836 Civi46 magic var for weight from api call
df37a84 T99836 Civi46 : change submodule version to 4.6.9
bb07ec2 T99836 Civi46: change contributionType to financialType
d7d3409 Revert commits on wrong branch
cb6248e Use Civi method to cancel recurring via qc
7ff9bcf Revert "4.6 upgrade preparation, replace contribution_type with financial_type"
795d4b6 Import refund data from CSV
b769102 Update drupal and ctools

Change-Id: Icca423727a542e5d3414254aed58cdfa1012e191

Merged Changes

CommitAuthorDetailsCommitted
b769102f1e84Ejegg
Update drupal and ctools 
Sep 24 2015
795d4b6df437Ejegg
Import refund data from CSV 
Sep 24 2015
7ff9bcf2c2e8awight
Revert "4.6 upgrade preparation, replace contribution_type with financial_type" 
Sep 24 2015
cb6248e1a8ddEjegg/awight
Use Civi method to cancel recurring via qc 
Sep 23 2015
d7d3409ec84cEjegg
Revert commits on wrong branch 
Sep 22 2015
bb07ec231879Eileenmcnaughton/awight
T99836 Civi46: change contributionType to financialType 
Sep 22 2015
df37a842daf6Eileenmcnaughton/awight
T99836 Civi46 : change submodule version to 4.6.9 
Sep 22 2015
543255cc2be7Eileenmcnaughton/awight
T99836 Civi46 magic var for weight from api call 
Sep 22 2015
20fa24d6daf7Eileenmcnaughton/awight
T99836 Civi46 remove call to psuedoconstnat:ContributionType 
Sep 22 2015
fc81f03bbc3bEileenmcnaughton/awight
T99836 Civi46 remove call to pseudoconstant:locationType 
Sep 22 2015
0495eab80b28Eileenmcnaughton/awight
T99836 remove code to add prevnext indexes 
Sep 22 2015
d1f85adec469Eileenmcnaughton/awight
T99836 add option value for tag_used for upgrading installs too. 
Sep 22 2015
df748bf5b4a2Eileenmcnaughton/awight
T99836 CiviCRM 4.6 : add otion value for tag_used_for on install 
Sep 22 2015
ef9b4bde2a75Eileenmcnaughton/awight
4.6 upgrade preparation, replace contribution_type with financial_type 
Sep 22 2015
70588cc03829XenoRyet
Set no_thank_you for Major Gifts importer 
Sep 22 2015