Kurund Jalmi [Wed, 17 Sep 2014 12:19:38 +0000 (17:49 +0530)]
Merge pull request #4163 from monishdeb/CRM-15323
CRM-15323 fix - On log mode case type info is not present against its ca...
monishdeb [Wed, 17 Sep 2014 11:26:47 +0000 (16:56 +0530)]
CRM-15323 fix - On log mode case type info is not present against its case
https://issues.civicrm.org/jira/browse/CRM-15323
Yashodha Chaku [Wed, 17 Sep 2014 10:23:20 +0000 (15:53 +0530)]
Merge pull request #4150 from jmcclelland/logging-table-exceptions-4.5
CRM-15270 - exclude more tables from the log table creation method
Kurund Jalmi [Wed, 17 Sep 2014 08:30:24 +0000 (14:00 +0530)]
Merge pull request #4161 from rohankatkar/webtest4.5.0
Addtional fix for webtest
Kurund Jalmi [Wed, 17 Sep 2014 08:28:52 +0000 (13:58 +0530)]
Merge pull request #4160 from monishdeb/CRM-13912
CRM-13912 fix - Add SMS support to scheduled reminders
Rohan Katkar [Wed, 17 Sep 2014 08:17:09 +0000 (13:47 +0530)]
Additional Webtest Fix
Monish Deb [Wed, 17 Sep 2014 08:16:44 +0000 (13:46 +0530)]
Merge pull request #4159 from jitendrapurohit/Webtest
Webtest Fix 4.5.0
monishdeb [Wed, 17 Sep 2014 07:43:25 +0000 (13:13 +0530)]
CRM-13912 fix - Add SMS support to scheduled reminders
https://issues.civicrm.org/jira/browse/CRM-13912
jitendrapurohit [Wed, 17 Sep 2014 07:21:53 +0000 (12:51 +0530)]
Webtest Fix 4.5.0
colemanw [Wed, 17 Sep 2014 04:10:24 +0000 (00:10 -0400)]
Merge pull request #4158 from colemanw/CRM-15278
CRM-15278 - Email signature fixes
Coleman Watts [Wed, 17 Sep 2014 04:08:51 +0000 (00:08 -0400)]
Add clickLinkSuppressPopup webtest method
Coleman Watts [Wed, 17 Sep 2014 04:08:22 +0000 (00:08 -0400)]
CRM-15278 - Fix email signature on itinial form load
Coleman Watts [Wed, 17 Sep 2014 04:07:32 +0000 (00:07 -0400)]
CRM-15278 - better handling of wysiwyg editors in popups
colemanw [Wed, 17 Sep 2014 04:00:50 +0000 (00:00 -0400)]
Merge pull request #4157 from colemanw/Minor
Minor cleanup
Coleman Watts [Wed, 17 Sep 2014 00:52:40 +0000 (20:52 -0400)]
Remove option-edit icon from participant_listing_id
Coleman Watts [Wed, 17 Sep 2014 00:51:48 +0000 (20:51 -0400)]
Remove debug text
colemanw [Wed, 17 Sep 2014 00:40:17 +0000 (20:40 -0400)]
Merge pull request #4152 from kurund/CRM-15190
CRM-15190, fixes for sorting when on page > 1
Dave Greenberg [Tue, 16 Sep 2014 23:00:50 +0000 (19:00 -0400)]
Merge pull request #4154 from mepps/batch-update-webtest
CRM-15320-created foreach loop so that it processes the array of arrays ...
Maggie [Tue, 16 Sep 2014 20:33:44 +0000 (16:33 -0400)]
CRM-15320-created foreach loop so that it processes the array of arrays rather than dropping the contact id
Dave Greenberg [Tue, 16 Sep 2014 19:35:44 +0000 (15:35 -0400)]
Merge pull request #4151 from mepps/fix-recur-contribution-webtest
CRM-15197 fixed recurring contribution test permisssion issue and added ...
Maggie [Tue, 16 Sep 2014 19:34:24 +0000 (15:34 -0400)]
Changed out click and waitfortext due to processor line appearing in irregular places
Dave Greenberg [Tue, 16 Sep 2014 18:51:57 +0000 (14:51 -0400)]
Merge pull request #4153 from davecivicrm/CRM-15197g
CRM-15197 - fix for WebTest_Contact_AddTest::testIndividualAddWithShared...
Dave Greenberg [Tue, 16 Sep 2014 18:46:19 +0000 (14:46 -0400)]
CRM-15197 - fix for WebTest_Contact_AddTest::testIndividualAddWithSharedAddress
----------------------------------------
* CRM-15197:
https://issues.civicrm.org/jira/browse/CRM-15197
kurund [Tue, 16 Sep 2014 18:32:28 +0000 (00:02 +0530)]
CRM-15190, fixes for sorting when on page > 1
----------------------------------------
* CRM-15190: Contact search paging/sorting partially broken
https://issues.civicrm.org/jira/browse/CRM-15190
Maggie [Tue, 16 Sep 2014 17:40:59 +0000 (13:40 -0400)]
CRM-15197 fixed recurring contribution test permisssion issue and added clickLink to account for load time
Jamie McClelland [Mon, 15 Sep 2014 14:44:46 +0000 (10:44 -0400)]
CRM-15270 - cleaning code and future proofing on lobo's suggestion
See https://github.com/civicrm/civicrm-core/pull/4090/files#r17368220
----------------------------------------
* CRM-15270: Enabling logging result in database error
https://issues.civicrm.org/jira/browse/CRM-15270
Jamie McClelland [Tue, 9 Sep 2014 19:51:29 +0000 (15:51 -0400)]
CRM-15270 - exclude more tables from the log table creation method.
Attempting to create log versions of these tables results in errors.
----------------------------------------
* CRM-15270: Enabling logging result in database error
https://issues.civicrm.org/jira/browse/CRM-15270
Dave Greenberg [Tue, 16 Sep 2014 15:32:08 +0000 (11:32 -0400)]
Merge pull request #4149 from mepps/update-coffee-mug-premium
CRM-15316 Updating coffee mug data, deleting cost to avoid bug
Maggie [Tue, 16 Sep 2014 14:48:53 +0000 (10:48 -0400)]
CRM-15316 Updating coffee mug data, deleting cost to avoid bug
Monish Deb [Tue, 16 Sep 2014 14:13:58 +0000 (19:43 +0530)]
Merge pull request #4145 from atif-shaikh/CRM-15304
CRM-15304 - DB Error on sorting Activities fields - Status, Type and Sub...
Monish Deb [Tue, 16 Sep 2014 14:12:38 +0000 (19:42 +0530)]
Merge pull request #4144 from monishdeb/CRM-14876
CRM-14876 fix - Payment_processor_id not saved when using a priceset in ...
Monish Deb [Tue, 16 Sep 2014 13:59:44 +0000 (19:29 +0530)]
Merge pull request #4147 from rohankatkar/webtest4.5.0
Webtest fir for test
Rohan Katkar [Tue, 16 Sep 2014 13:47:04 +0000 (19:17 +0530)]
Webtest fir for test
Monish Deb [Tue, 16 Sep 2014 13:41:42 +0000 (19:11 +0530)]
Merge pull request #4146 from jitendrapurohit/WebTestFix4.5.0
Webtest Fix 4.5.0
jitendrapurohit [Tue, 16 Sep 2014 13:29:22 +0000 (18:59 +0530)]
Webtest Fix 4.5.0
atif-shaikh [Tue, 16 Sep 2014 13:07:46 +0000 (18:37 +0530)]
CRM-15304 - DB Error on sorting Activities fields - Status, Type and Subject on Advance Search - Activity display mode
https://issues.civicrm.org/jira/browse/CRM-15304
monishdeb [Tue, 16 Sep 2014 13:05:01 +0000 (18:35 +0530)]
Strict warning fix
monishdeb [Tue, 16 Sep 2014 12:50:16 +0000 (18:20 +0530)]
CRM-14876 fix - Payment_processor_id not saved when using a priceset in backoffice
https://issues.civicrm.org/jira/browse/CRM-14876
Monish Deb [Tue, 16 Sep 2014 12:12:05 +0000 (17:42 +0530)]
Merge pull request #4142 from jitendrapurohit/Webtest4.5.0
Fix For testRefundContribution, testDeletePremium, testChangePremium
Yashodha Chaku [Tue, 16 Sep 2014 12:01:08 +0000 (17:31 +0530)]
Merge pull request #4107 from davecivicrm/CRM-15258
CRM-15258 - Also fixes CRM-15257. Includes new msg tpl versions and hand...
Kurund Jalmi [Tue, 16 Sep 2014 10:38:36 +0000 (16:08 +0530)]
Merge pull request #4143 from monishdeb/4.5
CRM-15313 fix - Disabling/Enabling Report Template results into "Error: ...
monishdeb [Tue, 16 Sep 2014 10:30:38 +0000 (16:00 +0530)]
CRM-15313 fix - Disabling/Enabling Report Template results into "Error: Unkown Entity Type"
https://issues.civicrm.org/jira/browse/CRM-15313
jitendrapurohit [Tue, 16 Sep 2014 09:11:42 +0000 (14:41 +0530)]
Fix For testRefundContribution, testDeletePremium, testChangePremium
Monish Deb [Tue, 16 Sep 2014 05:50:26 +0000 (11:20 +0530)]
Merge pull request #4132 from jitendrapurohit/CRM-15282
CRM-15282
colemanw [Tue, 16 Sep 2014 03:44:36 +0000 (23:44 -0400)]
Merge pull request #4121 from williamtheaker/4.5
Keep input boxes from overflowing viewport
colemanw [Tue, 16 Sep 2014 03:43:20 +0000 (23:43 -0400)]
Merge pull request #4140 from colemanw/CRM-15295
CRM-15295 - Webtest fixes
Coleman Watts [Tue, 16 Sep 2014 03:41:57 +0000 (23:41 -0400)]
Webtest fixes for profile/custom-field/price-set
Coleman Watts [Tue, 16 Sep 2014 01:39:00 +0000 (21:39 -0400)]
Fix MultiRecordProfileAddTest
Coleman Watts [Tue, 16 Sep 2014 01:36:20 +0000 (21:36 -0400)]
Fix undefined variable warning
Coleman Watts [Tue, 16 Sep 2014 01:35:35 +0000 (21:35 -0400)]
Remove js from button markup which interfered with ajax popups
Coleman Watts [Tue, 16 Sep 2014 01:30:44 +0000 (21:30 -0400)]
CRM-15295 - Show 'new item' after creating a container
Dave Greenberg [Tue, 16 Sep 2014 01:27:47 +0000 (21:27 -0400)]
Merge pull request #4139 from lcdservices/CRM-15311
CRM-15311 fix event income report
Brian Shaughnessy [Tue, 16 Sep 2014 01:19:25 +0000 (21:19 -0400)]
CRM-15311 condition on is_array rather than remove
Brian Shaughnessy [Tue, 16 Sep 2014 00:25:32 +0000 (20:25 -0400)]
CRM-15311 fix event income report
Coleman Watts [Tue, 16 Sep 2014 00:19:37 +0000 (20:19 -0400)]
CRM-15278 - Revert suppression of popups for some activity links
This reverts commit
e894d288f2880f091fe5ec848616b5b5104ddbdf.
Dave Greenberg [Tue, 16 Sep 2014 00:12:24 +0000 (20:12 -0400)]
Merge pull request #4138 from davecivicrm/CRM-15197f
CRM-15197 - Fix for WebTest_Contribute_UpdateContributionTest::testDelet...
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.
jitendrapurohit [Mon, 15 Sep 2014 09:50:53 +0000 (15:20 +0530)]
CRM-15282
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.
William Theaker [Sun, 14 Sep 2014 20:47:13 +0000 (16:47 -0400)]
Keep input boxes from overflowing viewport
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
projects / civicrm-core.git / log