Eileen McNaughton [Tue, 7 Apr 2015 08:19:18 +0000 (20:19 +1200)]
CRM-16247 Move activity creation until after transaction is committed
It turns out the activity_contact table is somewhat susceptible to deadlocks & the rollback results in
contributions being erased from the DB - especially in the case of IPNs
colemanw [Fri, 3 Apr 2015 01:50:47 +0000 (21:50 -0400)]
Merge pull request #5526 from mlutfy/4.6-crm6131
CRM-6131: Allow to override the dedupe rule used when submitting a form (useful for buildForm hooks).
colemanw [Fri, 3 Apr 2015 01:36:07 +0000 (21:36 -0400)]
Merge pull request #5548 from rohankatkar/upgradeFix
Upgrade fix for 4.6.0 failure
Dave Greenberg [Thu, 2 Apr 2015 23:36:54 +0000 (16:36 -0700)]
Merge pull request #5551 from davecivicrm/contributors46
Update CONTRIBUTORS.txt for 4.6 stable.
Dave Greenberg [Thu, 2 Apr 2015 23:34:55 +0000 (16:34 -0700)]
Update CONTRIBUTORS.txt for 4.6 stable.
colemanw [Thu, 2 Apr 2015 23:22:59 +0000 (19:22 -0400)]
Merge pull request #5550 from civicrm/4.5
Merge branch 4.5 into 4.6
colemanw [Thu, 2 Apr 2015 21:41:27 +0000 (17:41 -0400)]
Merge pull request #5549 from colemanw/CRM-16220
CRM-16220 - Allow non-admins to get & create tags
Coleman Watts [Thu, 2 Apr 2015 15:36:31 +0000 (11:36 -0400)]
CRM-16220 - Allow non-admins to get & create tags
Coleman Watts [Thu, 2 Apr 2015 15:18:00 +0000 (11:18 -0400)]
Webtest comment fix
Kurund Jalmi [Thu, 2 Apr 2015 13:31:42 +0000 (19:01 +0530)]
Merge pull request #5544 from rohankatkar/CRM-16216
Error on submitting New Individual form using "Use another contact's address" option
Kurund Jalmi [Thu, 2 Apr 2015 13:31:16 +0000 (19:01 +0530)]
Merge pull request #5543 from atif-shaikh/CRM-16055WebtestFix
CRM-16055 and WebtestFix
Kurund Jalmi [Thu, 2 Apr 2015 13:30:48 +0000 (19:00 +0530)]
Merge pull request #5542 from atif-shaikh/WebtestFix
WebtestFix
Kurund Jalmi [Thu, 2 Apr 2015 13:30:36 +0000 (19:00 +0530)]
Merge pull request #5545 from rohankatkar/webtest_4.6
Webtest fix for mailing
Kurund Jalmi [Thu, 2 Apr 2015 13:30:24 +0000 (19:00 +0530)]
Merge pull request #5546 from jitendrapurohit/webtestfixes46
webtest fixes 46
Web Access [Thu, 2 Apr 2015 13:22:14 +0000 (18:52 +0530)]
Upgrade Fix
Web Access [Thu, 2 Apr 2015 11:11:02 +0000 (16:41 +0530)]
Webtest fix for mailing
jitendrapurohit [Thu, 2 Apr 2015 11:07:38 +0000 (16:37 +0530)]
webtest fixes 46
Web Access [Thu, 2 Apr 2015 10:29:30 +0000 (15:59 +0530)]
Fix for CRM-16216
atif-shaikh [Thu, 2 Apr 2015 09:58:09 +0000 (15:28 +0530)]
CRM-16055WebtestFix
atif-shaikh [Thu, 2 Apr 2015 09:52:32 +0000 (15:22 +0530)]
WebtestFix
Kurund Jalmi [Thu, 2 Apr 2015 08:56:59 +0000 (14:26 +0530)]
Merge pull request #5534 from davecivicrm/CRM-15197
CRM-15197 - WebTest_Member_InheritedMembershipTest fixes.
Kurund Jalmi [Thu, 2 Apr 2015 08:55:54 +0000 (14:25 +0530)]
Merge pull request #5541 from totten/4.6-webtest-rest
WebTest_Utils_RestTest - Directly manage adminApiKey
Tim Otten [Thu, 2 Apr 2015 03:26:12 +0000 (20:26 -0700)]
Merge pull request #5537 from totten/4.5-httpclient
CRM_Utils_HttpClientTest - Fix example URL
Tim Otten [Thu, 2 Apr 2015 03:11:19 +0000 (20:11 -0700)]
WebTest_Utils_RestTest - Directly manage adminApiKey
Previously, it was the responsibility of the dev on the local machine to
manuall update DB and set an API key for an example admin user. This is now
done automatically.
Tim Otten [Thu, 2 Apr 2015 03:11:09 +0000 (20:11 -0700)]
CRM-11889 - CiviSeleniumTestCase - Use browser session for rest_civicrm_api. Add webtestGetLoggedInContact & assertAPISuccess.
colemanw [Thu, 2 Apr 2015 02:00:29 +0000 (22:00 -0400)]
Merge pull request #5531 from colemanw/CRM-16208
CRM-16208 - Clarify repeating event search and fix fatal error
colemanw [Thu, 2 Apr 2015 01:59:53 +0000 (21:59 -0400)]
Merge pull request #5538 from colemanw/CRM-16214
CRM-16214 - Set default value on option_value form
colemanw [Thu, 2 Apr 2015 01:59:33 +0000 (21:59 -0400)]
Merge pull request #5540 from colemanw/icon
Fix icon path for mailing recipients widget
Coleman Watts [Thu, 2 Apr 2015 01:58:38 +0000 (21:58 -0400)]
Fix icon path for mailing recipients widget
colemanw [Thu, 2 Apr 2015 01:52:07 +0000 (21:52 -0400)]
Merge pull request #5539 from colemanw/Mailing
Mailing webtest fixes
Coleman Watts [Thu, 2 Apr 2015 01:49:32 +0000 (21:49 -0400)]
Mailing webtest fixes
colemanw [Thu, 2 Apr 2015 00:16:35 +0000 (20:16 -0400)]
Merge pull request #5535 from colemanw/CRM-16081
CRM-16081 - Fix unsubscribe error if groups are empty
Coleman Watts [Thu, 2 Apr 2015 00:09:50 +0000 (20:09 -0400)]
CRM-16214 - Set default value on option_value form
Tim Otten [Wed, 1 Apr 2015 23:48:13 +0000 (16:48 -0700)]
CRM_Utils_HttpClientTest - Fix example URL
Coleman Watts [Wed, 1 Apr 2015 23:15:28 +0000 (19:15 -0400)]
CRM-16081 - Fix unsubscribe error if groups are empty
Dave Greenberg [Wed, 1 Apr 2015 22:41:38 +0000 (15:41 -0700)]
CRM-15197 - WebTest_Member_InheritedMembershipTest fixes.
----------------------------------------
* CRM-15197: Various Webtest Fixes
https://issues.civicrm.org/jira/browse/CRM-15197
Coleman Watts [Wed, 1 Apr 2015 16:21:10 +0000 (12:21 -0400)]
Fix option handling in SyntaxConformanceTest
Kurund Jalmi [Wed, 1 Apr 2015 11:29:26 +0000 (16:59 +0530)]
Merge pull request #5504 from cividesk/CRM-14974_2-4.6
CRM-14974 Fixed php notice; array_diff does not support multidimensional...
Kurund Jalmi [Wed, 1 Apr 2015 11:11:37 +0000 (16:41 +0530)]
Merge pull request #5490 from rohankatkar/CRM-16170
Recurring Contributions always displayed in default currency.
Kurund Jalmi [Wed, 1 Apr 2015 10:36:05 +0000 (16:06 +0530)]
Merge pull request #5532 from davecivicrm/CRM-16206
CRM-16206 - Revised upgrade success message.
Web Access [Wed, 1 Apr 2015 09:10:45 +0000 (14:40 +0530)]
Fix for currency format on exporting contribution detail report
Web Access [Tue, 31 Mar 2015 10:21:03 +0000 (15:51 +0530)]
Minor changes for CRM-16170
Web Access [Fri, 27 Mar 2015 13:14:05 +0000 (18:44 +0530)]
Additional changes for CRM-16170
Web Access [Thu, 26 Mar 2015 13:05:20 +0000 (18:35 +0530)]
Fix for CRM-16170
Kurund Jalmi [Wed, 1 Apr 2015 08:59:24 +0000 (14:29 +0530)]
Merge pull request #5529 from pradpnayak/CRM-13793
-- CRM-13793, removed cruft for website type id for profiles
Kurund Jalmi [Wed, 1 Apr 2015 08:45:35 +0000 (14:15 +0530)]
Merge pull request #5524 from atif-shaikh/CRM-16087
CRM-16087 - Changes in relationship status are not invoking updates to m...
Kurund Jalmi [Wed, 1 Apr 2015 08:17:16 +0000 (13:47 +0530)]
Merge pull request #5516 from monishdeb/4.6Webtests
Webtest for new AB Test Mailing
atif-shaikh [Wed, 1 Apr 2015 07:13:28 +0000 (12:43 +0530)]
CRM-16087 - Relation Api test break fix
----------------------------------------
* CRM-16087: Changes in relationship status are not invoking updates to membership status
https://issues.civicrm.org/jira/browse/CRM-16087
Dave Greenberg [Wed, 1 Apr 2015 03:22:35 +0000 (20:22 -0700)]
CRM-16206 - Revised upgrade success message.
----------------------------------------
* CRM-16206: Revised Upgrade Success Message
https://issues.civicrm.org/jira/browse/CRM-16206
Coleman Watts [Wed, 1 Apr 2015 02:10:13 +0000 (22:10 -0400)]
CRM-16208 - Clarify repeating event search and fix fatal error
Dave Greenberg [Wed, 1 Apr 2015 00:06:50 +0000 (17:06 -0700)]
Merge pull request #5530 from davecivicrm/fixGenerated
Fix bad copy of civicrm_generated.mysql.
Dave Greenberg [Tue, 31 Mar 2015 22:39:26 +0000 (15:39 -0700)]
Fix bad copy of civicrm_generated.mysql.
Dave Greenberg [Tue, 31 Mar 2015 22:25:27 +0000 (15:25 -0700)]
Merge pull request #5483 from pradpnayak/CRM-15848
-- CRM-15848, removed code to update financial_trxn table and create a n...
Dave Greenberg [Tue, 31 Mar 2015 22:08:34 +0000 (15:08 -0700)]
Merge pull request #5528 from pradpnayak/CRM-16198
Crm 16198
Dave Greenberg [Tue, 31 Mar 2015 21:54:26 +0000 (14:54 -0700)]
Merge pull request #5527 from agh1/joomlaxml-permission-desc
CRM-16201 permissions: fix processing of descriptions for Joomla
Pradeep Nayak [Tue, 31 Mar 2015 20:32:31 +0000 (02:02 +0530)]
-- CRM-13793, removed cruft for website type id for profiles
----------------------------------------
* CRM-13793: Miscellaneous code cleanups
https://issues.civicrm.org/jira/browse/CRM-13793
Pradeep Nayak [Tue, 31 Mar 2015 20:24:15 +0000 (01:54 +0530)]
-- CRM-16198, added aliaa for payment instrument in api
----------------------------------------
* CRM-16198: Financial Type search fails when searching Contributions using Search builder
https://issues.civicrm.org/jira/browse/CRM-16198
Andrew Hunt [Tue, 31 Mar 2015 20:21:51 +0000 (16:21 -0400)]
CRM-16201 permissions: fix processing of descriptions for Joomla
----------------------------------------
* CRM-16201: Permission descriptions and translation
https://issues.civicrm.org/jira/browse/CRM-16201
Dave Greenberg [Tue, 31 Mar 2015 20:13:48 +0000 (13:13 -0700)]
Merge pull request #5525 from agh1/perm-desc-2
CRM-16201 Descriptions and translation for permissions
Pradeep Nayak [Tue, 31 Mar 2015 20:05:14 +0000 (01:35 +0530)]
--CRM-16198, added blank line
Pradeep Nayak [Tue, 31 Mar 2015 20:04:11 +0000 (01:34 +0530)]
CRM-16198, removed white space
----------------------------------------
* CRM-16198: Financial Type search fails when searching Contributions using Search builder
https://issues.civicrm.org/jira/browse/CRM-16198
Pradeep Nayak [Tue, 31 Mar 2015 18:12:46 +0000 (23:42 +0530)]
--removed white space, CRM-15848
----------------------------------------
* CRM-15848: Civiaccounts inconsistent with spec when adding partial event payment
https://issues.civicrm.org/jira/browse/CRM-15848
Mathieu Lutfy [Tue, 31 Mar 2015 18:02:01 +0000 (14:02 -0400)]
CRM-6131: Allow to override the dedupe rule used when submitting a form (useful for buildForm hooks).
Pradeep Nayak [Tue, 31 Mar 2015 18:01:58 +0000 (23:31 +0530)]
--CRM-15848, fixed code for regression caused by
77e18ec7
Andrew Hunt [Tue, 31 Mar 2015 16:11:35 +0000 (12:11 -0400)]
whitespace
Andrew Hunt [Mon, 30 Mar 2015 19:01:13 +0000 (15:01 -0400)]
CRM-16201 permissions - add permission descriptions to Joomla distmaker
Andrew Hunt [Mon, 30 Mar 2015 16:37:05 +0000 (12:37 -0400)]
CRM-16201 display permission descriptions in WordPress
Andrew Hunt [Tue, 31 Mar 2015 15:06:33 +0000 (11:06 -0400)]
CRM-16201 permissions: add descriptions and make translatable
Pradeep Nayak [Mon, 30 Mar 2015 07:34:28 +0000 (13:04 +0530)]
--CRM-16198, fix for search builder
Pradeep Nayak [Tue, 31 Mar 2015 14:07:46 +0000 (19:37 +0530)]
-- CRM-15848, fixed code to point civicrm_financial_item to latest financial trxn
----------------------------------------
* CRM-15848: Civiaccounts inconsistent with spec when adding partial event payment
https://issues.civicrm.org/jira/browse/CRM-15848
Pradeep Nayak [Wed, 25 Mar 2015 19:01:15 +0000 (00:31 +0530)]
--CRM-15848, removed white spaces
Pradeep Nayak [Wed, 25 Mar 2015 18:16:20 +0000 (23:46 +0530)]
--CRM-15848, modified code to use latest financial_trxn_id in civicrm_entity_financial_trxn for entity civicrm_financial_item
Pradeep Nayak [Wed, 25 Mar 2015 17:33:04 +0000 (23:03 +0530)]
--CRM-15848, removed white space
Pradeep Nayak [Wed, 25 Mar 2015 15:33:35 +0000 (21:03 +0530)]
-- CRM-15848, removed code to update financial_trxn table and create a new entry
----------------------------------------
* CRM-15848: Civiaccounts inconsistent with spec when adding partial event payment
https://issues.civicrm.org/jira/browse/CRM-15848
atif-shaikh [Tue, 31 Mar 2015 13:27:25 +0000 (18:57 +0530)]
CRM-16087 Failing test fix
----------------------------------------
* CRM-16087: Changes in relationship status are not invoking updates to membership status
https://issues.civicrm.org/jira/browse/CRM-16087
colemanw [Tue, 31 Mar 2015 13:20:32 +0000 (09:20 -0400)]
Merge pull request #5523 from eileenmcnaughton/4.6
minor phpcs fixes
atif-shaikh [Tue, 31 Mar 2015 12:13:10 +0000 (17:43 +0530)]
CRM-16087 - Changes in relationship status are not invoking updates to membership status
https://issues.civicrm.org/jira/browse/CRM-16087
Eileen McNaughton [Tue, 31 Mar 2015 04:33:08 +0000 (17:33 +1300)]
minor phpcs fixes
Tim Otten [Mon, 30 Mar 2015 22:03:04 +0000 (15:03 -0700)]
Merge pull request #5499 from colemanw/CRM-16155
CRM-16155 - Improve scalability of CiviMail UI
Dave Greenberg [Mon, 30 Mar 2015 21:16:32 +0000 (14:16 -0700)]
Merge pull request #5514 from pradpnayak/CRM-16197
-- CRM-16197, fixed onbehalf profile code to use contact sub type
colemanw [Mon, 30 Mar 2015 14:24:26 +0000 (10:24 -0400)]
Merge pull request #5508 from colemanw/CRM-16194
CRM-16194 - Remove inappropriate params from api query object
monishdeb [Mon, 30 Mar 2015 13:43:07 +0000 (19:13 +0530)]
formatting fixes
monishdeb [Mon, 30 Mar 2015 12:53:21 +0000 (18:23 +0530)]
formatting fixes
monishdeb [Mon, 30 Mar 2015 12:45:46 +0000 (18:15 +0530)]
formatting fixes
Eileen McNaughton [Mon, 30 Mar 2015 02:35:48 +0000 (15:35 +1300)]
Merge pull request #5488 from eileenmcnaughton/CRM-16184
CRM-16184 CiviReport template - clarify accordians for fields & filters & remove dependence
colemanw [Mon, 30 Mar 2015 02:01:45 +0000 (22:01 -0400)]
Merge pull request #5518 from colemanw/css
Css fix
Coleman Watts [Mon, 30 Mar 2015 02:01:16 +0000 (22:01 -0400)]
Css fix
Coleman Watts [Mon, 30 Mar 2015 00:00:12 +0000 (20:00 -0400)]
Merge branch 4.5 into 4.6
Coleman Watts [Sun, 29 Mar 2015 23:56:49 +0000 (19:56 -0400)]
Fix escaped quotes in translated string
colemanw [Sun, 29 Mar 2015 23:56:08 +0000 (19:56 -0400)]
Merge pull request #5517 from colemanw/menu
Fix interaction with quicksearch when popup is open
Coleman Watts [Sun, 29 Mar 2015 23:22:03 +0000 (19:22 -0400)]
Fix interaction with quicksearch when popup is open
colemanw [Sun, 29 Mar 2015 23:20:55 +0000 (19:20 -0400)]
Merge pull request #5509 from colemanw/CRM-16148
CRM-16148 - Translate untranslated option labels
monishdeb [Sun, 29 Mar 2015 22:20:05 +0000 (03:50 +0530)]
Webtest for new AB Test Mailing
pratikshad [Fri, 27 Mar 2015 13:18:05 +0000 (18:48 +0530)]
../tests/phpunit/WebTest/Mailing/ABMailingTest.php
Pradeep Nayak [Sun, 29 Mar 2015 20:01:59 +0000 (01:31 +0530)]
-- CRM-16197, fixed onbehalf profile code to use contact sub type
----------------------------------------
* CRM-16197: OnBehalf profile doesn't respect contact sub type
https://issues.civicrm.org/jira/browse/CRM-16197
sunil [Sat, 28 Mar 2015 06:46:42 +0000 (12:16 +0530)]
added empty line before closing brace for the class
Coleman Watts [Sat, 28 Mar 2015 01:06:12 +0000 (21:06 -0400)]
CRM-16148 - Translate untranslated option labels
Coleman Watts [Sat, 28 Mar 2015 00:55:23 +0000 (20:55 -0400)]
CRM-16194 - Remove inappropriate params from api query object
Dave Greenberg [Sat, 28 Mar 2015 00:24:00 +0000 (17:24 -0700)]
Merge pull request #5507 from relldoesphp/CRM-16107-New
CRM-16107 fixes blank error with new payment and balance fields on participant report
Dave Greenberg [Fri, 27 Mar 2015 22:16:36 +0000 (15:16 -0700)]
Merge pull request #5453 from colemanw/CRM-16148
CRM-16148 - Show option names instead of ids in api explorer
projects / civicrm-core.git / log