eileen [Tue, 12 Jan 2021 02:51:22 +0000 (15:51 +1300)]
[NFC] Minor code cleanup
Eileen McNaughton [Tue, 12 Jan 2021 00:01:27 +0000 (13:01 +1300)]
Merge pull request #19363 from seamuslee001/regen_generated
(NFC) Regenerate civicrm_generated.mysql
Seamus Lee [Mon, 11 Jan 2021 22:08:12 +0000 (09:08 +1100)]
(NFC) Regenerate civicrm_generated.mysql
Eileen McNaughton [Mon, 11 Jan 2021 21:56:40 +0000 (10:56 +1300)]
Merge pull request #19342 from alifrumin/mailmenu2
Update permissions for "CiviCRM Admin Menu -> Mailings -> Message Templates" nav item
Eileen McNaughton [Mon, 11 Jan 2021 21:47:46 +0000 (10:47 +1300)]
Merge pull request #19362 from eileenmcnaughton/anet2
Set contribution_page_id from template contribution
Eileen McNaughton [Mon, 11 Jan 2021 21:40:37 +0000 (10:40 +1300)]
Merge pull request #19323 from seamuslee001/default_handler_exception
REF Update CiviCRM default PEAR Error handling to be exception rather…
Seamus Lee [Mon, 11 Jan 2021 21:24:13 +0000 (08:24 +1100)]
Merge pull request #19361 from demeritcowboy/arrested-development
dev/core#2241 - Deprecate direct calls to isDevelopment()
Seamus Lee [Mon, 11 Jan 2021 20:41:45 +0000 (07:41 +1100)]
Merge pull request #19360 from agileware/CIVICRM-1638
When two contacts, Contact A and Contact B have the same email address, if Contact A is deleted then Contact B is incorrectly excluded from mailings, does not receive emails
eileen [Mon, 11 Jan 2021 20:19:56 +0000 (09:19 +1300)]
Set contribution_page_id from template contribution
This is tested in AuthorizeNetIPNTest::testIPNPaymentRecurNoReceipt
demeritcowboy [Mon, 11 Jan 2021 16:35:03 +0000 (11:35 -0500)]
deprecate direct calls to isDevelopment
colemanw [Mon, 11 Jan 2021 13:46:27 +0000 (08:46 -0500)]
Merge pull request #19358 from colemanw/dashboardStatus
Dashboard: Improve status messages when moving/deleting dashlets
CiviCRM [Mon, 11 Jan 2021 07:32:38 +0000 (07:32 +0000)]
Set version to 5.35.alpha1
CiviCRM [Mon, 11 Jan 2021 07:01:43 +0000 (07:01 +0000)]
Set version to 5.34.beta1
Tim Otten [Mon, 11 Jan 2021 06:38:47 +0000 (22:38 -0800)]
Merge pull request #19359 from totten/master-dao-update
Regenerate DAOs
Justin Freeman [Mon, 11 Jan 2021 05:42:09 +0000 (16:42 +1100)]
CIVICRM-1638 When two contacts, Contact A and Contact B have the same email address, if Contact A is deleted then Contact B is incorrectly excluded from mailings, does not receive emails
Tim Otten [Mon, 11 Jan 2021 04:53:10 +0000 (20:53 -0800)]
Mailing Recipients - Update to match
This is a follow-up to https://github.com/civicrm/civicrm-core/pull/19351 which captures the
spelling fix ("Recipientses").
Tim Otten [Mon, 11 Jan 2021 04:51:59 +0000 (20:51 -0800)]
Regenerate DAOs
This is a follow-up to https://github.com/civicrm/civicrm-core/pull/19351 to
reflect recent changes in some schema files.
Tim Otten [Mon, 11 Jan 2021 03:37:54 +0000 (19:37 -0800)]
Merge pull request #19357 from totten/master-joomla
distmaker - Don't require dummy config file for building Joomla
Coleman Watts [Mon, 11 Jan 2021 03:06:12 +0000 (22:06 -0500)]
Dashboard: Improve status messages when moving/deleting dashlets
Tim Otten [Mon, 11 Jan 2021 00:37:16 +0000 (16:37 -0800)]
(REF) distmaker - Simplify joomlaxml.php input-parsing with "??" notation
Makes this much easier to read.
Honestly, I'm not sure it should even be checking $_SERVER like this --
$argv is probably enough, and I suspect that $_SERVER won't give the
expected values in most PHP environments.
Tim Otten [Mon, 11 Jan 2021 00:29:26 +0000 (16:29 -0800)]
distmaker - Don't require dummy config file for building Joomla
BEFORE: To run distmaker and produce Joomla ZIPs, you need to create a dummy settings file.
For example, this is how `cividist` does it:
https://github.com/civicrm/civicrm-buildkit/blob/v19.07.0/bin/cividist#L119-L121
It seems that is just a long-winded way of setting up the Civi classloader. (It wouldn't
make sense to use any other Civi services this is a pre-bootstrap environment.)
AFTER: The dummy file is neither needed nor used. We just get the classloader directly.
Seamus Lee [Sun, 10 Jan 2021 21:41:02 +0000 (08:41 +1100)]
Merge pull request #19356 from demeritcowboy/add-timeline-buttons-fix
dev/core#2292 - Add Timeline dropdown on Manage Case not working after buttons UI changes
demeritcowboy [Sun, 10 Jan 2021 15:05:39 +0000 (10:05 -0500)]
timeline fix after buttons changes
Seamus Lee [Sun, 10 Jan 2021 20:19:25 +0000 (07:19 +1100)]
Merge pull request #19355 from demeritcowboy/php74-more3
php74 compatibility - Backwards arguments to implode are deprecated
Monish Deb [Sun, 10 Jan 2021 16:26:58 +0000 (21:56 +0530)]
Merge pull request #19069 from eileenmcnaughton/test
Remove unreachable customGroup section in online event receipt
demeritcowboy [Sun, 10 Jan 2021 12:26:41 +0000 (07:26 -0500)]
backwards arguments are deprecated
Eileen McNaughton [Sun, 10 Jan 2021 05:31:17 +0000 (18:31 +1300)]
Merge pull request #17889 from mattwire/freezerecur
Disable frequency/interval fields if not required on backend contribution forms
Eileen McNaughton [Sun, 10 Jan 2021 03:30:41 +0000 (16:30 +1300)]
Merge pull request #19351 from mlutfy/fixSoftLoc
[NFC] Fix Contribution Soft Credit entity translation
Seamus Lee [Sat, 9 Jan 2021 20:11:20 +0000 (07:11 +1100)]
Merge pull request #19354 from demeritcowboy/php74-more-more
php 7.4 compatiblity - Clarify order for nested ternary operator
colemanw [Sat, 9 Jan 2021 19:11:48 +0000 (14:11 -0500)]
Merge pull request #19353 from demeritcowboy/php74-more
php 7.4 compatibility - more curly braces
demeritcowboy [Sat, 9 Jan 2021 17:23:47 +0000 (12:23 -0500)]
php 7.4 compatiblity - clarify order
demeritcowboy [Sat, 9 Jan 2021 17:04:11 +0000 (12:04 -0500)]
php 7.4 compatibility
Seamus Lee [Sat, 9 Jan 2021 00:56:00 +0000 (11:56 +1100)]
Merge pull request #19349 from totten/master-crypt-setup
dev/core#2258 - Define CIVICRM_CRED_KEYS during installation
Seamus Lee [Fri, 8 Jan 2021 20:06:55 +0000 (07:06 +1100)]
Merge pull request #19350 from demeritcowboy/php74-more
php 7.4 compatibility - squiggly brackets
Alice Frumin [Thu, 7 Jan 2021 18:24:13 +0000 (13:24 -0500)]
upgrader script
Mathieu Lutfy [Fri, 8 Jan 2021 14:12:32 +0000 (09:12 -0500)]
Fix Contribution Soft Credit entity translation
demeritcowboy [Fri, 8 Jan 2021 13:15:25 +0000 (08:15 -0500)]
deprecated in php 7.4
Tim Otten [Fri, 8 Jan 2021 11:13:05 +0000 (03:13 -0800)]
dev/core#2258 - Setup API should define %%credKeys%%
This updates the the civicrm-setup API to generate CIVICRM_CRED_KEYS (%%credKeys%%) on
t new installations (based on web-installer or cv installer).
Tim Otten [Fri, 8 Jan 2021 11:08:01 +0000 (03:08 -0800)]
dev/core#2258 - Add %%credKeys%% to civicrm.settings.php.template
There are multiple installers distributed across different git repos, and it
make take a bit before they're all updated. The convoluted ternary
expression ensures that CIVICRM_CRED_KEYS is well-formed regardless
of whether the particular installer knows how to set %%credKeys%%.
Tim Otten [Fri, 8 Jan 2021 11:07:23 +0000 (03:07 -0800)]
Merge pull request #19239 from totten/master-crypt-smtp
dev/core#2258 - Read+write SMTP password using 'crypto.token'
Tim Otten [Fri, 8 Jan 2021 08:22:52 +0000 (00:22 -0800)]
(dev/core#2258) SMTP Password - If CRED_KEYS is defined during upgrade, use it
Tim Otten [Fri, 8 Jan 2021 08:10:17 +0000 (00:10 -0800)]
(REF) CryptoToken - Allow optional injection of $registry
Tim Otten [Mon, 21 Dec 2020 10:12:59 +0000 (02:12 -0800)]
(dev/core#2258) SMTP Password - Support key rotation
Tim Otten [Fri, 18 Dec 2020 23:55:02 +0000 (15:55 -0800)]
(dev/core#2258) SMTP Password - Read+write via 'crypto.token'
Before
------
The format of the 'smtpPassword' subfield depends on the available PECL extensions:
* The field is ciphertext... if PHP has `mcrypt` enabled
* The field is plaintext... if PHP has `mcrypt` disabled
After
-----
The format of the `smtpPassword` subfield is specified by `crypto.token` which means:
* The field is ciphertext... if it begins with `chr(2)`
* The field is plaintext... if it begins with any printable character
Tim Otten [Fri, 18 Dec 2020 23:51:50 +0000 (15:51 -0800)]
(dev/core#2258) SMTP Password - Remove old encryption during upgrade
Seamus Lee [Fri, 8 Jan 2021 06:52:05 +0000 (17:52 +1100)]
Merge pull request #19306 from totten/master-renewtest-d
(POC#D) (dev/core#2284) MembershipRenewalTest - Address assertions that started failing circa Jan 1, 2021
Seamus Lee [Fri, 8 Jan 2021 06:47:28 +0000 (17:47 +1100)]
Merge pull request #19243 from demeritcowboy/remove-old-xoauth2
dev/core#2264 - Remove never-used IMAP_XOAUTH2 option value before it gets more confusing
Tim Otten [Sat, 2 Jan 2021 06:28:41 +0000 (22:28 -0800)]
(REF) CRM/Member - Change time() to CRM_Utils_Time::time()
Tim Otten [Sat, 2 Jan 2021 06:26:58 +0000 (22:26 -0800)]
(REF) CRM/Member - Change date() to CRM_Utils_Time::date()
Tim Otten [Sat, 2 Jan 2021 06:20:56 +0000 (22:20 -0800)]
(REF) CRM/Member - Change strtotime() to CRM_Utils_Time::strtotime()
Tim Otten [Sat, 2 Jan 2021 04:57:30 +0000 (20:57 -0800)]
MembershipRenewalTest - Use mocked time. Fix assertions that fail in 2021
Circa Jan 1, 2021, this tested started failing reliable -- most likely
because the example values only make sense in a certain time-frame (ie after
Apr 2020 but before Jan 20201).
This patch makes the time-frame explicit by mocking the 'current time'.
Tim Otten [Sat, 2 Jan 2021 09:25:21 +0000 (01:25 -0800)]
CiviTestListener - Ensure that mocked times are always cleaned up
Tim Otten [Sat, 2 Jan 2021 06:20:21 +0000 (22:20 -0800)]
CRM_Utils_Time - Prefer function names which match the stdlib counterparts
There are a large number of calls to `time()`, `date()`, and `strtotime()`
in the codebase. For someone doing a conversion, it's easier to understand
if the names match.
* Harder conversion
* `time()` => `CRM_Utils_Time::getTimeRaw()`
* `date()` => `CRM_Utils_Time::getTime()`
* `strtotime()` => `strtotime(..., CRM_Utils_Time::getTimeRaw())`
* Easier conversion
* `time()` => `CRM_Utils_Time::time()`
* `date()` => `CRM_Utils_Time::date()`
* `strtotime()` => `CRM_Utils_Time::strtotime()`
Tim Otten [Fri, 8 Jan 2021 05:18:01 +0000 (21:18 -0800)]
FiveThirtyFour - DRY message. Tweak prose.
Seamus Lee [Fri, 8 Jan 2021 02:46:49 +0000 (13:46 +1100)]
Merge pull request #19340 from maynardsmith/master
Accept PHP memory_limit of -1 as meeting requirement
Seamus Lee [Fri, 8 Jan 2021 01:06:44 +0000 (12:06 +1100)]
Merge pull request #19347 from seamuslee001/5331_rn
5.33.1 Release Notes
Tim Otten [Fri, 8 Jan 2021 01:05:18 +0000 (17:05 -0800)]
Merge pull request #19346 from seamuslee001/master
Fix hook_civicrm_permission upgrade failure. Defer system-flush to 'upgrade.finish' phase.
Tim Otten [Fri, 8 Jan 2021 01:00:21 +0000 (17:00 -0800)]
5.33.1.md - Add upgrader PR
Seamus Lee [Thu, 7 Jan 2021 19:20:06 +0000 (06:20 +1100)]
5.33.1 Release notes
Tim Otten [Thu, 7 Jan 2021 21:27:14 +0000 (13:27 -0800)]
CRM_Upgrade_Form - Defer system-flush under 'upgrade.finish' phase
Matthew Wire [Fri, 14 Aug 2020 14:27:14 +0000 (15:27 +0100)]
Fix recurring fields on backend contribution forms
Seamus Lee [Thu, 7 Jan 2021 20:36:29 +0000 (07:36 +1100)]
Merge pull request #19343 from seamuslee001/master
Fix Contribution.tpl mismatched ts.
Eileen McNaughton [Thu, 7 Jan 2021 19:53:39 +0000 (08:53 +1300)]
Merge pull request #19330 from demeritcowboy/why
Stop preventing test runs and dev sites from seeing PHP deprecation notices
Mathieu Lutfy [Thu, 7 Jan 2021 16:29:30 +0000 (11:29 -0500)]
Fix Contribution.tpl mismatched ts.
Alice Frumin [Thu, 7 Jan 2021 18:12:19 +0000 (13:12 -0500)]
update permissioning for new sites
maynardsmith [Thu, 7 Jan 2021 16:26:22 +0000 (16:26 +0000)]
Accept PHP memory_limit of -1 as meeting requirement
A PHP memory_limit of '-1' is specified as 'unlimited'.
Before the change the checkmemory() function generates a Warning if the limit is set to -1. This shows up as a Warning in the Drupal Status Report, but more seriously also prevents the Drupal database update process (mydomain.com/update.php) from running.
After the change the value '-1' is accepted as meeting the requirement.
demeritcowboy [Wed, 6 Jan 2021 21:49:18 +0000 (16:49 -0500)]
why
demeritcowboy [Sun, 20 Dec 2020 18:38:24 +0000 (13:38 -0500)]
remove never-used option value
Matthew Wire [Thu, 7 Jan 2021 10:47:06 +0000 (10:47 +0000)]
Merge pull request #19282 from eileenmcnaughton/ftype_add
Add v4 api for financial type, financial account
Matthew Wire [Thu, 7 Jan 2021 10:45:46 +0000 (10:45 +0000)]
Merge pull request #19232 from eileenmcnaughton/friend
[REF] Extract code that assigns isPendingOutcome variable on thank yo…
Matthew Wire [Thu, 7 Jan 2021 10:44:59 +0000 (10:44 +0000)]
Merge pull request #19199 from seamuslee001/dev_core_2242
dev/core#2242 Ensure that when a custom field is deleted any associat…
Matthew Wire [Thu, 7 Jan 2021 10:42:23 +0000 (10:42 +0000)]
Merge pull request #19273 from eileenmcnaughton/complete
Simplify handling of ids in Authorize.net now that related_contact is no longer used
Matthew Wire [Thu, 7 Jan 2021 10:41:24 +0000 (10:41 +0000)]
Merge pull request #19286 from eileenmcnaughton/group
[REF] Minor cleanup on contactGroup function
Matthew Wire [Thu, 7 Jan 2021 10:39:14 +0000 (10:39 +0000)]
Merge pull request #19284 from eileenmcnaughton/mem_r
[REF] Remove some variables not relevant to backoffice member form
Matthew Wire [Thu, 7 Jan 2021 10:38:00 +0000 (10:38 +0000)]
Merge pull request #19280 from eileenmcnaughton/params
[REF] Rationalise financialType variable
Matthew Wire [Thu, 7 Jan 2021 10:36:38 +0000 (10:36 +0000)]
Merge pull request #19287 from eileenmcnaughton/group2
Stop using refresh_date in civicrm_group table
Matthew Wire [Thu, 7 Jan 2021 10:35:21 +0000 (10:35 +0000)]
Merge pull request #19293 from eileenmcnaughton/campindex
Add index to campaign.name
Matthew Wire [Thu, 7 Jan 2021 10:34:32 +0000 (10:34 +0000)]
Merge pull request #19299 from eileenmcnaughton/sunil2
fix email receipt flag for recurring record
Matthew Wire [Thu, 7 Jan 2021 10:32:09 +0000 (10:32 +0000)]
Merge pull request #19308 from eileenmcnaughton/ev
dev/core#766 fix failure to save custom data on template-based-event
Matthew Wire [Thu, 7 Jan 2021 10:29:47 +0000 (10:29 +0000)]
Merge pull request #19336 from eileenmcnaughton/nfc
[NFC] Code reformat pledge class
Seamus Lee [Thu, 7 Jan 2021 09:55:07 +0000 (20:55 +1100)]
Merge pull request #19298 from eileenmcnaughton/pp_mult
Rename PledgePayment create function
Seamus Lee [Thu, 7 Jan 2021 09:43:10 +0000 (20:43 +1100)]
Merge pull request #19335 from eileenmcnaughton/up
DB changes for already-made schema changes
Seamus Lee [Thu, 7 Jan 2021 09:42:38 +0000 (20:42 +1100)]
Merge pull request #19338 from seamuslee001/master
release-notes/5.33.0.md - Last few PRs
Tim Otten [Thu, 7 Jan 2021 08:24:13 +0000 (00:24 -0800)]
release-notes/5.33.0.md - Last few PRs
eileen [Thu, 7 Jan 2021 07:16:37 +0000 (20:16 +1300)]
[NFC] Code reformat
IDE code reformat
eileen [Thu, 7 Jan 2021 04:47:14 +0000 (17:47 +1300)]
DB changes for already-made schema changes
Alters financial type schema by making the following boolean fields required:
is_reserved (default 0)
is_deductible (default 0)
is_active (default 1)
And pledge schema
installments (default 1)
status (no default)
is_test (default 0)
frequency_unit (default 'month')
eileen [Fri, 1 Jan 2021 07:06:41 +0000 (20:06 +1300)]
Test class tidy up
Sunil Pawar [Mon, 14 Dec 2020 17:03:40 +0000 (22:33 +0530)]
fix email receipt flag for recurring record
added test case
Seamus Lee [Thu, 7 Jan 2021 01:37:03 +0000 (12:37 +1100)]
Merge pull request #19334 from civicrm/5.33
5.33
Seamus Lee [Thu, 7 Jan 2021 01:33:08 +0000 (12:33 +1100)]
Merge pull request #19333 from mlutfy/fixTs533
Fix ts usage for CiviCRM 5.33
Seamus Lee [Wed, 6 Jan 2021 23:28:17 +0000 (10:28 +1100)]
Merge pull request #19319 from mlutfy/wpMailingSettingsUrl
Mailing default domain error: force a backend URL for WP
Seamus Lee [Wed, 6 Jan 2021 23:27:24 +0000 (10:27 +1100)]
Merge pull request #19331 from demeritcowboy/php74-squiggly-bracket
php 7.4 compatibility - Array and string offset access syntax with curly braces is deprecated
Mathieu Lutfy [Wed, 6 Jan 2021 23:13:09 +0000 (18:13 -0500)]
Fix ts usage for CiviCRM 5.33
demeritcowboy [Wed, 6 Jan 2021 21:51:18 +0000 (16:51 -0500)]
php 74 compat
Seamus Lee [Wed, 6 Jan 2021 21:37:53 +0000 (08:37 +1100)]
Merge pull request #19329 from civicrm/5.33
5.33
Seamus Lee [Wed, 6 Jan 2021 21:36:24 +0000 (08:36 +1100)]
Merge pull request #19288 from eileenmcnaughton/group3
Add index on civicrm_group.cache_date
Seamus Lee [Wed, 6 Jan 2021 21:33:53 +0000 (08:33 +1100)]
Merge pull request #19328 from colemanw/duplicateButtonFix
Correctly check button to allow duplicate contact saving from profiles
Seamus Lee [Wed, 6 Jan 2021 20:33:01 +0000 (07:33 +1100)]
Merge pull request #19256 from demeritcowboy/is-development
dev/core#2240 and dev/core#2241 - Move non-compliant trigger_error out of logging
Coleman Watts [Wed, 6 Jan 2021 18:54:33 +0000 (13:54 -0500)]
Fix dev/core#2287 correctly check button to allow duplicate contact saving from profiles
Seamus Lee [Wed, 6 Jan 2021 20:06:03 +0000 (07:06 +1100)]
Merge pull request #19327 from agh1/5.33.0-releasenotes-final
5.33.0 release notes: final edits