Dave Greenberg [Tue, 16 Sep 2014 00:11:25 +0000 (20:11 -0400)]
CRM-15197 - Fix for WebTest_Contribute_UpdateContributionTest::testDeletePremium
----------------------------------------
* CRM-15197:
https://issues.civicrm.org/jira/browse/CRM-15197
Dave Greenberg [Tue, 16 Sep 2014 00:07:43 +0000 (20:07 -0400)]
Merge pull request #4137 from davecivicrm/CRM-15197e
CRM-15197 - Fix for WebTest_Contribute_UpdateContributionTest::testChang...
Dave Greenberg [Tue, 16 Sep 2014 00:06:58 +0000 (20:06 -0400)]
CRM-15197 - Fix for WebTest_Contribute_UpdateContributionTest::testChangePremium
----------------------------------------
* CRM-15197:
https://issues.civicrm.org/jira/browse/CRM-15197
Dave Greenberg [Mon, 15 Sep 2014 21:06:13 +0000 (17:06 -0400)]
Merge pull request #4136 from mepps/update-contributions-webtest-payment-processor
CRM-15197 Fixed testChangePaymentProcessor in UpdateContributions WebTes...
Maggie [Mon, 15 Sep 2014 18:04:25 +0000 (14:04 -0400)]
CRM-15197 Fixed testChangePaymentProcessor in UpdateContributions WebTest
Dave Greenberg [Mon, 15 Sep 2014 17:21:45 +0000 (13:21 -0400)]
Merge pull request #4135 from kurund/pcp-listing
js error fixes while sorting
kurund [Mon, 15 Sep 2014 16:46:27 +0000 (22:16 +0530)]
js error fixes while sorting
Yashodha Chaku [Mon, 15 Sep 2014 14:06:11 +0000 (19:36 +0530)]
Merge pull request #4133 from jitendrapurohit/WebtestFix4.5.0
Webtest Fix 4.5.0
jitendrapurohit [Mon, 15 Sep 2014 13:41:13 +0000 (19:11 +0530)]
Webtest Fix 4.5.0
Eileen McNaughton [Mon, 15 Sep 2014 12:55:29 +0000 (00:55 +1200)]
Merge pull request #4128 from eileenmcnaughton/CRM-15299-test
CRM-15299 add test to check for application of sqlOperator
Tim Otten [Mon, 15 Sep 2014 12:32:47 +0000 (08:32 -0400)]
Merge pull request #4126 from totten/4.5-wpcli-explr
api/explorer - Add support for andyw's wp-cli integration
Monish Deb [Mon, 15 Sep 2014 11:25:43 +0000 (16:55 +0530)]
Merge pull request #4130 from atif-shaikh/CRM-15280
CRM-15280 - Advanced Search not working for deleted Contacts
Monish Deb [Mon, 15 Sep 2014 10:34:21 +0000 (16:04 +0530)]
Merge pull request #4131 from rohankatkar/webtest
Web tests fix for membership.
Monish Deb [Mon, 15 Sep 2014 09:58:25 +0000 (15:28 +0530)]
Merge pull request #4129 from monishdeb/CRM-15278
CRM-15278 fix - Signature is not displayed in CKEditor/TinyMCE while sending email.
Eileen McNaughton [Mon, 15 Sep 2014 09:47:58 +0000 (21:47 +1200)]
turn off tests rather than merge fixes at this stage as the PR would be too big
for comfortable review. If PR is merged before this issue goes cold for me I'll submit the fixes to
master for these
Eileen McNaughton [Mon, 15 Sep 2014 04:24:46 +0000 (16:24 +1200)]
CRM-15299 generic fix on handling apistyle query filters in query object
Eileen McNaughton [Mon, 15 Sep 2014 04:28:07 +0000 (16:28 +1200)]
CRM-15299 fix caseType behaviour on getcount
Rohan Katkar [Mon, 15 Sep 2014 08:55:56 +0000 (14:25 +0530)]
Web tests fix for membership.
atif-shaikh [Mon, 15 Sep 2014 08:54:10 +0000 (14:24 +0530)]
CRM-15280 - Advanced Search not working for deleted Contacts
https://issues.civicrm.org/jira/browse/CRM-15280
monishdeb [Mon, 15 Sep 2014 07:58:17 +0000 (13:28 +0530)]
CRM-15278 fix - Signature is not displayed in CKEditor/TinyMCE while sending email.
https://issues.civicrm.org/jira/browse/CRM-15278
Yashodha Chaku [Mon, 15 Sep 2014 05:59:20 +0000 (11:29 +0530)]
Merge pull request #4127 from eileenmcnaughton/CRM-15299
whitespace and comments
Eileen McNaughton [Mon, 15 Sep 2014 04:19:44 +0000 (16:19 +1200)]
CRM-15299 add test to check for application of sqlOperator
Eileen McNaughton [Mon, 15 Sep 2014 04:22:59 +0000 (16:22 +1200)]
whitespace and comments
Tim Otten [Mon, 15 Sep 2014 03:37:41 +0000 (23:37 -0400)]
api/explorer - Add support for andyw's wp-cli integration
(See also: https://github.com/civicrm/civicrm-wordpress/pull/55 )
Tim Otten [Mon, 15 Sep 2014 03:37:08 +0000 (23:37 -0400)]
CRM_Utils_System_WordPress - Fix is_wordpress
The property is defined in the base-class but never set.
Dave Greenberg [Mon, 15 Sep 2014 02:35:32 +0000 (22:35 -0400)]
Merge pull request #4125 from davecivicrm/CRM-15197d
CRM-15197 - Fixes for WebTest_Contact_InlineFieldsEditTest::testAddAndEd...
Dave Greenberg [Mon, 15 Sep 2014 02:32:56 +0000 (22:32 -0400)]
CRM-15197 - Fixes for WebTest_Contact_InlineFieldsEditTest::testAddAndEditField
----------------------------------------
* CRM-15197:
https://issues.civicrm.org/jira/browse/CRM-15197
Dave Greenberg [Sun, 14 Sep 2014 23:39:46 +0000 (19:39 -0400)]
Merge pull request #4116 from GinkgoFJG/identify-magic-buttons
Provide developers (unit test writers in particular) information about the original button that is being mimicked in the buttonpane.
Frank J. Gómez [Sun, 14 Sep 2014 19:37:42 +0000 (15:37 -0400)]
Provide developers (unit test writers in particular) information about the original button that is being mimicked in the buttonpane.
Tim Otten [Sun, 14 Sep 2014 18:16:13 +0000 (14:16 -0400)]
Merge remote-tracking branch 'origin/4.4' into 4.4-4.5-2014-09-14-13-58-42
Conflicts:
CRM/Contact/Page/AJAX.php
CRM/Core/BAO/CustomField.php
CRM/Event/Form/Registration/Register.php
Tim Otten [Sun, 14 Sep 2014 17:43:36 +0000 (13:43 -0400)]
Merge pull request #4115 from totten/4.5-dm-ign
gitignore - Add distmaker/out
Tim Otten [Sun, 14 Sep 2014 17:38:07 +0000 (13:38 -0400)]
gitignore - Add distmaker/out
Dave Greenberg [Sun, 14 Sep 2014 12:35:48 +0000 (08:35 -0400)]
Merge pull request #4112 from colemanw/CRM-15287
CRM-15287 - Fix shared address behavior
Kurund Jalmi [Sun, 14 Sep 2014 07:07:20 +0000 (12:37 +0530)]
Merge pull request #4044 from totten/4.5-paratest-misc
Misc testing changes
colemanw [Sun, 14 Sep 2014 01:42:03 +0000 (21:42 -0400)]
Merge pull request #4114 from colemanw/Webtest
Webtest fixes
Coleman Watts [Sun, 14 Sep 2014 01:40:53 +0000 (21:40 -0400)]
Webtest fixes
Coleman Watts [Sat, 13 Sep 2014 20:29:56 +0000 (16:29 -0400)]
Fix attr vs prop
colemanw [Sat, 13 Sep 2014 19:19:20 +0000 (15:19 -0400)]
Merge pull request #4113 from colemanw/CRM-15283
CRM-15283 - Pledge form fixes
Coleman Watts [Sat, 13 Sep 2014 19:17:39 +0000 (15:17 -0400)]
CRM-15283 - Pledge form fixes
Kurund Jalmi [Sat, 13 Sep 2014 13:03:08 +0000 (18:33 +0530)]
Merge pull request #4111 from totten/4.5-schedrem-order
CRM/Admin/Form/ScheduleReminders - Less stupid field ordering
Coleman Watts [Sat, 13 Sep 2014 00:23:15 +0000 (20:23 -0400)]
Fix buildAdditionalBlocks to trigger crmLoad on all new content
Coleman Watts [Sat, 13 Sep 2014 00:19:11 +0000 (20:19 -0400)]
CRM-15287 - More consistent behavior when editing/adding shared address
Coleman Watts [Fri, 12 Sep 2014 21:22:13 +0000 (17:22 -0400)]
CRM-15287 - Cleanup and fixes for ShareAddress.tpl
Coleman Watts [Fri, 12 Sep 2014 21:21:39 +0000 (17:21 -0400)]
CRM-15287 - Fix hiding address when shared on contact edit form
Tim Otten [Fri, 12 Sep 2014 14:52:58 +0000 (10:52 -0400)]
CRM/Admin/Form/ScheduleReminders - Less stupid field ordering
Old field ordering:
* When:
* Record activity for automated email?
* Repeat:
* Email:
* Send email?
* Use Template
* Subject
New field ordering:
* When:
* Repeat:
* Email
* Send email?
* Record activity for automated email?
* Use Template
* Subjec
This is less-stupid because:
* It doesn't breakup the When/Repeat sections
* It puts the email options together
Yashodha Chaku [Fri, 12 Sep 2014 13:17:05 +0000 (18:47 +0530)]
Merge pull request #4099 from atif-shaikh/CRM-15240
CRM-15240
Yashodha Chaku [Fri, 12 Sep 2014 13:12:31 +0000 (18:42 +0530)]
Merge pull request #4110 from rohankatkar/webtest6
Webtest Fix
Rohan Katkar [Fri, 12 Sep 2014 12:48:40 +0000 (18:18 +0530)]
Webtest Fix
Yashodha Chaku [Fri, 12 Sep 2014 11:28:20 +0000 (16:58 +0530)]
Merge pull request #4109 from jitendrapurohit/CRM-15281
CRM-15281
Yashodha Chaku [Fri, 12 Sep 2014 11:08:45 +0000 (16:38 +0530)]
Merge pull request #4097 from jitendrapurohit/CRM-15273
CRM-15273 Fix
jitendrapurohit [Fri, 12 Sep 2014 10:33:12 +0000 (16:03 +0530)]
CRM-15281
jitendrapurohit [Fri, 12 Sep 2014 06:05:16 +0000 (11:35 +0530)]
Change Case Type Fix
Yashodha Chaku [Fri, 12 Sep 2014 05:38:16 +0000 (11:08 +0530)]
Merge pull request #4108 from yashodha/CRM-15279
CRM-15279 : fix query for survey while finding activities
CiviCRM [Fri, 12 Sep 2014 05:20:34 +0000 (10:50 +0530)]
CRM-15279 : fix query for survey while finding activities
Monish Deb [Fri, 12 Sep 2014 04:43:00 +0000 (10:13 +0530)]
Merge pull request #4088 from atif-shaikh/CRM-15231
CRM-15231 - Fatal error on search when ACLs are enabled
Dave Greenberg [Fri, 12 Sep 2014 03:11:41 +0000 (23:11 -0400)]
Merge pull request #4106 from davecivicrm/CRM-15197c
CRM-15197 - Fix for WebTest_Contact_AddTest::testIndividualAddWithShared...
Dave Greenberg [Fri, 12 Sep 2014 03:10:03 +0000 (23:10 -0400)]
CRM-15197 - Fix for WebTest_Contact_AddTest::testIndividualAddWithSharedAddress related to success status changes. Test will still fail due to bug reported in CRM-15287.
----------------------------------------
* CRM-15197:
https://issues.civicrm.org/jira/browse/CRM-15197
* CRM-15287:
https://issues.civicrm.org/jira/browse/CRM-15287
colemanw [Fri, 12 Sep 2014 01:57:37 +0000 (21:57 -0400)]
Merge pull request #4105 from colemanw/CRM-15286
CRM-15286 - Set correct payment instrument in api contribution.transact
Coleman Watts [Fri, 12 Sep 2014 01:44:16 +0000 (21:44 -0400)]
CRM-15286 - Set correct payment instrument in api contribution.transact
colemanw [Thu, 11 Sep 2014 23:42:18 +0000 (19:42 -0400)]
Merge pull request #4103 from colemanw/CRM-15242
CRM-15242 - Fix scheduleReminder 'limit to' option
Coleman Watts [Thu, 11 Sep 2014 23:41:19 +0000 (19:41 -0400)]
CRM-15242 - Fix scheduleReminder 'limit to' option
Kurund Jalmi [Thu, 11 Sep 2014 15:03:27 +0000 (20:33 +0530)]
Merge pull request #4101 from jitendrapurohit/WebtestFix4.5.0
Webtest Fix 4.5.0
Kurund Jalmi [Thu, 11 Sep 2014 15:01:45 +0000 (20:31 +0530)]
Merge pull request #4102 from rohankatkar/webtest6
Webtests Fix
Monish Deb [Thu, 11 Sep 2014 14:44:09 +0000 (20:14 +0530)]
Merge pull request #4100 from monishdeb/CRM-15276
CRM-15276 fixes - DB Syntax Error on saving new mailing component with c...
Rohan Katkar [Thu, 11 Sep 2014 14:43:41 +0000 (20:13 +0530)]
Webtests Fix
monishdeb [Thu, 11 Sep 2014 14:39:51 +0000 (20:09 +0530)]
CRM-15276 fixes - DB Syntax Error on saving new mailing component with checked is_default
https://issues.civicrm.org/jira/browse/CRM-15276
jitendrapurohit [Thu, 11 Sep 2014 14:37:26 +0000 (20:07 +0530)]
Webtest Fix 4.5.0
atif-shaikh [Thu, 11 Sep 2014 13:57:35 +0000 (19:27 +0530)]
CRM-15240
Monish Deb [Thu, 11 Sep 2014 13:56:27 +0000 (19:26 +0530)]
Merge pull request #4098 from monishdeb/CRM-15272
CRM-15272 fix - Default Soft Credit Type is not respected in backoffice ...
monishdeb [Thu, 11 Sep 2014 13:45:29 +0000 (19:15 +0530)]
CRM-15272 fix - Default Soft Credit Type is not respected in backoffice Contribution
https://issues.civicrm.org/jira/browse/CRM-15272
jitendrapurohit [Thu, 11 Sep 2014 12:45:32 +0000 (18:15 +0530)]
Fix For Casetype
Jitendra Purohit [Thu, 11 Sep 2014 09:11:06 +0000 (14:41 +0530)]
CRM-15273 Fix
atif-shaikh [Thu, 11 Sep 2014 06:34:25 +0000 (12:04 +0530)]
CRM-15231 Regression Fix for Api Break
----------------------------------------
* CRM-15231: Fatal error on search when ACLs are enabled
https://issues.civicrm.org/jira/browse/CRM-15231
atif-shaikh [Thu, 11 Sep 2014 05:39:17 +0000 (11:09 +0530)]
CRM-15231 QA Fix
----------------------------------------
* CRM-15231: Fatal error on search when ACLs are enabled
https://issues.civicrm.org/jira/browse/CRM-15231
Monish Deb [Wed, 10 Sep 2014 19:31:37 +0000 (01:01 +0530)]
Merge pull request #4095 from rohankatkar/webtest5
Webtest Fixes
Monish Deb [Wed, 10 Sep 2014 19:30:12 +0000 (01:00 +0530)]
Merge pull request #4094 from jitendrapurohit/WebtestFix4.5.0
Webtest Fix 4.5.0
Dave Greenberg [Wed, 10 Sep 2014 15:44:30 +0000 (08:44 -0700)]
Merge pull request #4085 from monishdeb/CRM-15232
CRM-15232 fix - LIne items are missing from receipts when using a price ...
Rohan Katkar [Wed, 10 Sep 2014 15:18:31 +0000 (20:48 +0530)]
Webtest Fixes
Jitendra Purohit [Wed, 10 Sep 2014 13:42:21 +0000 (19:12 +0530)]
Webtest Fix 4.5.0
atif-shaikh [Wed, 10 Sep 2014 09:59:47 +0000 (15:29 +0530)]
CRM-15231 QA Fixes
----------------------------------------
* CRM-15231: Fatal error on search when ACLs are enabled
https://issues.civicrm.org/jira/browse/CRM-15231
atif-shaikh [Wed, 10 Sep 2014 09:32:14 +0000 (15:02 +0530)]
CRM-15231 - Fatal error on search when ACLs are enabled
https://issues.civicrm.org/jira/browse/CRM-15231
monishdeb [Wed, 10 Sep 2014 06:45:11 +0000 (12:15 +0530)]
CRM-15232 IPN fix
----------------------------------------
* CRM-15232: LIne items are missing from receipts when using a price set with multiple membership organization price fields
https://issues.civicrm.org/jira/browse/CRM-15232
Yashodha Chaku [Wed, 10 Sep 2014 06:38:46 +0000 (12:08 +0530)]
Merge pull request #4093 from yashodha/CRM-15219
CRM-15219: fixed import of activity date
Dave Greenberg [Tue, 9 Sep 2014 19:21:23 +0000 (12:21 -0700)]
Merge pull request #4054 from eileenmcnaughton/CRM-15237
CRM-15237 enotice on report
Monish Deb [Tue, 9 Sep 2014 13:52:39 +0000 (19:22 +0530)]
Merge pull request #4086 from monishdeb/CRM-15250
Tested and confirmed
CiviCRM [Tue, 9 Sep 2014 13:29:59 +0000 (18:59 +0530)]
CRM-15219: fixed import of activity date
atif-shaikh [Tue, 9 Sep 2014 13:15:12 +0000 (18:45 +0530)]
CRM-15231 - Fatal error on search when ACLs are enabled
https://issues.civicrm.org/jira/browse/CRM-15231
monishdeb [Tue, 9 Sep 2014 12:21:14 +0000 (17:51 +0530)]
CRM-15250 fix - membership created and marked current when transaction declined (authorize.net)
https://issues.civicrm.org/jira/browse/CRM-15250
monishdeb [Tue, 9 Sep 2014 12:11:06 +0000 (17:41 +0530)]
CRM-15232 fix - LIne items are missing from receipts when using a price set with multiple membership organization price fields
https://issues.civicrm.org/jira/browse/CRM-15232
Kurund Jalmi [Tue, 9 Sep 2014 11:46:35 +0000 (17:16 +0530)]
Merge pull request #4082 from monishdeb/CRM-14784
CRM-14784 fix - The update greetings job times out without saving to the...
Yashodha Chaku [Tue, 9 Sep 2014 11:16:48 +0000 (16:46 +0530)]
Merge pull request #4084 from rohankatkar/CRM_15264
Fix for CRM-15264
Kurund Jalmi [Tue, 9 Sep 2014 10:22:14 +0000 (15:52 +0530)]
Merge pull request #4076 from totten/4.4-redact-version
CRM-15248 - footer.tpl - For front-end users, redact point-release.
Tim Otten [Tue, 9 Sep 2014 10:11:57 +0000 (03:11 -0700)]
CRM-15248 - Tweak formatting
Rohan Katkar [Tue, 9 Sep 2014 09:55:19 +0000 (15:25 +0530)]
Fix for CRM-15264
Kurund Jalmi [Tue, 9 Sep 2014 07:53:14 +0000 (13:23 +0530)]
Merge pull request #4075 from rohankatkar/webtest4
Webtest fix
Rohan Katkar [Tue, 9 Sep 2014 07:50:11 +0000 (13:20 +0530)]
Additional fix in webtest
Rohan Katkar [Tue, 9 Sep 2014 04:03:09 +0000 (09:33 +0530)]
Webtest fix
monishdeb [Tue, 9 Sep 2014 07:16:57 +0000 (12:46 +0530)]
CRM-14784 fix - The update greetings job times out without saving to the database
https://issues.civicrm.org/jira/browse/CRM-14784
Kurund Jalmi [Tue, 9 Sep 2014 06:55:09 +0000 (12:25 +0530)]
Merge pull request #4073 from kurund/CRM-15181-fixes
CRM-15181 fixes
Kurund Jalmi [Tue, 9 Sep 2014 06:34:14 +0000 (12:04 +0530)]
Merge pull request #4078 from totten/4.4-ajax-validate
CRM-15247 - AJAX Fixups
projects / civicrm-core.git / log