Tim Otten [Fri, 20 Mar 2015 03:41:38 +0000 (20:41 -0700)]
CRM-16132 - Fix warning, "mysqli_error() expects parameter 1 to be mysqli"
The error-reporting code tests whehter it should lookup errors using
mysql_error() or mysqli_error(). However, it incorrectly assumes that
function-existence implies active-link. But both functions may exist --
even though only one connection is active. The active, in-use connection is
determined by the DSN.
Tim Otten [Fri, 20 Mar 2015 02:43:39 +0000 (19:43 -0700)]
CRM-16080 - CRM.strings - Preserve variable placeholders
Dave Greenberg [Fri, 20 Mar 2015 01:33:16 +0000 (18:33 -0700)]
Merge pull request #5392 from pradpnayak/CRM-16015
Crm 16015
Dave Greenberg [Thu, 19 Mar 2015 16:48:31 +0000 (09:48 -0700)]
Merge pull request #5440 from davecivicrm/CRM-16099
CRM-16099 - friendly error when mapping from profile with no mapping pro...
Dave Greenberg [Thu, 19 Mar 2015 16:49:05 +0000 (09:49 -0700)]
CRM-16099 - friendly error when mapping from profile with no mapping provider configured.
----------------------------------------
* CRM-16099: Map Profile Results Smarty error when no mapping provider is configured AND strict warning in 4.6 on mapping page
https://issues.civicrm.org/jira/browse/CRM-16099
Kurund Jalmi [Thu, 19 Mar 2015 14:41:35 +0000 (20:11 +0530)]
Merge pull request #5429 from atif-shaikh/CRM-16114
CRM-16114 - Erroneous message on Wordpress install in 4.6b3
Kurund Jalmi [Thu, 19 Mar 2015 14:39:55 +0000 (20:09 +0530)]
Merge pull request #5420 from atif-shaikh/CRM-16126
CRM-16126 - Ignoring "test" mode flag while retrieving payment processor
Kurund Jalmi [Thu, 19 Mar 2015 14:35:53 +0000 (20:05 +0530)]
Merge pull request #5438 from jitendrapurohit/webtestfix46
webtest fix 4.6
jitendrapurohit [Thu, 19 Mar 2015 13:08:51 +0000 (18:38 +0530)]
webtest fix
Pradeep Nayak [Thu, 19 Mar 2015 09:59:29 +0000 (15:29 +0530)]
--CRM-16015, added code to update line item for participant
Pradeep Nayak [Thu, 19 Mar 2015 09:58:12 +0000 (15:28 +0530)]
-- CRM-16015, fixed notice error
----------------------------------------
* CRM-16015: line_item table should be updated when contribution financial type is changed.
https://issues.civicrm.org/jira/browse/CRM-16015
Pradeep Nayak [Sat, 14 Mar 2015 20:52:08 +0000 (02:22 +0530)]
--CRM-16015, followed code style
Pradeep Nayak [Sat, 14 Mar 2015 20:51:32 +0000 (02:21 +0530)]
--CRM-16015, code to update civicrm_line_item.financial_type_id when civicrm_contribution.financial_type_id is updated
Pradeep Nayak [Sat, 14 Mar 2015 20:50:58 +0000 (02:20 +0530)]
--CRM-16015, Added form rule to restrict financial type change for having different financial type in line item
colemanw [Wed, 18 Mar 2015 20:48:26 +0000 (16:48 -0400)]
Merge pull request #5434 from mlutfy/4.6-crm16119-2
CRM-16119: Fix Contact custom data multiple save/more buttons translation & more.
Mathieu Lutfy [Wed, 18 Mar 2015 18:37:44 +0000 (14:37 -0400)]
CRM-16119: PHP 5.3 syntax compatibility fix.
Mathieu Lutfy [Wed, 18 Mar 2015 18:22:50 +0000 (14:22 -0400)]
CRM-16119: Fix typos in xml menu titles (reported by r4zoli).
Mathieu Lutfy [Wed, 18 Mar 2015 17:42:59 +0000 (13:42 -0400)]
CRM-16119: TagsAndGroups: revert a ts() fix.
Mathieu Lutfy [Tue, 17 Mar 2015 00:13:35 +0000 (20:13 -0400)]
CRM-16119: Fix incorrect usages of ts().
Mathieu Lutfy [Mon, 16 Mar 2015 19:19:16 +0000 (15:19 -0400)]
CRM-16119: Fix Contact custom data multiple save/more buttons translation.
Mathieu Lutfy [Tue, 17 Mar 2015 01:13:17 +0000 (21:13 -0400)]
CRM-16119: Fix string typo.
colemanw [Wed, 18 Mar 2015 17:00:56 +0000 (13:00 -0400)]
Merge pull request #5393 from colemanw/plurals
Fix plural strings
Dave Greenberg [Wed, 18 Mar 2015 15:58:24 +0000 (08:58 -0700)]
Merge pull request #5428 from davecivicrm/CRM-14792
CRM-14792 - creates an activity when contacts are merged. Updates to PR ...
atif-shaikh [Wed, 18 Mar 2015 12:42:36 +0000 (18:12 +0530)]
CRM-16114 - Erroneous message on Wordpress install in 4.6b3
https://issues.civicrm.org/jira/browse/CRM-16114
CiviCRM [Wed, 18 Mar 2015 12:41:58 +0000 (05:41 -0700)]
Update version to 4.6.beta5
Coleman Watts [Sun, 15 Mar 2015 02:12:31 +0000 (22:12 -0400)]
Fix plural strings
Dave Greenberg [Wed, 18 Mar 2015 00:18:57 +0000 (17:18 -0700)]
CRM-14792 - creates an activity when contacts are merged. Updates to PR 5412 from Joanne (thanks Joanne!).
----------------------------------------
* CRM-14792: create activity with merge text on manual contact merge
https://issues.civicrm.org/jira/browse/CRM-14792
Dave Greenberg [Tue, 17 Mar 2015 23:24:34 +0000 (16:24 -0700)]
Merge pull request #5414 from lcdservices/CRM-16123b
CRM-16123 suppress PCP if target entity inactive
Dave Greenberg [Tue, 17 Mar 2015 20:22:06 +0000 (13:22 -0700)]
Merge pull request #5421 from monishdeb/CRM-15536
Hide participant_role option on choosing 'Also Add' for Event's Schedule Reminder
Eileen McNaughton [Tue, 17 Mar 2015 19:39:20 +0000 (08:39 +1300)]
Merge pull request #5397 from colemanw/eileenmcnaughton-CRM-16112
CRM-16112 add type for api _spec functions
Monish Deb [Tue, 17 Mar 2015 18:43:16 +0000 (00:13 +0530)]
Merge pull request #5405 from rohankatkar/webtest-4.6
Webtest 4.6
colemanw [Tue, 17 Mar 2015 18:36:59 +0000 (14:36 -0400)]
Merge pull request #5408 from relldoesphp/CRM-16107
CRM-16107
Kurund Jalmi [Tue, 17 Mar 2015 17:53:15 +0000 (23:23 +0530)]
Merge pull request #5423 from atif-shaikh/WebTestFixes
WebTest Fix
Kurund Jalmi [Tue, 17 Mar 2015 17:50:42 +0000 (23:20 +0530)]
Merge pull request #5418 from totten/4.6-ang-debug
CRM-16120 - crmUiDebug - Only display debug fields if ?angularDebug=1
Kurund Jalmi [Tue, 17 Mar 2015 17:49:20 +0000 (23:19 +0530)]
Merge pull request #5417 from rohankatkar/CRM14105
WordPress: mail_report Scheduled Job "access denied" unless report permission = Everyone
colemanw [Tue, 17 Mar 2015 13:57:47 +0000 (09:57 -0400)]
Merge pull request #5422 from colemanw/explorer
Api Explorer - Show marker for required fields
atif-shaikh [Tue, 17 Mar 2015 13:35:29 +0000 (19:05 +0530)]
WebTest Fix
Coleman Watts [Tue, 17 Mar 2015 13:31:16 +0000 (09:31 -0400)]
CRM-16112 - Revert MailingEventQueue spec change
Coleman Watts [Tue, 17 Mar 2015 13:28:50 +0000 (09:28 -0400)]
Api Explorer - Show marker for required fields
Monish Deb [Tue, 17 Mar 2015 10:18:18 +0000 (15:48 +0530)]
Merge pull request #5401 from jitendrapurohit/CRM-16104
Record not saved on Multi record Profile Create/Edit Mode fix
Web Access [Tue, 17 Mar 2015 10:14:30 +0000 (15:44 +0530)]
Use of flexible selectors
Web Access [Mon, 16 Mar 2015 13:09:15 +0000 (18:39 +0530)]
Typo Fix
Web Access [Mon, 16 Mar 2015 13:05:01 +0000 (18:35 +0530)]
Webtest Fixes
monishdeb [Tue, 17 Mar 2015 10:08:07 +0000 (15:38 +0530)]
Hide participant_role option on choosing 'Also Add' for Event's Schedule Reminder
atif-shaikh [Tue, 17 Mar 2015 07:39:11 +0000 (13:09 +0530)]
CRM-16126 - Ignoring "test" mode flag while retrieving payment processor
https://issues.civicrm.org/jira/browse/CRM-16126
Tim Otten [Tue, 17 Mar 2015 05:49:32 +0000 (22:49 -0700)]
Merge pull request #5411 from totten/4.6-unused-test
Remove unused, boilerplate test file
Tim Otten [Tue, 17 Mar 2015 05:38:24 +0000 (22:38 -0700)]
CRM-16120 - crmUiDebug - Only display debug fields if ?angularDebug=1
We've been outputting a collapsible debug panel by default. This completely
hides (or shows) the debug panel depending on whether parameter
"angularDebug" is set.
Note that there are also browser plugins which are richer, more flexible,
more thorough, and it's probably better to install one of those. However,
it's tough to standardize on one plugin (b/c they're different for each
browser and because we can't bundle them into buildkit). In a crunch (e.g.
when debugging on a non-developer's workstation), the parameter could still
be helpful.
Web Access [Tue, 17 Mar 2015 04:41:24 +0000 (10:11 +0530)]
Fix for CRM-14105
Brian Shaughnessy [Tue, 17 Mar 2015 00:58:41 +0000 (20:58 -0400)]
CRM-16123 suppress PCP if target entity inactive
Dave Greenberg [Mon, 16 Mar 2015 22:17:35 +0000 (15:17 -0700)]
Merge pull request #5387 from monishdeb/4.6
4.6 webtest fixes
Tim Otten [Mon, 16 Mar 2015 20:37:19 +0000 (13:37 -0700)]
Remove unused, boilerplate test file
This appears to be left from an abortive attempt at testing with
Jasmine/Karma. The actual tests are in a different folder (tests/karma),
and this test doesn't really do anything.
Coleman Watts [Mon, 16 Mar 2015 19:13:46 +0000 (15:13 -0400)]
CRM-16112 - Revert addition to UFField api
Eileen McNaughton [Sun, 15 Mar 2015 22:11:58 +0000 (11:11 +1300)]
CRM-16112 add type for api _spec functions
(towards always specifying type)
colemanw [Mon, 16 Mar 2015 18:16:05 +0000 (14:16 -0400)]
Merge pull request #5396 from colemanw/CRM-13072
CRM-13072 - Fix typo in api getfields sequential
colemanw [Mon, 16 Mar 2015 16:28:20 +0000 (12:28 -0400)]
Merge pull request #5409 from colemanw/CRM-16117
CRM-16117 - Fix content disappearing when ajax paging
monishdeb [Mon, 16 Mar 2015 16:25:24 +0000 (21:55 +0530)]
recurring webtest fixes
monishdeb [Sat, 14 Mar 2015 13:30:19 +0000 (19:00 +0530)]
4.6 Webtest fixes
Coleman Watts [Mon, 16 Mar 2015 15:39:46 +0000 (11:39 -0400)]
CRM-16117 - Fix content disappearing when ajax paging
colemanw [Mon, 16 Mar 2015 15:12:20 +0000 (11:12 -0400)]
Merge pull request #5404 from jitendrapurohit/webtest46
webtest fixes
Tyrell Cook [Mon, 16 Mar 2015 15:06:10 +0000 (11:06 -0400)]
CRM-16107
jitendrapurohit [Mon, 16 Mar 2015 13:06:08 +0000 (18:36 +0530)]
webtest fixes
Eileen McNaughton [Mon, 16 Mar 2015 12:34:51 +0000 (01:34 +1300)]
Merge pull request #5402 from eileenmcnaughton/test
make mailing failure tests less specific. We try not to make failure tes...
kurund [Mon, 16 Mar 2015 11:54:51 +0000 (17:24 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-03-16-17-24-33
Eileen McNaughton [Mon, 16 Mar 2015 08:38:56 +0000 (21:38 +1300)]
make mailing failure tests less specific. We try not to make failure tests too specific, in this case adding 'type'
to spec will change the message & we may as well not check it rather than changing the test
jitendrapurohit [Mon, 16 Mar 2015 07:09:57 +0000 (12:39 +0530)]
extra line removal
jitendrapurohit [Mon, 16 Mar 2015 07:08:13 +0000 (12:38 +0530)]
Record not saved on Multi record Profile Create/Edit Mode
colemanw [Mon, 16 Mar 2015 03:02:15 +0000 (23:02 -0400)]
Merge pull request #5399 from colemanw/CRM-16115
CRM-16115 - Fix campaign datatable headers
Coleman Watts [Mon, 16 Mar 2015 03:00:02 +0000 (23:00 -0400)]
CRM-16115 - Fix campaign datatable headers
colemanw [Mon, 16 Mar 2015 02:50:42 +0000 (22:50 -0400)]
Merge pull request #5398 from colemanw/CRM-16103
CRM-16103 - Improve mailing search form layout
Coleman Watts [Mon, 16 Mar 2015 02:23:17 +0000 (22:23 -0400)]
CRM-16103 - Improve mailing search form layout
Coleman Watts [Sun, 15 Mar 2015 23:44:08 +0000 (19:44 -0400)]
CRM-13072 - Fix typo in api getfields sequential
colemanw [Sun, 15 Mar 2015 23:34:32 +0000 (19:34 -0400)]
Merge pull request #5394 from colemanw/api
Api explorer improvement and getfields description cleanup
Coleman Watts [Sun, 15 Mar 2015 22:09:27 +0000 (18:09 -0400)]
API - Improve getfields for getrefcount
Coleman Watts [Sun, 15 Mar 2015 16:43:07 +0000 (12:43 -0400)]
API - don't put burden of sequential options on spec functions
Coleman Watts [Sun, 15 Mar 2015 15:55:19 +0000 (11:55 -0400)]
API - add field options to getoptions metadata
Dave Greenberg [Sun, 15 Mar 2015 15:41:06 +0000 (08:41 -0700)]
Merge pull request #5385 from davecivicrm/CRM-16109
Crm 16109
Coleman Watts [Sun, 15 Mar 2015 04:57:40 +0000 (00:57 -0400)]
API Explorer - fix getvalue action return field
Coleman Watts [Sun, 15 Mar 2015 04:34:07 +0000 (00:34 -0400)]
API - provide more metadata for generic actions
Coleman Watts [Sun, 15 Mar 2015 03:04:45 +0000 (23:04 -0400)]
Api explorer - limit multiselect to certain actions
Coleman Watts [Sun, 15 Mar 2015 02:49:37 +0000 (22:49 -0400)]
Cleanup api field descriptions
Coleman Watts [Sun, 15 Mar 2015 02:49:19 +0000 (22:49 -0400)]
Api explorer - render boolean fields as yes-no select
colemanw [Sat, 14 Mar 2015 18:26:12 +0000 (14:26 -0400)]
Merge pull request #5389 from mlutfy/4.6-crm16111
CRM-16111: Translation string fixes (reported by r4zoli).
Mathieu Lutfy [Sat, 14 Mar 2015 16:29:13 +0000 (12:29 -0400)]
CRM-16111: Translation string fixes (4.6 review).
Mathieu Lutfy [Sat, 14 Mar 2015 15:08:14 +0000 (11:08 -0400)]
CRM-16111: Translation string fixes (reported by r4zoli).
Mathieu Lutfy [Sat, 14 Mar 2015 14:49:26 +0000 (10:49 -0400)]
Merge pull request #5388 from mlutfy/4.6-crm15832-3
CRM-15832: Typo fix in tools/bin/scripts/create-pot-files
Mathieu Lutfy [Sat, 14 Mar 2015 14:45:48 +0000 (10:45 -0400)]
CRM-16111: Translation string fixes (reported by r4zoli).
Mathieu Lutfy [Sat, 14 Mar 2015 14:42:57 +0000 (10:42 -0400)]
CRM-16111: Translation string fixes (reported by r4zoli).
Mathieu Lutfy [Sat, 14 Mar 2015 14:26:53 +0000 (10:26 -0400)]
CRM-15832: Typo fix in tools/bin/scripts/create-pot-files
colemanw [Sat, 14 Mar 2015 00:20:03 +0000 (20:20 -0400)]
Merge pull request #5383 from deepak-srivastava/CRM-15932
CRM-15932 - Warning Fix: call_user_func() expects parameter 1 to be a valid callback...
Dave Greenberg [Sat, 14 Mar 2015 00:17:23 +0000 (17:17 -0700)]
CRM-16109 - suppress fee section for waitlist and approval-required registration flows. Fix failing webtest: testEventApprovalRegistration WebTest_Event_AddEventTest
----------------------------------------
* CRM-16109: Confusing empty display of fees section during confirmation and thank-you for waitlisted and require-approval registrations
https://issues.civicrm.org/jira/browse/CRM-16109
Dave Greenberg [Fri, 13 Mar 2015 23:57:17 +0000 (16:57 -0700)]
CRM-16109 - suppress fee section for waitlist and approval-required registration flows.
----------------------------------------
* CRM-16109: Confusing empty display of fees section during confirmation and thank-you for waitlisted and require-approval registrations
https://issues.civicrm.org/jira/browse/CRM-16109
deepak-srivastava [Fri, 13 Mar 2015 23:04:57 +0000 (23:04 +0000)]
CI: warning fix
Dave Greenberg [Fri, 13 Mar 2015 22:08:26 +0000 (15:08 -0700)]
Merge pull request #5384 from davecivicrm/CRM-16108
CRM-16108 - Backport to 4.6.
Dave Greenberg [Fri, 13 Mar 2015 22:08:47 +0000 (15:08 -0700)]
CRM-16108 - Backport to 4.6.
----------------------------------------
* CRM-16108: Some URL's cannot be parsed
https://issues.civicrm.org/jira/browse/CRM-16108
deepak-srivastava [Fri, 13 Mar 2015 21:54:01 +0000 (21:54 +0000)]
Warning Fix: call_user_func() expects parameter 1 to be a valid callback, second array member is not a valid method
colemanw [Fri, 13 Mar 2015 20:31:54 +0000 (16:31 -0400)]
Merge pull request #5374 from mlutfy/4.6-crm-15832-sh
CRM-15832: import create-pot-files and split partials/js in their respective components
colemanw [Fri, 13 Mar 2015 18:23:06 +0000 (14:23 -0400)]
Merge pull request #5326 from jmcclelland/smart-groups-data
Smart groups data
colemanw [Fri, 13 Mar 2015 18:18:05 +0000 (14:18 -0400)]
Merge pull request #5379 from rohankatkar/webtest-4.6
Webtest Fixes
colemanw [Fri, 13 Mar 2015 18:17:29 +0000 (14:17 -0400)]
Merge pull request #5378 from atif-shaikh/WebtestFix
WebtestFix
colemanw [Fri, 13 Mar 2015 18:16:54 +0000 (14:16 -0400)]
Merge pull request #5377 from jitendrapurohit/webtest46
webtest fixes
projects / civicrm-core.git / log