kurund [Tue, 14 Oct 2014 20:23:34 +0000 (01:53 +0530)]
CRM-15436, fixed typo
colemanw [Tue, 14 Oct 2014 19:32:08 +0000 (15:32 -0400)]
Merge pull request #4354 from colemanw/CRM-14949
CRM-14949 Fix access_callback for l10n-js
Monish Deb [Tue, 14 Oct 2014 12:00:09 +0000 (17:30 +0530)]
Merge pull request #4358 from monishdeb/CRM-15430
CRM-15430 indentation fixes
monishdeb [Tue, 14 Oct 2014 11:54:15 +0000 (17:24 +0530)]
CRM-15430 indentation fixes
----------------------------------------
* CRM-15430: clarify code and functionality for hook_civicrm_dashboard_defaults
https://issues.civicrm.org/jira/browse/CRM-15430
Monish Deb [Tue, 14 Oct 2014 11:44:34 +0000 (17:14 +0530)]
Merge pull request #4327 from jmcclelland/default-dashlets
Default dashlets
Yashodha Chaku [Tue, 14 Oct 2014 07:59:25 +0000 (13:29 +0530)]
Merge pull request #4357 from rohankatkar/Webtests
Webtest fix
Yashodha Chaku [Tue, 14 Oct 2014 07:58:23 +0000 (13:28 +0530)]
Merge pull request #4355 from rohankatkar/CRM-15420
Fix for CRM-15420
Rohan Katkar [Tue, 14 Oct 2014 07:12:47 +0000 (12:42 +0530)]
Webtest fix
kurund [Tue, 14 Oct 2014 05:52:18 +0000 (11:22 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-10-14-11-16-10
Conflicts:
api/v3/System.php
tests/phpunit/api/v3/SystemTest.php
Rohan Katkar [Tue, 14 Oct 2014 05:02:14 +0000 (10:32 +0530)]
Fix for CRM-15420
Coleman Watts [Tue, 14 Oct 2014 01:26:18 +0000 (21:26 -0400)]
CRM-14949 Fix access_callback for l10n-js
Dave Greenberg [Tue, 14 Oct 2014 00:34:28 +0000 (17:34 -0700)]
Merge pull request #4353 from davecivicrm/CRM-15432
CRM-15432 - hide payment options block along with billing info when pric...
Dave Greenberg [Tue, 14 Oct 2014 00:33:14 +0000 (17:33 -0700)]
CRM-15432 - hide payment options block along with billing info when price set value total is zero.
----------------------------------------
* CRM-15432:
https://issues.civicrm.org/jira/browse/CRM-15432
colemanw [Mon, 13 Oct 2014 23:41:31 +0000 (19:41 -0400)]
Merge pull request #4340 from colemanw/deprecatedApi
Display deprecation notices in api output and api explorer
Coleman Watts [Mon, 13 Oct 2014 20:59:51 +0000 (16:59 -0400)]
CRM-15417 - Add unit test for getactions
Coleman Watts [Mon, 13 Oct 2014 19:17:53 +0000 (15:17 -0400)]
CRM-15417 - fix getfields output
Coleman Watts [Fri, 10 Oct 2014 19:59:34 +0000 (15:59 -0400)]
CRM-15417 - Show api deprecation warnings in console
Coleman Watts [Fri, 10 Oct 2014 18:23:03 +0000 (14:23 -0400)]
CRM-15417 - Add safety checks to api deprecation utils
Coleman Watts [Fri, 10 Oct 2014 02:52:14 +0000 (22:52 -0400)]
CRM-15417 - Display deprecation notices in api output and api explorer
colemanw [Mon, 13 Oct 2014 18:46:18 +0000 (14:46 -0400)]
Merge pull request #4352 from colemanw/CRM-15450
CRM-15450 - Fix D6 to render scripts in correct order
Coleman Watts [Mon, 13 Oct 2014 18:44:39 +0000 (14:44 -0400)]
CRM-15450 - Also disable D6 adding inline styles for good measure
Coleman Watts [Mon, 13 Oct 2014 18:37:50 +0000 (14:37 -0400)]
CRM-15450 - Fix D6 to render scripts in correct order
Yashodha Chaku [Mon, 13 Oct 2014 10:12:19 +0000 (15:42 +0530)]
Merge pull request #4349 from rohankatkar/CRM-15434
Changes for CRM-15434
Yashodha Chaku [Mon, 13 Oct 2014 10:09:48 +0000 (15:39 +0530)]
Merge pull request #4347 from colemanw/CRM-15443
CRM-15443 - add unit test to ensure getlist api does not return deleted or deceased contacts
Rohan Katkar [Mon, 13 Oct 2014 05:23:06 +0000 (10:53 +0530)]
Minor changes for CRM-15434
Coleman Watts [Sun, 12 Oct 2014 23:21:10 +0000 (19:21 -0400)]
CRM-15443 - add unit test to ensure getlist api does not return deleted or deceased contacts
Dave Greenberg [Sun, 12 Oct 2014 23:21:01 +0000 (16:21 -0700)]
Merge pull request #4346 from colemanw/CRM-15443
CRM-15443 - Exclude deceased contacts from EntityRef results
Eileen McNaughton [Sun, 12 Oct 2014 20:05:17 +0000 (09:05 +1300)]
Merge pull request #4344 from elcapo/CRM-15441
CRM-15441 - Add a few missing translation {ts} tags
Coleman Watts [Sat, 11 Oct 2014 19:16:55 +0000 (15:16 -0400)]
CRM-15443 - Exclude deceased contacts from EntityRef results
colemanw [Sat, 11 Oct 2014 18:06:30 +0000 (14:06 -0400)]
Merge pull request #4337 from colemanw/explorerEntityRef
API Explorer - use entityRef for FK fields
Dave Greenberg [Fri, 10 Oct 2014 21:19:41 +0000 (14:19 -0700)]
Merge pull request #4295 from eileenmcnaughton/CRM-15408
CRM-15280 - Advanced Search not working for deleted Contacts
colemanw [Fri, 10 Oct 2014 15:43:52 +0000 (11:43 -0400)]
Merge pull request #4343 from jitendrapurohit/webtestfixes
webtest fix
colemanw [Fri, 10 Oct 2014 15:43:15 +0000 (11:43 -0400)]
Merge pull request #4342 from rohankatkar/webtest-4.5.0
webtest fix
colemanw [Fri, 10 Oct 2014 14:49:29 +0000 (10:49 -0400)]
Merge pull request #4345 from colemanw/Document
Document deprecation of AdvMultiSelect widget
Coleman Watts [Fri, 10 Oct 2014 14:45:46 +0000 (10:45 -0400)]
Add missing ts
Coleman Watts [Fri, 10 Oct 2014 14:44:55 +0000 (10:44 -0400)]
Document deprecation of AdvMultiSelect widget
elcapo [Fri, 10 Oct 2014 13:57:23 +0000 (15:57 +0200)]
CRM-15441 - Add a few missing translation (TS) tags
colemanw [Fri, 10 Oct 2014 13:29:31 +0000 (09:29 -0400)]
Merge pull request #4339 from colemanw/genericApiActions
Fix api getActions to also load generic actions
jitendrapurohit [Fri, 10 Oct 2014 13:28:26 +0000 (18:58 +0530)]
webtest fix
Rohan Katkar [Fri, 10 Oct 2014 13:01:30 +0000 (18:31 +0530)]
webtest fix
Kurund Jalmi [Fri, 10 Oct 2014 07:39:14 +0000 (13:09 +0530)]
Merge pull request #4117 from totten/4.4-system-get
api/v3/System - Add a "get" operation to return basic system info
Kurund Jalmi [Fri, 10 Oct 2014 07:35:18 +0000 (13:05 +0530)]
Merge pull request #4335 from elcapo/CRM-15434
CRM-15434 - Fix mailing search doesn't work in non-English languages
Yashodha Chaku [Fri, 10 Oct 2014 06:13:34 +0000 (11:43 +0530)]
Merge pull request #4341 from yashodha/version-fix
version fixes
CiviCRM [Fri, 10 Oct 2014 06:32:39 +0000 (12:02 +0530)]
version fixes
Coleman Watts [Fri, 10 Oct 2014 02:50:20 +0000 (22:50 -0400)]
Fix api getActions to also load generic actions
colemanw [Thu, 9 Oct 2014 22:56:44 +0000 (18:56 -0400)]
Merge pull request #4338 from mlutfy/4.5-crm15435
CRM-15435: Fix custom group weights (mostly for Case ActivityView).
Mathieu Lutfy [Thu, 9 Oct 2014 18:20:48 +0000 (14:20 -0400)]
CRM-15435: Fix custom group weights (mostly for Case ActivityView).
Coleman Watts [Thu, 9 Oct 2014 18:17:55 +0000 (14:17 -0400)]
Fix contact entityRef placeholder text
Coleman Watts [Thu, 9 Oct 2014 18:17:30 +0000 (14:17 -0400)]
Normalize translated string
Coleman Watts [Thu, 9 Oct 2014 18:16:49 +0000 (14:16 -0400)]
Add basic entityRef support for activities
Coleman Watts [Thu, 9 Oct 2014 18:16:00 +0000 (14:16 -0400)]
API Explorer - use entityRef for FK fields
Yashodha Chaku [Thu, 9 Oct 2014 14:20:45 +0000 (19:50 +0530)]
Merge pull request #4336 from jitendrapurohit/webtestfixes
Webtest fixes
jitendrapurohit [Thu, 9 Oct 2014 14:19:30 +0000 (19:49 +0530)]
Webtest fixes
elcapo [Thu, 9 Oct 2014 13:45:31 +0000 (15:45 +0200)]
CRM-15434 - Fix mailing search doesn't work in non-English languages
Kurund Jalmi [Thu, 9 Oct 2014 12:38:45 +0000 (18:08 +0530)]
Merge pull request #4334 from atif-shaikh/CRM-15343
CRM-15343 - 4.5.0 corrupts soft references to case-types
Yashodha Chaku [Thu, 9 Oct 2014 12:08:42 +0000 (17:38 +0530)]
Merge pull request #4223 from atif-shaikh/CRM-15366
CRM-15366 - Gift Membership Bug Fixes
atif-shaikh [Thu, 9 Oct 2014 10:31:01 +0000 (16:01 +0530)]
CRM-15343 - 4.5.0 corrupts soft references to case-types
https://issues.civicrm.org/jira/browse/CRM-15343
Yashodha Chaku [Thu, 9 Oct 2014 10:13:24 +0000 (15:43 +0530)]
Merge pull request #4332 from rohankatkar/webtest-4.5.0
webtest fixes
Yashodha Chaku [Thu, 9 Oct 2014 10:12:55 +0000 (15:42 +0530)]
Merge pull request #4333 from jitendrapurohit/webtestfixes
js break after editing Notes on Contact Summary Page
jitendrapurohit [Thu, 9 Oct 2014 09:26:52 +0000 (14:56 +0530)]
js break after editing Notes on Contact Summary Page
Rohan Katkar [Thu, 9 Oct 2014 08:41:21 +0000 (14:11 +0530)]
webtest fixes
colemanw [Thu, 9 Oct 2014 05:54:33 +0000 (01:54 -0400)]
Merge pull request #4331 from colemanw/explorer
Improve API explorer handling of operators
Coleman Watts [Thu, 9 Oct 2014 05:53:54 +0000 (01:53 -0400)]
API explorer - fix getfields action select
Coleman Watts [Thu, 9 Oct 2014 05:45:14 +0000 (01:45 -0400)]
Improve API explorer handling of operators
Dave Greenberg [Wed, 8 Oct 2014 22:00:15 +0000 (15:00 -0700)]
Merge pull request #4328 from davecivicrm/payProcHelp
Add link to basic payment processor inline help screen on the Payment Pr...
Dave Greenberg [Wed, 8 Oct 2014 21:53:36 +0000 (14:53 -0700)]
Add link to basic payment processor inline help screen on the Payment Processor listings page (in addition to the create and edit form).
Jamie McClelland [Wed, 8 Oct 2014 18:23:01 +0000 (14:23 -0400)]
CRM-15430 - ensure default dashlets properly initialized for new users.
----------------------------------------
* CRM-15430: clarify code and functionality for hook_civicrm_dashboard_defaults
https://issues.civicrm.org/jira/browse/CRM-15430
Yashodha Chaku [Wed, 8 Oct 2014 12:47:05 +0000 (18:17 +0530)]
Merge pull request #4326 from rohankatkar/webtest_4.5.0
Webtest fix
Rohan Katkar [Wed, 8 Oct 2014 12:31:55 +0000 (18:01 +0530)]
Webtest fix
Yashodha Chaku [Wed, 8 Oct 2014 07:07:35 +0000 (12:37 +0530)]
Merge pull request #4316 from jitendrapurohit/CRM-15423
CRM-15423
Yashodha Chaku [Wed, 8 Oct 2014 06:34:41 +0000 (12:04 +0530)]
Merge pull request #4325 from rohankatkar/CRM_15421
Fix for CRM-15421
Rohan Katkar [Wed, 8 Oct 2014 06:27:34 +0000 (11:57 +0530)]
Additional changes for CRM-15421
Yashodha Chaku [Wed, 8 Oct 2014 05:58:31 +0000 (11:28 +0530)]
Merge pull request #4317 from atif-shaikh/CRM-15379
CRM-15379 - Find Participants : Actual participant count is incorrect wh...
Yashodha Chaku [Wed, 8 Oct 2014 04:37:54 +0000 (10:07 +0530)]
Merge pull request #4322 from jmcclelland/mass-sms-logging
CRM-15426 - record SMS errors
Dave Greenberg [Wed, 8 Oct 2014 00:55:39 +0000 (17:55 -0700)]
Merge pull request #4324 from davecivicrm/CRM-15234
CRM-15234 - Modify the upgrade versions of the 2 sample message template...
Dave Greenberg [Tue, 7 Oct 2014 23:50:19 +0000 (16:50 -0700)]
CRM-15234 - Modify the upgrade versions of the 2 sample message templates.
----------------------------------------
* CRM-15234:
https://issues.civicrm.org/jira/browse/CRM-15234
Dave Greenberg [Tue, 7 Oct 2014 23:47:46 +0000 (16:47 -0700)]
Merge pull request #4323 from davecivicrm/CRM-15234
Crm 15234
Dave Greenberg [Tue, 7 Oct 2014 23:46:11 +0000 (16:46 -0700)]
CRM-15234 - Add literal tags to sample responsive templates and regen new generated.mysql.
----------------------------------------
* CRM-15234:
https://issues.civicrm.org/jira/browse/CRM-15234
Dave Greenberg [Tue, 7 Oct 2014 22:51:11 +0000 (15:51 -0700)]
CRM-15234 - prevent loss of responsive HTML markup due to CIVICRM_MAIL_SMARTY being enabled. NOTE: There is no easy way to fix this for upgrades since we do not have a known DB handle for the sample msg_template rows.
----------------------------------------
* CRM-15234:
https://issues.civicrm.org/jira/browse/CRM-15234
Dave Greenberg [Tue, 7 Oct 2014 22:43:29 +0000 (15:43 -0700)]
Merge pull request #4321 from davecivicrm/CRM-15374a
CRM-15374 - adjust query in getPaymentInfo to prevent extraneous fee-rel...
Dave Greenberg [Tue, 7 Oct 2014 22:43:05 +0000 (15:43 -0700)]
Merge pull request #4320 from yashodha/CRM-15372
CRM-15372 :patch to fix fee amount replacing amount
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
Jamie McClelland [Tue, 7 Oct 2014 19:16:43 +0000 (15:16 -0400)]
CRM-15426 - record SMS errors
----------------------------------------
* CRM-15426: Errors when sending Bulk SMS messages are not recorded any where
https://issues.civicrm.org/jira/browse/CRM-15426
Dave Greenberg [Tue, 7 Oct 2014 17:25:56 +0000 (10:25 -0700)]
CRM-15374 - adjust query in getPaymentInfo to prevent extraneous fee-related rows showing up in Payment Info page.
----------------------------------------
* CRM-15374:
https://issues.civicrm.org/jira/browse/CRM-15374
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
CiviCRM [Tue, 7 Oct 2014 14:24:22 +0000 (19:54 +0530)]
CRM-15372 :patch to fix fee amount replacing amount
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
jitendrapurohit [Tue, 7 Oct 2014 12:59:28 +0000 (18:29 +0530)]
CRM-15423
atif-shaikh [Tue, 7 Oct 2014 12:58:37 +0000 (18:28 +0530)]
CRM-15379 - Find Participants : Actual participant count is incorrect when multiple price field options are selected
https://issues.civicrm.org/jira/browse/CRM-15379
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
projects / civicrm-core.git / log