vcs.fsf.org Git - civicrm-core.git/commit

author	Kurund Jalmi <kurund@civicrm.org>
	Tue, 21 May 2013 18:40:33 +0000 (14:40 -0400)
committer	Kurund Jalmi <kurund@civicrm.org>
	Tue, 21 May 2013 18:40:33 +0000 (14:40 -0400)
commit	d0f466d1aec3f5f2f9f24635470a7df8d15b9b11
tree	30bf9672feb4ad546410c5fee4a37ceecc0803e2	tree \| snapshot (zip tar.gz)
parent	6405aa4da337dae1792aae9ab08f9fa5e05081bf	commit \| diff
parent	d81da109af120b853cacde60ddeebb8e3bdda67c	commit \| diff

Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-21-13-15-18

Conflicts:
.gitignore
CRM/Financial/Form/FinancialAccount.php
CRM/Financial/Form/FinancialTypeAccount.php
CRM/Grant/Controller/PaymentSearch.php
CRM/Grant/Page/GrantProgram.php
CRM/Grant/Page/Payment.php
CRM/Grant/Selector/PaymentSearch.php
CRM/Report/Form/Event/ParticipantListCount.php
CRM/Utils/Migrate/Export.php
CRM/Utils/Migrate/ExportJSON.php
sql/civicrm_generated.mysql
templates/CRM/Admin/Form/Preferences/Display.tpl
templates/CRM/Financial/Form/FinancialTypeAccount.tpl
templates/CRM/Grant/Form/Search.tpl

31 files changed:

CRM/Activity/BAO/Query.php	diff1 \|	diff2 \|	blob \| history
CRM/Campaign/BAO/Survey.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/BAO/Contribution.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/BAO/Query.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/ManageEvent/EventInfo.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/Participant.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/Registration/Confirm.php	diff1 \|	diff2 \|	blob \| history
CRM/Financial/BAO/FinancialType.php	diff1 \|	diff2 \|	blob \| history
CRM/Financial/BAO/FinancialTypeAccount.php	diff1 \|	diff2 \|	blob \| history
CRM/Financial/Form/FinancialAccount.php	diff1 \|	diff2 \|	blob \| history
CRM/Financial/Form/FinancialTypeAccount.php	diff1 \|	diff2 \|	blob \| history
CRM/Financial/Page/FinancialTypeAccount.php	diff1 \|	diff2 \|	blob \| history
CRM/Friend/BAO/Friend.php	diff1 \|	diff2 \|	blob \| history
CRM/Mailing/BAO/Mailing.php	diff1 \|	diff2 \|	blob \| history
CRM/Report/Form/Contribute/History.php	diff1 \|	diff2 \|	blob \| history
CRM/Report/Form/Contribute/Summary.php	diff1 \|	diff2 \|	blob \| history
CRM/Report/Form/Event/Income.php	diff1 \|	diff2 \|	blob \| history
CRM/Report/Form/Event/ParticipantListCount.php	diff1 \|	diff2 \|	blob \| history
CRM/Utils/Migrate/ExportJSON.php	diff1 \|	diff2 \|	blob \| history
CRM/Utils/Migrate/ImportJSON.php	diff1 \|	diff2 \|	blob \| history
CRM/Utils/System.php	diff1 \|	diff2 \|	blob \| history
api/v3/Contribution.php	diff1 \|	diff2 \|	blob \| history
sql/civicrm_generated.mysql	diff1 \|	diff2 \|	blob \| history
templates/CRM/Financial/Form/FinancialTypeAccount.tpl	diff1 \|	diff2 \|	blob \| history
templates/CRM/Grant/Form/Search.tpl	diff1 \|	diff2 \|	blob \| history
templates/CRM/Member/Form/MembershipType.tpl	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CiviTest/CiviSeleniumTestCase.php	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CiviTest/CiviUnitTestCase.php	diff1 \|	diff2 \|	blob \| history
tests/phpunit/api/v3/ContributionTest.php	diff1 \|	diff2 \|	blob \| history
xml/templates/civicrm_data.tpl	diff1 \|	diff2 \|	blob \| history
xml/templates/civicrm_navigation.tpl	diff1 \|	diff2 \|	blob \| history

RSS Atom

CRM/Activity/BAO/Query.php	diff1 \|	diff2 \|	blob \| history
CRM/Campaign/BAO/Survey.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/BAO/Contribution.php	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/BAO/Query.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/ManageEvent/EventInfo.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/Participant.php	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/Registration/Confirm.php	diff1 \|	diff2 \|	blob \| history
CRM/Financial/BAO/FinancialType.php	diff1 \|	diff2 \|	blob \| history
CRM/Financial/BAO/FinancialTypeAccount.php	diff1 \|	diff2 \|	blob \| history
CRM/Financial/Form/FinancialAccount.php	diff1 \|	diff2 \|	blob \| history
CRM/Financial/Form/FinancialTypeAccount.php	diff1 \|	diff2 \|	blob \| history
CRM/Financial/Page/FinancialTypeAccount.php	diff1 \|	diff2 \|	blob \| history
CRM/Friend/BAO/Friend.php	diff1 \|	diff2 \|	blob \| history
CRM/Mailing/BAO/Mailing.php	diff1 \|	diff2 \|	blob \| history
CRM/Report/Form/Contribute/History.php	diff1 \|	diff2 \|	blob \| history
CRM/Report/Form/Contribute/Summary.php	diff1 \|	diff2 \|	blob \| history
CRM/Report/Form/Event/Income.php	diff1 \|	diff2 \|	blob \| history
CRM/Report/Form/Event/ParticipantListCount.php	diff1 \|	diff2 \|	blob \| history
CRM/Utils/Migrate/ExportJSON.php	diff1 \|	diff2 \|	blob \| history
CRM/Utils/Migrate/ImportJSON.php	diff1 \|	diff2 \|	blob \| history
CRM/Utils/System.php	diff1 \|	diff2 \|	blob \| history
api/v3/Contribution.php	diff1 \|	diff2 \|	blob \| history
sql/civicrm_generated.mysql	diff1 \|	diff2 \|	blob \| history
templates/CRM/Financial/Form/FinancialTypeAccount.tpl	diff1 \|	diff2 \|	blob \| history
templates/CRM/Grant/Form/Search.tpl	diff1 \|	diff2 \|	blob \| history
templates/CRM/Member/Form/MembershipType.tpl	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CiviTest/CiviSeleniumTestCase.php	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CiviTest/CiviUnitTestCase.php	diff1 \|	diff2 \|	blob \| history
tests/phpunit/api/v3/ContributionTest.php	diff1 \|	diff2 \|	blob \| history
xml/templates/civicrm_data.tpl	diff1 \|	diff2 \|	blob \| history
xml/templates/civicrm_navigation.tpl	diff1 \|	diff2 \|	blob \| history