Monish Deb [Wed, 24 Sep 2014 11:44:52 +0000 (17:14 +0530)]
Merge pull request #4191 from cividesk/CRM-15317
CRM-15317: full fix
Eileen McNaughton [Wed, 24 Sep 2014 07:00:57 +0000 (19:00 +1200)]
Merge pull request #4219 from eileenmcnaughton/4.5
merge changes from 4.4
Kurund Jalmi [Wed, 24 Sep 2014 06:40:56 +0000 (12:10 +0530)]
Merge pull request #4215 from monishdeb/CRM-15350
CRM-15350 fix - Membership Batch Entry doesn't support soft credit type ...
Eileen McNaughton [Wed, 24 Sep 2014 04:15:02 +0000 (16:15 +1200)]
Merge branch '4.4' of https://github.com/civicrm/civicrm-core into 4.5
Conflicts:
CRM/Core/DAO.php
CRM/Financial/BAO/FinancialAccount.php
CRM/Financial/BAO/FinancialType.php
tests/phpunit/api/v3/CaseTest.php
tests/phpunit/api/v3/SyntaxConformanceTest.php
Eileen McNaughton [Wed, 24 Sep 2014 04:10:09 +0000 (16:10 +1200)]
Merge pull request #3759 from eileenmcnaughton/api
backport financial account and financial type api & activity_contact api
Eileen [Wed, 24 Sep 2014 03:01:46 +0000 (03:01 +0000)]
DO NOT MERGE - temp test fix for 4.4
I will merge once in 4.4
Eileen [Wed, 24 Sep 2014 02:05:48 +0000 (02:05 +0000)]
Do not merge to 4.5 - fixes to make backported api pass tests,
one merged into 4.4 I'll do a merge PR to 4.5 to ensure this isn't merged as the fixes involve skipping tests due to upstream test framework changes
not being in 4.4
colemanw [Wed, 24 Sep 2014 01:57:36 +0000 (21:57 -0400)]
Merge pull request #4217 from colemanw/CRM-15363
CRM-15363 - Make jcalendar.tpl more resilient to duplicate dom ids
Coleman Watts [Tue, 23 Sep 2014 21:52:39 +0000 (17:52 -0400)]
CRM-15363 - Make jcalendar.tpl more resilient to duplicate dom ids
Eileen [Wed, 24 Sep 2014 01:45:27 +0000 (01:45 +0000)]
additional example
Eileen [Wed, 24 Sep 2014 01:45:03 +0000 (01:45 +0000)]
additional example
Eileen [Wed, 24 Sep 2014 01:28:01 +0000 (01:28 +0000)]
add Activity Contact api to backport
Eileen McNaughton [Wed, 30 Jul 2014 04:48:00 +0000 (16:48 +1200)]
backport financial account and financial type api
Coleman Watts [Tue, 23 Sep 2014 17:58:55 +0000 (13:58 -0400)]
Webtest fix in CiviMailUtils.php
Monish Deb [Tue, 23 Sep 2014 14:44:19 +0000 (20:14 +0530)]
Merge pull request #4212 from jitendrapurohit/webtestfixes
Webtest fix
Monish Deb [Tue, 23 Sep 2014 14:44:04 +0000 (20:14 +0530)]
Merge pull request #4213 from rohankatkar/webtest_4.5.0
Webtest failure fix
monishdeb [Tue, 23 Sep 2014 13:49:39 +0000 (19:19 +0530)]
CRM-15350 fix - Membership Batch Entry doesn't support soft credit type and soft credit js break on both Batch entry
https://issues.civicrm.org/jira/browse/CRM-15350
Rohan Katkar [Tue, 23 Sep 2014 13:39:02 +0000 (19:09 +0530)]
Webtest failure fix
jitendrapurohit [Tue, 23 Sep 2014 13:34:56 +0000 (19:04 +0530)]
Webtest fix
Monish Deb [Tue, 23 Sep 2014 11:29:39 +0000 (16:59 +0530)]
Merge pull request #4205 from NileemaJadhav/CRM_HR_45_test
--HR-379 Fix notices coming while importing relationship details
Coleman Watts [Tue, 23 Sep 2014 02:17:33 +0000 (22:17 -0400)]
Webtest cleanup and fixes
Coleman Watts [Tue, 23 Sep 2014 01:04:03 +0000 (21:04 -0400)]
Common.js - minor cleanup
colemanw [Tue, 23 Sep 2014 00:29:42 +0000 (20:29 -0400)]
Merge pull request #4210 from colemanw/CRM-15341
CRM-15341 - D7 hack to get the toolbar out of the way
Coleman Watts [Tue, 23 Sep 2014 00:24:17 +0000 (20:24 -0400)]
CRM-15341 - D7 hack to get the toolbar out of the way
We shouldn't have to do this, but for the sake of our UX here's a hack
to fix the incompatability between the Drupal toolbar and jQuery UI.
Coleman Watts [Mon, 22 Sep 2014 23:22:32 +0000 (19:22 -0400)]
Fix accidental breakage of CiviMailUtils
colemanw [Mon, 22 Sep 2014 23:21:38 +0000 (19:21 -0400)]
Merge pull request #4209 from colemanw/CRM-15242
CRM-15242 - Resubmit PR #4103
Coleman Watts [Mon, 22 Sep 2014 23:18:07 +0000 (19:18 -0400)]
CRM-15242 - Resubmit PR #4103
Dave Greenberg [Mon, 22 Sep 2014 22:30:47 +0000 (15:30 -0700)]
Merge pull request #4208 from lcdservices/CRM-15351
CRM-15351 relationship report: filter contact type on contact table
colemanw [Mon, 22 Sep 2014 21:56:46 +0000 (17:56 -0400)]
Merge pull request #4206 from colemanw/console
Fix safety check when using window.console and switch to console.warn for warnings
Coleman Watts [Mon, 22 Sep 2014 15:59:10 +0000 (11:59 -0400)]
CRM-15352 Add CRM.console wrapper function
Not all browsers (ahem, IE) support the js console and will crash if it doesn't exist.
CRM.console adds a safe way to access console methods.
Dave Greenberg [Mon, 22 Sep 2014 19:51:02 +0000 (12:51 -0700)]
Merge pull request #4199 from pradpnayak/CRM-15055
-- CRM-15055, Fixed CRM test for membership batch create
Brian Shaughnessy [Mon, 22 Sep 2014 18:51:52 +0000 (14:51 -0400)]
CRM-15351 relationship report: filter contact type on contact table
Coleman Watts [Mon, 22 Sep 2014 15:52:11 +0000 (11:52 -0400)]
Webtest possible fix or customFieldSetLoadOnTheFlyCheck
Coleman Watts [Mon, 22 Sep 2014 15:49:34 +0000 (11:49 -0400)]
Fix for WebTest_Mailing_SpoolTest
Dave Greenberg [Mon, 22 Sep 2014 15:14:44 +0000 (08:14 -0700)]
Merge pull request #4027 from magnolia61/(CRM-15223)-Include-gender-and-age-in-(constituent)-reports
Include gender & age in Constituent Summary Report
Nileema [Mon, 22 Sep 2014 14:39:46 +0000 (20:09 +0530)]
--HR-379 Fix notices coming while importing relationship details
Monish Deb [Mon, 22 Sep 2014 14:30:37 +0000 (20:00 +0530)]
Merge pull request #4201 from jitendrapurohit/webtestfixes
Webtest Fixes
colemanw [Mon, 22 Sep 2014 14:08:33 +0000 (10:08 -0400)]
Merge pull request #4204 from JKingsnorth/CRM-15345a
CRM-15345
JKingsnorth [Mon, 22 Sep 2014 14:02:44 +0000 (15:02 +0100)]
CRM-15345
Remove debug var from custom data 'View'
Yashodha Chaku [Mon, 22 Sep 2014 14:00:01 +0000 (19:30 +0530)]
Merge pull request #4203 from rohankatkar/webtest_4.5.0
Webtest Fix
Rohan Katkar [Mon, 22 Sep 2014 13:29:38 +0000 (18:59 +0530)]
Webtest Fix
jitendrapurohit [Mon, 22 Sep 2014 13:16:56 +0000 (18:46 +0530)]
Webtest Fixes
colemanw [Mon, 22 Sep 2014 13:13:02 +0000 (09:13 -0400)]
Merge pull request #4200 from colemanw/CRM-15345
CRM-15345 - Remove debug var
Coleman Watts [Mon, 22 Sep 2014 13:12:43 +0000 (09:12 -0400)]
CRM-15345 - Remove debug var
Pradeep Nayak [Mon, 22 Sep 2014 12:03:58 +0000 (17:33 +0530)]
-- CRM-15055, Fixed CRM test for membership batch create
----------------------------------------
* CRM-15055: Line item for membership entity should be created even when Record Payment is not checked
https://issues.civicrm.org/jira/browse/CRM-15055
colemanw [Mon, 22 Sep 2014 01:53:42 +0000 (21:53 -0400)]
Merge pull request #4197 from colemanw/Webtest
Webtest fixes
Coleman Watts [Mon, 22 Sep 2014 01:53:20 +0000 (21:53 -0400)]
Webtest fixes
Coleman Watts [Mon, 22 Sep 2014 01:08:16 +0000 (21:08 -0400)]
CRM-13981 - Avoid creating soft credit with insufficient params
Coleman Watts [Sun, 21 Sep 2014 01:00:56 +0000 (21:00 -0400)]
Hack to ensure proper cache clearing during testAjaxCustomGroupLoad
colemanw [Sun, 21 Sep 2014 00:50:41 +0000 (20:50 -0400)]
Merge pull request #4192 from colemanw/Webtest
Webtest fixes and cleanup
Coleman Watts [Sun, 21 Sep 2014 00:49:46 +0000 (20:49 -0400)]
Webtest fixes and cleanup
Nicolas Ganivet [Sat, 20 Sep 2014 23:34:15 +0000 (17:34 -0600)]
CRM-15317: full fix
Tim Otten [Sat, 20 Sep 2014 17:43:41 +0000 (13:43 -0400)]
Merge pull request #4183 from totten/4.5-hook-bug
CRM-15333 - Fix multiple-merges of hook-results
Monish Deb [Sat, 20 Sep 2014 08:10:25 +0000 (13:40 +0530)]
Merge pull request #4190 from monishdeb/CRM-13912
CRM-13912 regression fix
monishdeb [Sat, 20 Sep 2014 06:10:01 +0000 (11:40 +0530)]
CRM-13912 regression fix
----------------------------------------
* CRM-13912: Add SMS support to scheduled reminders
https://issues.civicrm.org/jira/browse/CRM-13912
colemanw [Sat, 20 Sep 2014 03:45:46 +0000 (23:45 -0400)]
Merge pull request #4189 from colemanw/webtestNewDialogContact
Refactor webtestNewDialogContact and other webtest cleanup
Coleman Watts [Sat, 20 Sep 2014 03:45:24 +0000 (23:45 -0400)]
Refactor webtestNewDialogContact and other webtest cleanup
colemanw [Fri, 19 Sep 2014 22:03:25 +0000 (18:03 -0400)]
Merge pull request #4188 from colemanw/Race-condition
Webtest fixes
Coleman Watts [Fri, 19 Sep 2014 22:02:37 +0000 (18:02 -0400)]
Webtest fixes
colemanw [Fri, 19 Sep 2014 21:10:35 +0000 (17:10 -0400)]
Merge pull request #4186 from colemanw/Race-condition
Race-condition fixes for webtests
Coleman Watts [Fri, 19 Sep 2014 21:10:08 +0000 (17:10 -0400)]
Webtest cleanup
Coleman Watts [Fri, 19 Sep 2014 20:09:09 +0000 (16:09 -0400)]
Race-condition fixes for webtests
colemanw [Fri, 19 Sep 2014 18:43:55 +0000 (14:43 -0400)]
Merge pull request #4184 from colemanw/CRM-15335
CRM-15335 - Fix api explorer handling of number input
Coleman Watts [Fri, 19 Sep 2014 18:41:36 +0000 (14:41 -0400)]
Api explorer - add loading icon to api.action
Coleman Watts [Fri, 19 Sep 2014 18:34:57 +0000 (14:34 -0400)]
CRM-15335 - Fix api explorer handling of number input
Harm Hermsen [Wed, 17 Sep 2014 13:34:03 +0000 (15:34 +0200)]
Possible multiplication of $fResult in $result
The old structure allowed for possible multiplication of $fResult in $result when a specific $fnSuffix hook was implemented in one module, but not in another.
We only want to add $fResult to $result if $fnName exists, so moved the array_merge() into that if-statement. Furthermore, if $numParams is not case-specified in the switch, at the array_merge(), $fResult could hold the result from a previous module (because in the default case $fResult is not being set), so we have to initialize $fResult to an empty array in the foreach().
Tim Otten [Fri, 19 Sep 2014 16:22:46 +0000 (12:22 -0400)]
CRM-15333 - CRM_Utils_HookTest - Verify that return values are properly merged.
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
projects / civicrm-core.git / log