Monish Deb [Fri, 19 Sep 2014 13:22:48 +0000 (18:52 +0530)]
Merge pull request #4182 from rohankatkar/webtest_4.5.0
Webtest fix for failure
Rohan Katkar [Fri, 19 Sep 2014 13:16:19 +0000 (18:46 +0530)]
Webtest fix for failure
Monish Deb [Fri, 19 Sep 2014 12:48:45 +0000 (18:18 +0530)]
Merge pull request #4181 from jitendrapurohit/webtestfixes
Webtest fix
jitendrapurohit [Fri, 19 Sep 2014 12:47:55 +0000 (18:17 +0530)]
Webtest fix
Monish Deb [Fri, 19 Sep 2014 10:20:58 +0000 (15:50 +0530)]
Merge pull request #4180 from atif-shaikh/WebtestFix
WebtestFix
atif-shaikh [Fri, 19 Sep 2014 10:16:37 +0000 (15:46 +0530)]
WebtestFix
Coleman Watts [Fri, 19 Sep 2014 03:10:11 +0000 (23:10 -0400)]
Webtest fix - ensure user is admin before messing with payment processors
colemanw [Fri, 19 Sep 2014 02:46:27 +0000 (22:46 -0400)]
Merge pull request #4179 from colemanw/Webtest
Webtest fixes
Coleman Watts [Fri, 19 Sep 2014 02:45:47 +0000 (22:45 -0400)]
Webtest fixes
Dave Greenberg [Fri, 19 Sep 2014 02:38:41 +0000 (22:38 -0400)]
Merge pull request #4170 from mepps/batch-update-webtest
CRM-15320 Accounted for partial soft credits which previous code didn't
Eileen McNaughton [Thu, 18 Sep 2014 21:42:38 +0000 (09:42 +1200)]
Merge pull request #4123 from eileenmcnaughton/CRM-15296
CRM-15296 pass financialTypeID type vars to allow deprecation of contributionTypeID
colemanw [Thu, 18 Sep 2014 14:12:52 +0000 (10:12 -0400)]
Merge pull request #4178 from colemanw/Webtest
Webtest fixes
Coleman Watts [Thu, 18 Sep 2014 14:11:43 +0000 (10:11 -0400)]
Webtest fixes
Monish Deb [Thu, 18 Sep 2014 13:39:39 +0000 (19:09 +0530)]
Merge pull request #4177 from jitendrapurohit/webtestfixes
Batchupdate test fix to pass on jenkins
Yashodha Chaku [Thu, 18 Sep 2014 12:45:18 +0000 (18:15 +0530)]
Merge pull request #4176 from yashodha/version-fix
version fixes
CiviCRM [Thu, 18 Sep 2014 13:04:15 +0000 (18:34 +0530)]
version fixes
jitendrapurohit [Thu, 18 Sep 2014 12:44:04 +0000 (18:14 +0530)]
Batchupdate test fix to pass on jenkins
Eileen McNaughton [Thu, 18 Sep 2014 06:14:49 +0000 (18:14 +1200)]
Merge pull request #4175 from eileenmcnaughton/4.5
whitespace & spelling
Eileen McNaughton [Fri, 5 Sep 2014 00:34:24 +0000 (12:34 +1200)]
whitespace only
Eileen McNaughton [Fri, 5 Sep 2014 00:24:48 +0000 (12:24 +1200)]
reformat whitespace
Eileen McNaughton [Fri, 5 Sep 2014 00:21:11 +0000 (12:21 +1200)]
fixes to comment blocks & spelling
Monish Deb [Thu, 18 Sep 2014 05:12:19 +0000 (10:42 +0530)]
Merge pull request #4169 from rohankatkar/webtest4.5.0
additional changes for 'add standalone pledge'
colemanw [Thu, 18 Sep 2014 04:07:22 +0000 (00:07 -0400)]
Merge pull request #4174 from colemanw/CRM-15197
CRM-15197 - Webtest fixes
Coleman Watts [Thu, 18 Sep 2014 04:02:26 +0000 (00:02 -0400)]
CRM-15197 - Webtest fixes
colemanw [Wed, 17 Sep 2014 19:31:58 +0000 (15:31 -0400)]
Merge pull request #4171 from colemanw/CRM-15294
CRM-15294 - Fix multiple bugs in event location form
Coleman Watts [Wed, 17 Sep 2014 18:24:42 +0000 (14:24 -0400)]
Webtest fixes
Coleman Watts [Wed, 17 Sep 2014 18:24:31 +0000 (14:24 -0400)]
CRM-15294 - Fix multiple bugs in event location form
Coleman Watts [Wed, 17 Sep 2014 18:23:53 +0000 (14:23 -0400)]
Pledge.tpl - Fix js escaping
Maggie [Wed, 17 Sep 2014 15:41:43 +0000 (11:41 -0400)]
CRM-15320 Accounted for partial soft credits which previous code didn't
Rohan Katkar [Wed, 17 Sep 2014 14:13:50 +0000 (19:43 +0530)]
additional changes for 'add standalone pledge'
Yashodha Chaku [Wed, 17 Sep 2014 13:44:50 +0000 (19:14 +0530)]
Merge pull request #4168 from NileemaJadhav/CRM-45-main
--HR-379 Fixes error csv for comma separated message
Monish Deb [Wed, 17 Sep 2014 13:40:17 +0000 (19:10 +0530)]
Merge pull request #4167 from atif-shaikh/WebtestFix
WebtestFix
Nileema [Wed, 17 Sep 2014 13:37:12 +0000 (19:07 +0530)]
--HR-379 Fixes error csv for comma separated message
atif-shaikh [Wed, 17 Sep 2014 13:30:36 +0000 (19:00 +0530)]
WebtestFix
Monish Deb [Wed, 17 Sep 2014 13:16:09 +0000 (18:46 +0530)]
Merge pull request #4165 from rohankatkar/webtest4.5.0
Fix for Webtest
Rohan Katkar [Wed, 17 Sep 2014 13:13:49 +0000 (18:43 +0530)]
Fix for Webtest
Monish Deb [Wed, 17 Sep 2014 13:05:41 +0000 (18:35 +0530)]
Merge pull request #4164 from jitendrapurohit/webtestfixes
webtest 4.5.0
jitendrapurohit [Wed, 17 Sep 2014 12:43:13 +0000 (18:13 +0530)]
AddCancelPaymentTest Fix
jitendrapurohit [Wed, 17 Sep 2014 12:36:20 +0000 (18:06 +0530)]
webtest 4.5.0
Kurund Jalmi [Wed, 17 Sep 2014 12:19:52 +0000 (17:49 +0530)]
Merge pull request #4162 from atif-shaikh/CRM-15322
CRM-15322 - JS break on click Quick Config link for Regular Fee in Fee ...
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
atif-shaikh [Wed, 17 Sep 2014 11:21:00 +0000 (16:51 +0530)]
CRM-15322 - JS break on click Quick Config link for Regular Fee in Fee Section of Event
https://issues.civicrm.org/jira/browse/CRM-15322
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