Seamus Lee [Sun, 12 Feb 2023 23:20:33 +0000 (10:20 +1100)]
dev/core#4123 Support contribution recur tokens when accessing from a contribution or membership
Use getRelatedTokens function name instead and also fix tests
Hide some unnecessary tokens and fix tests
Seamus Lee [Mon, 8 May 2023 22:23:48 +0000 (08:23 +1000)]
Merge pull request #26173 from seamuslee001/regen_5_23
Regenerate civicrm generated after #25987 and membership xml
Seamus Lee [Mon, 8 May 2023 21:40:00 +0000 (07:40 +1000)]
Update Unit tests to handle for change in label
Eileen McNaughton [Mon, 8 May 2023 21:22:26 +0000 (09:22 +1200)]
Merge pull request #26143 from totten/master-runtime-no-magic
(REF) CRM_Core_Config - Simplify dependencies between MagicMerge and Runtime
demeritcowboy [Mon, 8 May 2023 15:42:49 +0000 (11:42 -0400)]
Merge pull request #26171 from eileenmcnaughton/honor
Notice fix on isHonor on contribution page
demeritcowboy [Mon, 8 May 2023 15:32:55 +0000 (11:32 -0400)]
Merge pull request #26168 from eileenmcnaughton/report_escape
Stop escaping tableHeader in secure smarty mode
demeritcowboy [Mon, 8 May 2023 15:32:22 +0000 (11:32 -0400)]
Merge pull request #26169 from eileenmcnaughton/562
E-notice fix on pay-later payment processor
Seamus Lee [Mon, 8 May 2023 06:45:11 +0000 (16:45 +1000)]
Regnerate civicrm generated and membership xml
Eileen McNaughton [Mon, 8 May 2023 05:15:18 +0000 (17:15 +1200)]
Merge pull request #25987 from agileware/CIVICRM-2119
😵 Disambiguate "Source" field by showing the context of the source, ie. Membership, Participant, Contribution, Contact etc.
Eileen McNaughton [Mon, 8 May 2023 04:46:31 +0000 (16:46 +1200)]
Always assign footer_text
Eileen McNaughton [Mon, 8 May 2023 04:40:16 +0000 (16:40 +1200)]
Notice fix on isHonor
Seamus Lee [Mon, 8 May 2023 03:10:06 +0000 (13:10 +1000)]
Merge pull request #26044 from totten/jwt_generation_alt
Authx - Add APIv4 support for creating and validating credentials
Eileen McNaughton [Mon, 8 May 2023 02:03:34 +0000 (14:03 +1200)]
E-notice fix on pay-later payment processor
Eileen McNaughton [Mon, 8 May 2023 01:53:15 +0000 (13:53 +1200)]
Stop escaping tableHeader in secure smarty mode
demeritcowboy [Sun, 7 May 2023 22:49:11 +0000 (18:49 -0400)]
Merge pull request #26165 from larssandergreen/php-warning-for-add-to-group
Fix PHP8 warnings for AddToGroup
larssandergreen [Sun, 7 May 2023 03:19:51 +0000 (21:19 -0600)]
fix php8 warnings for AddToGroup
demeritcowboy [Sat, 6 May 2023 23:09:10 +0000 (19:09 -0400)]
Merge pull request #26116 from larssandergreen/refund-form-improvements
Add default payment method for additional payment or refund
Tim Otten [Sat, 6 May 2023 01:28:27 +0000 (18:28 -0700)]
Merge pull request #26129 from colemanw/api4JoinFix
APIv4 - Simplify bridge joins
demeritcowboy [Fri, 5 May 2023 22:23:10 +0000 (18:23 -0400)]
Merge pull request #26162 from civicrm/5.62
5.62
demeritcowboy [Fri, 5 May 2023 21:10:51 +0000 (17:10 -0400)]
Merge pull request #26159 from demeritcowboy/drupal-cache
Upgrade message for drupal9 sites to advise to clear drupal cache
demeritcowboy [Fri, 5 May 2023 20:15:48 +0000 (16:15 -0400)]
upgrade message
Tim Otten [Fri, 5 May 2023 19:55:41 +0000 (12:55 -0700)]
Merge pull request #26157 from eileenmcnaughton/test_fix
mixin/scan-classes - Don't scan extension-tests automatically
Eileen McNaughton [Thu, 4 May 2023 02:00:36 +0000 (14:00 +1200)]
scan-classes - Only scan live code. Skip test folder (which can interfere with phpunit runner).
demeritcowboy [Fri, 5 May 2023 15:50:48 +0000 (11:50 -0400)]
Merge pull request #26103 from larssandergreen/don't-show-admin-only-price-fields-on-event-preview
dev/core#4103 Don't show admin only price fields on Registration or Contribution page previews
Eileen McNaughton [Thu, 4 May 2023 22:09:28 +0000 (10:09 +1200)]
Merge pull request #26158 from MegaphoneJon/fill-fix-2
fixes #4278 - Import fill on email/phone respects location type
Seamus Lee [Thu, 4 May 2023 22:00:09 +0000 (08:00 +1000)]
Merge pull request #26133 from eileenmcnaughton/report_stat
Use purify rather than escape to preserve currency
Jon Goldberg [Thu, 4 May 2023 20:10:31 +0000 (16:10 -0400)]
Import fill on email/phone respects location type
CiviCRM [Thu, 4 May 2023 03:57:46 +0000 (03:57 +0000)]
Set version to 5.63.alpha1
CiviCRM [Thu, 4 May 2023 03:57:33 +0000 (03:57 +0000)]
Set version to 5.62.beta1
Seamus Lee [Thu, 4 May 2023 01:59:28 +0000 (11:59 +1000)]
Merge pull request #26144 from yashodha/core_2855
(dev/core#2855) Preserve pristine ids' for further manipulation via h…
Seamus Lee [Thu, 4 May 2023 01:55:37 +0000 (11:55 +1000)]
Merge pull request #26156 from civicrm/5.61
5.61
Seamus Lee [Thu, 4 May 2023 01:36:56 +0000 (11:36 +1000)]
Merge pull request #26155 from seamuslee001/5.61
Bump engine.io and socket.io versions
Tim Otten [Thu, 4 May 2023 01:27:23 +0000 (18:27 -0700)]
Merge pull request #26153 from totten/5.61-rn0
release-notes/5.61.0.md - Last minute additions
Seamus Lee [Thu, 4 May 2023 01:26:46 +0000 (11:26 +1000)]
Merge pull request #26108 from eileenmcnaughton/import_template
Importer - Ensure mapping ID is set in all places using import templates
Seamus Lee [Thu, 4 May 2023 01:20:09 +0000 (11:20 +1000)]
Bump engine.io and socket.io versions
Tim Otten [Thu, 4 May 2023 00:42:57 +0000 (17:42 -0700)]
release-notes/5.61.0.md - Last minute additions
Seamus Lee [Thu, 4 May 2023 00:12:22 +0000 (10:12 +1000)]
Merge pull request #26152 from civicrm/5.61
5.61
Tim Otten [Thu, 4 May 2023 00:05:28 +0000 (17:05 -0700)]
Merge pull request #26150 from totten/master-562-dedupe
FiveSixtyTwo - Improve detection of identical configurations
Seamus Lee [Wed, 3 May 2023 23:27:21 +0000 (09:27 +1000)]
Merge pull request #26140 from eileenmcnaughton/561
dev/core#4225 Add test & fix for new regression - contact update fails when relationship exists & CiviMember disabled
Tim Otten [Wed, 3 May 2023 22:33:17 +0000 (15:33 -0700)]
FiveSixtyTwo - When deciding to show messages, treat "CiviMail,CiviEvent" as equal to "CiviEvent,CiviMail"
Eileen McNaughton [Wed, 3 May 2023 22:20:17 +0000 (10:20 +1200)]
Merge pull request #26146 from MegaphoneJon/import-fill-fix
fixes core#4269 - Import "fill" doesn't fill phone/email
demeritcowboy [Wed, 3 May 2023 19:59:28 +0000 (15:59 -0400)]
Merge pull request #26147 from civicrm/5.61
5.61
Tim Otten [Wed, 3 May 2023 04:54:24 +0000 (21:54 -0700)]
(REF) CRM_Core_Config - Simplify dependencies between MagicMerge and Runtime
Overview
--------
Simplify the dependencies between classes `CRM_Core_Config_MagicMerge` and `CRM_Core_Config_Runtime`.
Before
------
There is a sort of dependency loop:
```php
class CRM_Core_Config extends CRM_Core_Config_MagicMerge { ... }
class CRM_Core_Config_MagicMerge { ... \Civi\Core\Container::getBootService('runtime')->get() ... }
class CRM_Core_Config_Runtime extends CRM_Core_Config_MagicMerge { ... }
```
Thus, we have `$config` (an instance of `MagicMerge`) which uses `$runtime` (another
instance of `MagicMerge`). While it works, it twists the brain to understand properties
that actually through each of these layers (e.g. `$config->initialized`).
After
-----
There is no loop.
```php
class CRM_Core_Config extends CRM_Core_Config_MagicMerge { ... }
class CRM_Core_Config_MagicMerge { ... \Civi\Core\Container::getBootService('runtime')->get() ... }
class CRM_Core_Config_Runtime { ... }
```
Technical Details
-----------------
Removing the `extends MagicMerge` bit means that:
1. In `Runtime.php`, it shouldn't call `$this->getSettings()`.
* I believe that this loop was added by
1b81ed503682ef2d88f65673b0dce9f112078000 in order to make use of `getSettings()`.
However, `Civi::settings()` should be equally valid here. (After all, `getSettings()` calls out to `civi::settings()`...)
2. In `Runtime.php`, the property `$initialized` cannot be stored through inherited-magic.
* By declaring the property, we make it similar to all the other properties in `Runtime.php` (which are also declared).
Unit-testing this change would be quite tricky. For testing, I basically wanted to ensure
that `$config->initialized` behaved the same way before+after. To do this, I hacked some log
statements (https://gist.github.com/totten/
4038882da7a5a4014b73c0596057715d) and ran
```
cv ev 'return CRM_Core_Config::singleton()->initialized;'
```
This showed that `$initialized` starts out as `null` and becomes `1`. The behavior is the
same before+after the patch. (Actually, it's a little better - since it resolves some
warnings emitted by the first `var_export()` call.)
demeritcowboy [Wed, 3 May 2023 18:55:42 +0000 (14:55 -0400)]
Merge pull request #26141 from eileenmcnaughton/561_member
dev/core#4272 Fix unreleased regression on Membership form validation
Jon Goldberg [Wed, 3 May 2023 18:09:53 +0000 (14:09 -0400)]
Fixes core#4269 - import 'fill' doesn't work on phone/email
yashodha [Wed, 3 May 2023 06:10:11 +0000 (11:40 +0530)]
(dev/core#2855) Preserve pristine ids' for further manipulation via hooks for reports
Yashodha Chaku [Wed, 3 May 2023 05:27:41 +0000 (10:57 +0530)]
Merge pull request #26131 from eileenmcnaughton/report_notice2
Further notice fixes on Constituent report
Eileen McNaughton [Wed, 3 May 2023 01:17:28 +0000 (13:17 +1200)]
dev/core#4272 Fix unreleased regression on Membership form validation
Eileen McNaughton [Wed, 3 May 2023 00:39:14 +0000 (12:39 +1200)]
Add Civi-Member is enabled check
Eileen McNaughton [Wed, 3 May 2023 00:31:33 +0000 (12:31 +1200)]
dev/core#4225 Add test for new regression
Eileen McNaughton [Wed, 3 May 2023 00:27:24 +0000 (12:27 +1200)]
Merge pull request #26121 from colemanw/removeConfigUses
Use settings::get instead of $config object to retrieve enabled components
Eileen McNaughton [Tue, 2 May 2023 22:23:31 +0000 (10:23 +1200)]
Merge pull request #26125 from MegaphoneJon/configurable-import-batch
Importer - Add system-setting for batch size
demeritcowboy [Tue, 2 May 2023 21:27:50 +0000 (17:27 -0400)]
Merge pull request #26139 from totten/master-tpl-auto
dev/core#4262 - Drop auto_detect_line_endings from civicrm.settings.php.template
demeritcowboy [Tue, 2 May 2023 21:22:14 +0000 (17:22 -0400)]
Merge pull request #26090 from demeritcowboy/price-use
dev/core#4248 - Fix missing price-set usage table
demeritcowboy [Tue, 2 May 2023 21:21:01 +0000 (17:21 -0400)]
Merge pull request #26091 from demeritcowboy/file-on-case-revision
dev/core#4220 - Don't make case activity revisions anymore when file-on-case
demeritcowboy [Tue, 2 May 2023 21:20:38 +0000 (17:20 -0400)]
Merge pull request #26138 from larssandergreen/expire-group-remove-notifications
Expire notifications for adding and removing groups, tags and relationships
Tim Otten [Tue, 2 May 2023 20:56:44 +0000 (13:56 -0700)]
dev/core#4262 - Drop auto_detect_line_endings from civicrm.settings.php.template
If the upgrader is telling you to remove it from `civicrm.settings.php`,
then... we probably don't need it in `civicrm.settings.php.template`...
Tim Otten [Tue, 2 May 2023 20:51:54 +0000 (13:51 -0700)]
Merge pull request #26136 from demeritcowboy/upgrade-autodetect
dev/core#4262 - Upgrade message about obsolete civicrm.settings.php setting that generates php warnings
larssandergreen [Tue, 2 May 2023 19:39:25 +0000 (13:39 -0600)]
Let non-critical notifications expire
demeritcowboy [Tue, 2 May 2023 19:24:21 +0000 (15:24 -0400)]
Merge pull request #26137 from yashodha/dev_2104
Add target contact custom data to activity report
demeritcowboy [Tue, 2 May 2023 17:30:02 +0000 (13:30 -0400)]
Merge pull request #26135 from seamuslee001/instructions_i18n_support
Surveys: Fix I18n translation support and WYSIWYG support
yashodha [Tue, 2 May 2023 13:52:15 +0000 (19:22 +0530)]
Add target contact custom data to activity report
Mathieu Lu [Tue, 2 May 2023 13:29:26 +0000 (09:29 -0400)]
Merge pull request #26124 from colemanw/afformNumbers
dev/core#4115 Afform - Handle decimal number fields
Seamus Lee [Tue, 2 May 2023 01:49:17 +0000 (11:49 +1000)]
Add instructions field into the skip fields array
Yashodha Chaku [Mon, 1 May 2023 17:16:05 +0000 (22:46 +0530)]
Merge pull request #26132 from eileenmcnaughton/report_notice
Contribution reports, specify type for is pledge payment
demeritcowboy [Mon, 1 May 2023 15:47:14 +0000 (11:47 -0400)]
warn about obsolete setting
Yashodha Chaku [Mon, 1 May 2023 07:39:47 +0000 (13:09 +0530)]
Merge pull request #26134 from eileenmcnaughton/report_notice_group
Remove notices on group_by i reports (eg pledge report)
Seamus Lee [Mon, 1 May 2023 07:11:50 +0000 (17:11 +1000)]
[REF] Add in I18n front end translation support and update widget to be a RichTextEditor for the translation given it is already a wysiyg in singlelingual mode
Eileen McNaughton [Mon, 1 May 2023 01:08:16 +0000 (13:08 +1200)]
Remove notices on group_by i reports (eg pledge report)
Eileen McNaughton [Mon, 1 May 2023 00:18:10 +0000 (12:18 +1200)]
Use purify rather than escape to preserve currency
Eileen McNaughton [Mon, 1 May 2023 00:01:43 +0000 (12:01 +1200)]
Ensure printOnly is assigned
Eileen McNaughton [Sun, 30 Apr 2023 23:52:20 +0000 (11:52 +1200)]
Reduce notices by checking if key exists
Eileen McNaughton [Sun, 30 Apr 2023 23:49:23 +0000 (11:49 +1200)]
Contribution reports, specify type for is pledge payment
Eileen McNaughton [Sun, 30 Apr 2023 23:42:08 +0000 (11:42 +1200)]
Merge pull request #26130 from eileenmcnaughton/report_notice
Fix notice on Constituent Summary report (strict smarty)
Eileen McNaughton [Sun, 30 Apr 2023 23:35:06 +0000 (11:35 +1200)]
Ensure no_display key exists
Eileen McNaughton [Sun, 30 Apr 2023 23:31:55 +0000 (11:31 +1200)]
Add title for is_deleted
Eileen McNaughton [Sun, 30 Apr 2023 23:28:04 +0000 (11:28 +1200)]
Further notice fixes on Constituent report
Eileen McNaughton [Sun, 30 Apr 2023 23:14:01 +0000 (11:14 +1200)]
Fix notice on Constituent Summary report (strict smarty)
Eileen McNaughton [Sun, 30 Apr 2023 22:33:43 +0000 (10:33 +1200)]
Merge pull request #26128 from demeritcowboy/membership-offline
Offline membership receipt - custom message text is wrong
Coleman Watts [Sun, 30 Apr 2023 22:06:32 +0000 (18:06 -0400)]
APIv4 - Simplify bridge joins
This simplifies the code and improves efficiency by using an inner sub-join
instead of a subquery. The latter was trying to fake it, but this is the real
thing: joining on two tables as if they were a single table.
demeritcowboy [Sun, 30 Apr 2023 16:24:28 +0000 (12:24 -0400)]
regen
demeritcowboy [Sun, 30 Apr 2023 16:06:27 +0000 (12:06 -0400)]
the else went missing
demeritcowboy [Sat, 29 Apr 2023 17:31:19 +0000 (13:31 -0400)]
add test
demeritcowboy [Thu, 20 Apr 2023 17:58:53 +0000 (13:58 -0400)]
don't make revisions anymore
demeritcowboy [Sun, 30 Apr 2023 15:59:46 +0000 (11:59 -0400)]
Merge pull request #25930 from eileenmcnaughton/mem_receipt_offline
Update membership offline receipt to run off WorkflowTemplate & tokens
Eileen McNaughton [Sat, 29 Apr 2023 23:54:17 +0000 (11:54 +1200)]
Merge pull request #26126 from seamuslee001/upgrade_league_csv
[REF] Update league/csv package to 9.7.4 to remove need for patching
Eileen McNaughton [Sat, 29 Apr 2023 23:53:47 +0000 (11:53 +1200)]
Merge pull request #26127 from alifrumin/rn5.61
[NFC] 5.61 release notes
Alice Frumin [Fri, 28 Apr 2023 03:21:40 +0000 (23:21 -0400)]
[NFC] 5.61 release notes
Seamus Lee [Sat, 29 Apr 2023 03:54:45 +0000 (13:54 +1000)]
[REF] Update league/csv package to 9.7.4 to remove need for patching
Jon Goldberg [Fri, 28 Apr 2023 20:27:07 +0000 (16:27 -0400)]
configurable import batch size
Coleman Watts [Fri, 28 Apr 2023 19:20:41 +0000 (15:20 -0400)]
Afform - Handle decimal number fields
demeritcowboy [Fri, 28 Apr 2023 17:41:04 +0000 (13:41 -0400)]
Merge pull request #26122 from colemanw/geocodeMethod
Remove unused broken $config->geocodeMethod
Coleman Watts [Fri, 28 Apr 2023 14:52:57 +0000 (10:52 -0400)]
Remove unused broken $config->geocodeMethod
This deprecated item in the $config object couldn't possibly work because
the class and function it refers to don't exist!
colemanw [Fri, 28 Apr 2023 16:29:29 +0000 (12:29 -0400)]
Merge pull request #25535 from mattwire/afformreqselect2
Afform: Add required flag to select2
Coleman Watts [Fri, 28 Apr 2023 14:18:56 +0000 (10:18 -0400)]
Use settings::get instead of $config object to retrieve enableComponents
Eileen McNaughton [Fri, 28 Apr 2023 06:00:44 +0000 (18:00 +1200)]
Merge pull request #26118 from colemanw/civiGrantUpgrade
CiviGrant - Fix upgrade to work on multiple domains
Eileen McNaughton [Fri, 28 Apr 2023 03:18:44 +0000 (15:18 +1200)]
Merge pull request #26119 from civicrm/5.61
5.61
Coleman Watts [Fri, 28 Apr 2023 00:46:59 +0000 (20:46 -0400)]
CiviGrant - Fix upgrade to work on multiple domains
Eileen McNaughton [Thu, 27 Apr 2023 22:58:31 +0000 (10:58 +1200)]
Merge pull request #24765 from colemanw/priceSet
PriceSet - Fix metadata for extends column, for SearchKit compatibility
Eileen McNaughton [Thu, 27 Apr 2023 22:53:58 +0000 (10:53 +1200)]
Fix : to be withing ts