vcs.fsf.org Git - civicrm-core.git/commit - bin/ContributionProcessor.php

author	dpradeep <pradeep.dorugade@webaccess.co.in>
	Thu, 7 Aug 2014 12:59:53 +0000 (18:29 +0530)
committer	dpradeep <pradeep.dorugade@webaccess.co.in>
	Thu, 7 Aug 2014 12:59:53 +0000 (18:29 +0530)
commit	24f8127938dec80960d388e50fd5b89aa450b494
tree	29f11d0251a0dc02fff8ab1471523de8afd12751	tree \| snapshot (zip tar.gz)
parent	cb895842170009ec7d7bb8864bd9b3a973d92033	commit \| diff
parent	83a56465a252a120101493a1ec2a3ebe2efdcc61	commit \| diff

Merge remote branch 'canonical/master' into merge-forward

Conflicts:
CRM/Contribute/BAO/ContributionPage.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Member/BAO/Membership.php
CRM/Price/BAO/LineItem.php
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
css/civicrm.css
templates/CRM/Price/Page/LineItem.tpl

42 files changed:

CRM/Admin/Form/Preferences/Display.php	diff1 \|	diff2 \|	blob \| history
CRM/Contact/Page/View/UserDashBoard.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/BAO/Contribution.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/BAO/Contribution/Utils.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/BAO/ContributionPage.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/Contribution.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/Contribution/Confirm.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/Contribution/Main.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/ContributionBase.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/ContributionPage/Amount.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/ContributionView.php	diff1 \|	diff2 \|	blob \| history
CRM/Core/BAO/MessageTemplate.php	diff1 \|	diff2 \|	blob \| history
CRM/Core/Payment/ProcessorForm.php	diff1 \|	diff2 \|	blob \| history
CRM/Core/PseudoConstant.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/BAO/Event.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/ManageEvent/Fee.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/Participant.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/Registration.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/Registration/Confirm.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/Registration/Register.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Page/EventInfo.php	diff1 \|	diff2 \|	blob \| history
CRM/Financial/BAO/ExportFormat/CSV.php	diff1 \|	diff2 \|	blob \| history
CRM/Financial/Page/AJAX.php	diff1 \|	diff2 \|	blob \| history
CRM/Member/BAO/Membership.php	diff1 \|	diff2 \|	blob \| history
CRM/Member/Form/Membership.php	diff1 \|	diff2 \|	blob \| history
CRM/Price/BAO/LineItem.php	diff1 \|	diff2 \|	blob \| history
CRM/Price/BAO/PriceField.php	diff1 \|	diff2 \|	blob \| history
CRM/Price/BAO/PriceSet.php	diff1 \|	diff2 \|	blob \| history
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl	diff1 \|	diff2 \|	blob \| history
css/civicrm.css	diff1 \|	diff2 \|	blob \| history
templates/CRM/Contribute/Form/Contribution.tpl	diff1 \|	diff2 \|	blob \| history
templates/CRM/Contribute/Form/Contribution/Main.tpl	diff1 \|	diff2 \|	blob \| history
templates/CRM/Event/Form/Registration/Register.tpl	diff1 \|	diff2 \|	blob \| history
templates/CRM/Event/Page/EventInfo.tpl	diff1 \|	diff2 \|	blob \| history
templates/CRM/Member/Form/Membership.tpl	diff1 \|	diff2 \|	blob \| history
templates/CRM/Price/Page/LineItem.tpl	diff1 \|	diff2 \|	blob \| history
xml/schema/Price/LineItem.xml	diff1 \|	diff2 \|	blob \| history
xml/templates/civicrm_data.tpl	diff1 \|	diff2 \|	blob \| history
xml/templates/civicrm_msg_template.tpl	diff1 \|	diff2 \|	blob \| history
xml/templates/civicrm_navigation.tpl	diff1 \|	diff2 \|	blob \| history
xml/templates/message_templates/membership_offline_receipt_html.tpl	diff1 \|	diff2 \|	blob \| history
xml/templates/message_templates/membership_offline_receipt_text.tpl	diff1 \|	diff2 \|	blob \| history

RSS Atom

CRM/Admin/Form/Preferences/Display.php	diff1 \|	diff2 \|	blob \| history
CRM/Contact/Page/View/UserDashBoard.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/BAO/Contribution.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/BAO/Contribution/Utils.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/BAO/ContributionPage.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/Contribution.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/Contribution/Confirm.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/Contribution/Main.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/ContributionBase.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/ContributionPage/Amount.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/ContributionView.php	diff1 \|	diff2 \|	blob \| history
CRM/Core/BAO/MessageTemplate.php	diff1 \|	diff2 \|	blob \| history
CRM/Core/Payment/ProcessorForm.php	diff1 \|	diff2 \|	blob \| history
CRM/Core/PseudoConstant.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/BAO/Event.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/ManageEvent/Fee.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/Participant.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/Registration.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/Registration/Confirm.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/Registration/Register.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Page/EventInfo.php	diff1 \|	diff2 \|	blob \| history
CRM/Financial/BAO/ExportFormat/CSV.php	diff1 \|	diff2 \|	blob \| history
CRM/Financial/Page/AJAX.php	diff1 \|	diff2 \|	blob \| history
CRM/Member/BAO/Membership.php	diff1 \|	diff2 \|	blob \| history
CRM/Member/Form/Membership.php	diff1 \|	diff2 \|	blob \| history
CRM/Price/BAO/LineItem.php	diff1 \|	diff2 \|	blob \| history
CRM/Price/BAO/PriceField.php	diff1 \|	diff2 \|	blob \| history
CRM/Price/BAO/PriceSet.php	diff1 \|	diff2 \|	blob \| history
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl	diff1 \|	diff2 \|	blob \| history
css/civicrm.css	diff1 \|	diff2 \|	blob \| history
templates/CRM/Contribute/Form/Contribution.tpl	diff1 \|	diff2 \|	blob \| history
templates/CRM/Contribute/Form/Contribution/Main.tpl	diff1 \|	diff2 \|	blob \| history
templates/CRM/Event/Form/Registration/Register.tpl	diff1 \|	diff2 \|	blob \| history
templates/CRM/Event/Page/EventInfo.tpl	diff1 \|	diff2 \|	blob \| history
templates/CRM/Member/Form/Membership.tpl	diff1 \|	diff2 \|	blob \| history
templates/CRM/Price/Page/LineItem.tpl	diff1 \|	diff2 \|	blob \| history
xml/schema/Price/LineItem.xml	diff1 \|	diff2 \|	blob \| history
xml/templates/civicrm_data.tpl	diff1 \|	diff2 \|	blob \| history
xml/templates/civicrm_msg_template.tpl	diff1 \|	diff2 \|	blob \| history
xml/templates/civicrm_navigation.tpl	diff1 \|	diff2 \|	blob \| history
xml/templates/message_templates/membership_offline_receipt_html.tpl	diff1 \|	diff2 \|	blob \| history
xml/templates/message_templates/membership_offline_receipt_text.tpl	diff1 \|	diff2 \|	blob \| history