Dave Greenberg [Tue, 7 Oct 2014 22:07:31 +0000 (15:07 -0700)]
Merge pull request #4272 from eileenmcnaughton/CRM-15296-complete
CRM-15296 fix membership processing to complete if trxn_id isset
Kurund Jalmi [Tue, 7 Oct 2014 16:05:28 +0000 (21:35 +0530)]
Merge pull request #4310 from colemanw/CRM-14949
CRM-14949 - Switch dynamic l10n js back to a callback instead of a file
Kurund Jalmi [Tue, 7 Oct 2014 13:54:16 +0000 (19:24 +0530)]
Merge pull request #4318 from jitendrapurohit/webtestfixes
webtest fixes 4.5
Kurund Jalmi [Tue, 7 Oct 2014 13:54:00 +0000 (19:24 +0530)]
Merge pull request #4319 from rohankatkar/webtest_4.5.0
Fixed webtest
Rohan Katkar [Tue, 7 Oct 2014 13:46:01 +0000 (19:16 +0530)]
Fixed webtest
Kurund Jalmi [Tue, 7 Oct 2014 13:24:21 +0000 (18:54 +0530)]
Merge pull request #4282 from colemanw/CRM-15327
CRM-15327 - Fix autofill of chain-select
jitendrapurohit [Tue, 7 Oct 2014 13:03:25 +0000 (18:33 +0530)]
webtest fixes 4.5
Coleman Watts [Mon, 6 Oct 2014 21:51:19 +0000 (17:51 -0400)]
Standardize tpl file name
Dave Greenberg [Mon, 6 Oct 2014 21:40:27 +0000 (14:40 -0700)]
Merge pull request #4312 from civicrm/revert-4294-CRM-15407
Revert "CRM-15407 - add fee_amount and net_amount to Dummy processor."
Dave Greenberg [Mon, 6 Oct 2014 21:39:52 +0000 (14:39 -0700)]
Revert "CRM-15407 - add fee_amount and net_amount to Dummy processor."
Dave Greenberg [Mon, 6 Oct 2014 21:32:49 +0000 (14:32 -0700)]
Merge pull request #4294 from davecivicrm/CRM-15407
CRM-15407 - add fee_amount and net_amount to Dummy processor.
Dave Greenberg [Mon, 6 Oct 2014 21:25:19 +0000 (14:25 -0700)]
Merge pull request #4298 from davecivicrm/CRM-15374
CRM-15374 - exclude fee-related financial_trxn rows from balance calcula...
Coleman Watts [Mon, 6 Oct 2014 19:58:55 +0000 (15:58 -0400)]
CRM-13981 - Fix default value bug introduced in
133e2c9
This commit cleans up a useless foreach loop that didn't do anything (the conditional would always evaluate to TRUE)
and fixes a bug with setting default values:
It seems that with Quickform, calling $form->setDefults with $defaults['foo']['bar'] = $value is "almost" equivalent to
$defaults["foo[bar]"] = $value but with one key difference: the latter always trumps the former.
So because the buildProfile function uses the latter method to set country default value to defaultContactCountry
(e.g. United States), that would always override the "correct" default value which is set here.
Coleman Watts [Tue, 30 Sep 2014 20:08:58 +0000 (16:08 -0400)]
CRM-15327 - Fix autofill of chain-select
Coleman Watts [Thu, 18 Sep 2014 01:24:47 +0000 (21:24 -0400)]
OnBehalfOf.tpl - fix attr vs prop and trigger change
Dave Greenberg [Mon, 6 Oct 2014 17:17:32 +0000 (10:17 -0700)]
Merge pull request #4309 from davecivicrm/CRM-11342
CRM-11342 - Fix for correct filtering of permissioned employees.
Yashodha Chaku [Mon, 6 Oct 2014 10:51:00 +0000 (16:21 +0530)]
Merge pull request #4311 from jitendrapurohit/webtestfixes
Webtestfixes
jitendrapurohit [Mon, 6 Oct 2014 10:43:53 +0000 (16:13 +0530)]
Additional fix
jitendrapurohit [Mon, 6 Oct 2014 10:37:13 +0000 (16:07 +0530)]
Webtest Fix
Coleman Watts [Sun, 5 Oct 2014 19:23:52 +0000 (15:23 -0400)]
CRM-14949 - Switch dynamic l10n js back to a callback instead of a file
Kurund Jalmi [Sun, 5 Oct 2014 15:55:16 +0000 (21:25 +0530)]
Merge pull request #4289 from colemanw/CRM-15130
CRM-15130 - Avoid fatal error in jsortable.tpl
Coleman Watts [Sat, 4 Oct 2014 22:29:36 +0000 (18:29 -0400)]
Common.js minor cleanup
Dave Greenberg [Sat, 4 Oct 2014 00:54:46 +0000 (17:54 -0700)]
CRM-11342 - Fix for correct filtering of permissioned employees.
----------------------------------------
* CRM-11342:
https://issues.civicrm.org/jira/browse/CRM-11342
Dave Greenberg [Fri, 3 Oct 2014 22:12:29 +0000 (15:12 -0700)]
CRM-15374 - Fix new regression on fix for balance calc when options are full.
----------------------------------------
* CRM-15374:
https://issues.civicrm.org/jira/browse/CRM-15374
colemanw [Fri, 3 Oct 2014 20:44:08 +0000 (16:44 -0400)]
Merge pull request #4307 from colemanw/console
Use CRM.console to prevent errors in older browsers
Coleman Watts [Fri, 3 Oct 2014 20:40:45 +0000 (16:40 -0400)]
Use CRM.console to prevent errors in older browsers
colemanw [Fri, 3 Oct 2014 17:43:18 +0000 (13:43 -0400)]
Merge pull request #4301 from colemanw/CRM-15411
CRM-15411 - Fix participant message ajax load
Coleman Watts [Fri, 3 Oct 2014 13:59:45 +0000 (09:59 -0400)]
CRM-15411 - Fix participant message ajax load
Dave Greenberg [Fri, 3 Oct 2014 00:47:38 +0000 (17:47 -0700)]
CRM-15374 - exclude fee-related financial_trxn rows from balance calculations and view payments page.
----------------------------------------
* CRM-15374:
https://issues.civicrm.org/jira/browse/CRM-15374
Dave Greenberg [Thu, 2 Oct 2014 23:13:16 +0000 (16:13 -0700)]
Merge pull request #4292 from monishdeb/CRM-15374
CRM-15374 fix - Contribution FEES are affecting Balance and Total Paid i...
Coleman Watts [Thu, 2 Oct 2014 21:15:21 +0000 (17:15 -0400)]
CiviCase form button cleanup
Coleman Watts [Thu, 2 Oct 2014 18:42:22 +0000 (14:42 -0400)]
jsortable.tpl - minor cleanup
colemanw [Thu, 2 Oct 2014 18:37:06 +0000 (14:37 -0400)]
Merge pull request #4297 from colemanw/CRM-15412
CRM-15412 - Fix CRM.confirm to add content before opening dialog
Coleman Watts [Thu, 2 Oct 2014 18:34:20 +0000 (14:34 -0400)]
CRM-15412 - Fix CRM.confirm to add content before opening dialog
monishdeb [Thu, 2 Oct 2014 18:33:56 +0000 (00:03 +0530)]
Reverted some code
Dave Greenberg [Thu, 2 Oct 2014 01:16:30 +0000 (18:16 -0700)]
CRM-15407 - add fee_amount and net_amount to Dummy processor.
----------------------------------------
* CRM-15407:
https://issues.civicrm.org/jira/browse/CRM-15407
monishdeb [Wed, 1 Oct 2014 21:50:17 +0000 (03:20 +0530)]
Additional fix of CRM-15364
----------------------------------------
* CRM-15364: Change Registration Selections: problems handling discounted line items and full options
https://issues.civicrm.org/jira/browse/CRM-15364
monishdeb [Wed, 1 Oct 2014 20:44:39 +0000 (02:14 +0530)]
CRM-15374 fix - Contribution FEES are affecting Balance and Total Paid incorrectly
https://issues.civicrm.org/jira/browse/CRM-15374
Coleman Watts [Wed, 1 Oct 2014 19:15:52 +0000 (15:15 -0400)]
CRM-15130 - Avoid fatal error in jsortable.tpl
Tim Otten [Wed, 1 Oct 2014 18:08:27 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-10-01-19-08-00
Tim Otten [Wed, 1 Oct 2014 16:55:24 +0000 (17:55 +0100)]
Merge pull request #4288 from totten/4.4-setupsh-port
setup.sh - Fix support mysqld on alternative ports
Tim Otten [Wed, 1 Oct 2014 16:20:37 +0000 (17:20 +0100)]
setup.sh - Fix support mysqld on alternative ports
Kurund Jalmi [Wed, 1 Oct 2014 14:15:14 +0000 (15:15 +0100)]
Merge pull request #4285 from jitendrapurohit/CRM-15396
CRM-15396
Tim Otten [Wed, 1 Oct 2014 13:02:28 +0000 (14:02 +0100)]
Merge pull request #4286 from totten/4.5-entity-ref-bc
CRM-15198 - EntityReference - Provide backward compatibility with CiviVolunteer's DAOs
Tim Otten [Wed, 1 Oct 2014 11:24:18 +0000 (12:24 +0100)]
CRM-15198 - EntityReference - Provide backward compatibility with CiviVolunteer's DAOs
jitendrapurohit [Wed, 1 Oct 2014 10:04:31 +0000 (15:34 +0530)]
CRM-15396
Kurund Jalmi [Wed, 1 Oct 2014 09:39:58 +0000 (10:39 +0100)]
Merge pull request #4280 from mrpaulc/CRM-15383
CRM-15383 - fix template loading for PDF letter
Coleman Watts [Wed, 1 Oct 2014 01:09:33 +0000 (21:09 -0400)]
Webtest fixes
Kurund Jalmi [Wed, 1 Oct 2014 00:12:56 +0000 (01:12 +0100)]
Merge pull request #4246 from crusonweb/CRM-15310
CRM-15310
Kurund Jalmi [Wed, 1 Oct 2014 00:02:11 +0000 (01:02 +0100)]
Merge pull request #4277 from rohankatkar/webtest_4.5.0
Webtest fix
Dave Greenberg [Tue, 30 Sep 2014 23:08:21 +0000 (16:08 -0700)]
Merge pull request #4281 from colemanw/CRM-15394
CRM-15394 - Fix credit card contribution link
Dave Greenberg [Tue, 30 Sep 2014 22:36:41 +0000 (15:36 -0700)]
Merge pull request #4283 from davecivicrm/CRM-15380
CRM-15380 - Replaces PR 4273.
Dave Greenberg [Tue, 30 Sep 2014 22:33:19 +0000 (15:33 -0700)]
CRM-15380 - Replaces PR 4273.
----------------------------------------
* CRM-15380:
https://issues.civicrm.org/jira/browse/CRM-15380
Coleman Watts [Tue, 30 Sep 2014 19:37:44 +0000 (15:37 -0400)]
CRM-15394 - Fix credit card contribution link
colemanw [Tue, 30 Sep 2014 17:44:47 +0000 (13:44 -0400)]
Merge pull request #4275 from mrpaulc/CRM-15389
CRM-15389 - js error in communication prefs
Tim Otten [Tue, 30 Sep 2014 15:43:22 +0000 (16:43 +0100)]
Merge pull request #4279 from totten/monishdeb-CRM-15343
CRM-15343 - CiviCase - Fix corruption of soft FKs (case-type-id)
Paul Campbell [Tue, 30 Sep 2014 15:41:06 +0000 (16:41 +0100)]
CRM-15383 - fix template loading for PDF letter
----------------------------------------
* CRM-15383: Can't load template when creating PDF letter
https://issues.civicrm.org/jira/browse/CRM-15383
Tim Otten [Tue, 30 Sep 2014 13:38:31 +0000 (14:38 +0100)]
Upgrade...FourFive.php - Tweak message
Tim Otten [Tue, 30 Sep 2014 13:38:15 +0000 (14:38 +0100)]
sql/4.5.alpha1.mysql.tpl - Fix syntax error
Rohan Katkar [Tue, 30 Sep 2014 12:35:09 +0000 (18:05 +0530)]
Webtest fix
Yashodha Chaku [Tue, 30 Sep 2014 12:27:57 +0000 (17:57 +0530)]
Merge pull request #4276 from yashodha/CRM-10206
CRM-10206
CiviCRM [Tue, 30 Sep 2014 12:03:36 +0000 (17:33 +0530)]
CRM-10206
Paul Campbell [Tue, 30 Sep 2014 11:27:20 +0000 (12:27 +0100)]
CRM-15389 - js error in communication prefs
----------------------------------------
* CRM-15389: Cannot change contact greetings due to Javascript error
https://issues.civicrm.org/jira/browse/CRM-15389
Eileen McNaughton [Tue, 30 Sep 2014 09:18:35 +0000 (22:18 +1300)]
CRM-15296 re-enable tests
Eileen McNaughton [Tue, 30 Sep 2014 07:39:33 +0000 (20:39 +1300)]
CRM-15296 - fix to make tests pass since this prevents an e-Notice BUT
need to check with Joe as the e-Notice seems to expose a real error and we should possibly
reverse this & uncomment a couple of lines in the tests that are tied up with this too
(in ContributionPageTest). the issue is that pending recurring contributions WITH memberships
have no line items
Eileen McNaughton [Tue, 30 Sep 2014 07:37:29 +0000 (20:37 +1300)]
CRM-15296 - fix to confirm payments for recurring transactions that are processed immediately (in a gentle way
Eileen McNaughton [Tue, 30 Sep 2014 09:14:45 +0000 (22:14 +1300)]
Merge pull request #4270 from eileenmcnaughton/CRM-15296-test-harness
CRM-5296 test harness
Yashodha Chaku [Tue, 30 Sep 2014 08:24:51 +0000 (13:54 +0530)]
Merge pull request #4268 from jitendrapurohit/webtestfixes
ParticipantMaxCountTest fix
eileenmcnaughton [Tue, 30 Sep 2014 07:57:27 +0000 (07:57 +0000)]
CRM-15296 make test committable so we can merge it in prior to merging fix
ie we mark the unfixed bits incomplete
Eileen McNaughton [Tue, 30 Sep 2014 07:35:27 +0000 (20:35 +1300)]
CRM-15296 test updates
Yashodha Chaku [Tue, 30 Sep 2014 07:39:49 +0000 (13:09 +0530)]
Merge pull request #4269 from rohankatkar/webtest_4.5.0
Webtest Fix
Eileen McNaughton [Tue, 30 Sep 2014 06:58:44 +0000 (19:58 +1300)]
Merge pull request #4267 from eileenmcnaughton/CRM-15296-e-notice
CRM-15296 enotice fix
jitendrapurohit [Tue, 30 Sep 2014 06:55:23 +0000 (12:25 +0530)]
ParticipantMaxCountTest fix
Rohan Katkar [Tue, 30 Sep 2014 06:54:19 +0000 (12:24 +0530)]
Webtest Fix
Eileen McNaughton [Tue, 30 Sep 2014 02:59:32 +0000 (15:59 +1300)]
CRM-15296 enotice fix
Dave Greenberg [Mon, 29 Sep 2014 23:41:27 +0000 (16:41 -0700)]
Merge pull request #4266 from davecivicrm/CRM-15387a
CRM-15387 - Add legacy support for honor_contact_id in contribution crea...
Dave Greenberg [Mon, 29 Sep 2014 23:40:41 +0000 (16:40 -0700)]
CRM-15387 - Add legacy support for honor_contact_id in contribution create api, fix legacy support for soft_credit_to so that soft_credit_type is set to default. Add tests for both.
----------------------------------------
* CRM-15387:
https://issues.civicrm.org/jira/browse/CRM-15387
Yashodha Chaku [Mon, 29 Sep 2014 22:26:57 +0000 (03:56 +0530)]
Merge pull request #4261 from rohankatkar/webtest_4.5.0
Webtest fix
colemanw [Mon, 29 Sep 2014 19:46:10 +0000 (15:46 -0400)]
Merge pull request #4264 from colemanw/css_sort
Fix weird color added to some datatables' sort column
Coleman Watts [Mon, 29 Sep 2014 19:44:42 +0000 (15:44 -0400)]
Fix weird color added to some datatables' sort column
Eileen McNaughton [Mon, 29 Sep 2014 19:17:58 +0000 (08:17 +1300)]
Merge pull request #4089 from jaapjansma/CRM-15268
Case update API doesn't return the correct values
colemanw [Mon, 29 Sep 2014 18:46:17 +0000 (14:46 -0400)]
Merge pull request #4263 from colemanw/More
More related data to refresh on contact summary tab
Coleman Watts [Mon, 29 Sep 2014 18:42:49 +0000 (14:42 -0400)]
More related data to refresh on contact summary tab
colemanw [Mon, 29 Sep 2014 17:54:20 +0000 (13:54 -0400)]
Merge pull request #4258 from jitendrapurohit/CRM-15368
CRM-15368
Tim Otten [Mon, 29 Sep 2014 13:51:25 +0000 (14:51 +0100)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-29-14-51-22
Tim Otten [Mon, 29 Sep 2014 13:48:31 +0000 (14:48 +0100)]
Merge pull request #4260 from futurefirst/4.4-gencode-fix
Added command-line switches to PHP in setup.sh to provide the DB credentials as defaults for mysql_real_escape_string
Rohan Katkar [Mon, 29 Sep 2014 13:04:29 +0000 (18:34 +0530)]
Webtest fix
kurund [Mon, 29 Sep 2014 12:17:27 +0000 (13:17 +0100)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-29-13-10-47
Conflicts:
CRM/Core/Payment.php
David Knoll [Mon, 29 Sep 2014 11:51:45 +0000 (12:51 +0100)]
Added command-line switches to PHP in setup.sh to provide the DB credentials as defaults for mysql_real_escape_string
Eileen McNaughton [Mon, 29 Sep 2014 10:18:58 +0000 (23:18 +1300)]
Merge pull request #4071 from eileenmcnaughton/CRM-15259
CRM-15259 use same method to determine whether to show updateBilling lin...
jitendrapurohit [Mon, 29 Sep 2014 09:07:04 +0000 (14:37 +0530)]
is_numeric check on CRM-15368
Eileen McNaughton [Mon, 29 Sep 2014 02:54:11 +0000 (15:54 +1300)]
Merge pull request #4256 from eileenmcnaughton/api-examples
Updated api examples
eileenmcnaughton [Mon, 29 Sep 2014 01:05:21 +0000 (01:05 +0000)]
fix don't document config
eileenmcnaughton [Sun, 28 Sep 2014 23:53:19 +0000 (23:53 +0000)]
updated examples
Eileen McNaughton [Sun, 28 Sep 2014 23:29:13 +0000 (12:29 +1300)]
Merge pull request #4255 from eileenmcnaughton/CRM-15296-unittest
Crm 15296 unittest
eileenmcnaughton [Sun, 28 Sep 2014 22:10:15 +0000 (22:10 +0000)]
CRM-15296 test for behaviour on renew with recurring
CRM-15296 mark incomplete portion of this test as incomplete so as not to commit failing tests
note that the incomplete part can be enabled when th issue is fixed
Alter Dummy processor to be test-friendly
Conflicts:
tests/phpunit/api/v3/ContributionPageTest.php
wq!
Coleman Watts [Sun, 28 Sep 2014 12:10:39 +0000 (08:10 -0400)]
Webtest fixes
Coleman Watts [Sun, 28 Sep 2014 02:28:29 +0000 (22:28 -0400)]
Additional webtest error check
colemanw [Sun, 28 Sep 2014 02:17:09 +0000 (22:17 -0400)]
Merge pull request #4254 from colemanw/checkForErrorsOnPage
Attempt to get better error messages from webtests
Coleman Watts [Sun, 28 Sep 2014 02:15:34 +0000 (22:15 -0400)]
Attempt to get better error messages from webtests
projects / civicrm-core.git / log