civicrm-core.git
18 months agoMove form-specific early return to form
Eileen McNaughton [Mon, 14 Aug 2023 00:13:41 +0000 (12:13 +1200)]
Move form-specific early return to form

18 months agoMerge pull request #27070 from eileenmcnaughton/quick
Eileen McNaughton [Fri, 18 Aug 2023 00:12:05 +0000 (12:12 +1200)]
Merge pull request #27070 from eileenmcnaughton/quick

Remove use of sometimes-php8-warning causing `_quickConfig` property…(use `isQuickConfig()` function)

18 months agoFurther test fix
Eileen McNaughton [Mon, 14 Aug 2023 02:33:53 +0000 (14:33 +1200)]
Further test fix

18 months agoRemove use of sometimes-php8-warning causing _quickFonconfig property (use isQuickCon...
Eileen McNaughton [Mon, 14 Aug 2023 01:19:35 +0000 (13:19 +1200)]
Remove use of sometimes-php8-warning causing _quickFonconfig property (use isQuickConfig() function)

18 months agoMerge pull request #27049 from eileenmcnaughton/discount
Seamus Lee [Thu, 17 Aug 2023 21:22:29 +0000 (17:22 -0400)]
Merge pull request #27049 from eileenmcnaughton/discount

Extract `getDiscountID()`

18 months agoMerge pull request #27003 from colemanw/actionScheduleForm
Tim Otten [Tue, 15 Aug 2023 19:44:59 +0000 (12:44 -0700)]
Merge pull request #27003 from colemanw/actionScheduleForm

ScheduledReminders - Rewrite entire form using metadata

18 months agoMerge pull request #27072 from totten/master-test-d10
demeritcowboy [Tue, 15 Aug 2023 13:26:39 +0000 (09:26 -0400)]
Merge pull request #27072 from totten/master-test-d10

Concurrency Tests - Update ExternalBatch for symfony/proces v4.1+ (esp Drupal 10)

18 months agoMerge pull request #27074 from civicrm/5.65
demeritcowboy [Tue, 15 Aug 2023 13:16:57 +0000 (09:16 -0400)]
Merge pull request #27074 from civicrm/5.65

5.65

18 months agoMerge pull request #27066 from eileenmcnaughton/565
demeritcowboy [Tue, 15 Aug 2023 11:59:56 +0000 (07:59 -0400)]
Merge pull request #27066 from eileenmcnaughton/565

dev/core#4494 Fix e-notice by removing unused variables

18 months agoConcurrency Tests - Update ExternalBatch for symfony/proces v4.1+
Tim Otten [Tue, 15 Aug 2023 00:01:20 +0000 (17:01 -0700)]
Concurrency Tests - Update ExternalBatch for symfony/proces v4.1+

Before
------

`api_v3_JobProcessMailingTest::testConcurrency()` and `Civi\FlexMailer\ConcurrencyTest`
fail when executed on Drupal 10.

After
-----

Pass when executed on Drupal 10

Technical Details
-----------------

`symfony/process` v4.1 deprecated the usage of `new Process(string)` and
added `Process::fromShellCommandline(string)`. The `new Process(string)` was
dropped from v5.x and v6.x. So you get an unconditional failure on D10. (On
other platforms, it can also fail... depending on how you deal with
deprecations.)

In `civicrm-core:composer.json`, the minimum mversion of `symfony/process` is `4.4`.
So that means we can use the newer `Process::fromShellCommandline(string)`.

18 months agoMerge pull request #27013 from eileenmcnaughton/auth
Mathieu Lu [Mon, 14 Aug 2023 20:12:17 +0000 (16:12 -0400)]
Merge pull request #27013 from eileenmcnaughton/auth

Fix permission check on Contribution form, clarify underlying functions

18 months agoMerge pull request #27068 from eileenmcnaughton/fee_block
Seamus Lee [Mon, 14 Aug 2023 03:42:59 +0000 (23:42 -0400)]
Merge pull request #27068 from eileenmcnaughton/fee_block

Move form-specific check to form

18 months agoMerge pull request #27067 from eileenmcnaughton/form_test_fix
Seamus Lee [Mon, 14 Aug 2023 01:43:20 +0000 (21:43 -0400)]
Merge pull request #27067 from eileenmcnaughton/form_test_fix

Test fix, towards full form flow

18 months agoMove form-specific check to form
Eileen McNaughton [Sun, 13 Aug 2023 23:58:29 +0000 (11:58 +1200)]
Move form-specific check to form

18 months agoTest fix, towards full form flow
Eileen McNaughton [Sun, 13 Aug 2023 23:12:17 +0000 (11:12 +1200)]
Test fix, towards full form flow

Rather than set _isQuickConfig it should be loaded from the db by the form
(which this switches to)

18 months agoMerge pull request #27060 from colemanw/dontGetFields
Eileen McNaughton [Sun, 13 Aug 2023 23:00:01 +0000 (11:00 +1200)]
Merge pull request #27060 from colemanw/dontGetFields

Api4 - Remove unused key from getFields

18 months agodev/core#4494 Fix e-notice by removing unused variables
Eileen McNaughton [Sun, 13 Aug 2023 22:53:28 +0000 (10:53 +1200)]
dev/core#4494 Fix e-notice by removing unused variables

18 months agoMerge pull request #27063 from eileenmcnaughton/context
Tim Otten [Sun, 13 Aug 2023 21:10:24 +0000 (14:10 -0700)]
Merge pull request #27063 from eileenmcnaughton/context

Do the todo (move the function to the trait as suggested

19 months agoMerge pull request #27042 from colemanw/copyPastaFix
demeritcowboy [Sun, 13 Aug 2023 11:57:47 +0000 (06:57 -0500)]
Merge pull request #27042 from colemanw/copyPastaFix

[REF] SearchKit - Cleanup upgrade code

19 months agoMerge pull request #27064 from eileenmcnaughton/remove_notice
Monish Deb [Sun, 13 Aug 2023 05:31:56 +0000 (11:01 +0530)]
Merge pull request #27064 from eileenmcnaughton/remove_notice

Remove line that gives error & does nothing

19 months agoMerge pull request #27008 from colemanw/booleanSearch
Monish Deb [Sun, 13 Aug 2023 05:29:13 +0000 (10:59 +0530)]
Merge pull request #27008 from colemanw/booleanSearch

Simplify queries of NOT NULL fields

19 months agoRemove line that gives error & does nothing
Eileen McNaughton [Sun, 13 Aug 2023 00:08:35 +0000 (12:08 +1200)]
Remove line that gives error & does nothing

I went back to 5.55 & did receipt testing and
1) this notice is there already back then
2) it results in a resolved value of 'Array - Display name
3) it does not appear anywhere in the final receipt

19 months agoMerge pull request #27061 from demeritcowboy/searchevent-title
colemanw [Sun, 13 Aug 2023 00:04:43 +0000 (20:04 -0400)]
Merge pull request #27061 from demeritcowboy/searchevent-title

Manage event - fix too many brackets

19 months agoDo the todo (move the function to the trait as suggested
Eileen McNaughton [Sat, 12 Aug 2023 22:53:59 +0000 (10:53 +1200)]
Do the todo (move the function to the trait as suggested

This makes the currency of the contribution available to the template
for other templates - notably offline event receipts

19 months agoMerge pull request #27062 from civicrm/5.65
Seamus Lee [Sat, 12 Aug 2023 22:30:11 +0000 (18:30 -0400)]
Merge pull request #27062 from civicrm/5.65

5.65

19 months agoAdd test + external support for getAuthenticatedContactID()
Eileen McNaughton [Sat, 12 Aug 2023 21:54:29 +0000 (09:54 +1200)]
Add test + external support for getAuthenticatedContactID()

19 months agoFix permission check on Contribution form, clarify underlying functions
Eileen McNaughton [Sun, 6 Aug 2023 23:29:47 +0000 (11:29 +1200)]
Fix permission check on Contribution form, clarify underlying functions

This is a reviewer response to https://github.com/civicrm/civicrm-core/pull/22951

In that PR it seeks to set UserID to something derived from a function that is doing
a lot of work. I dug into that function which someone (ahem) wrote many years ago
and teased out some of the underlying chunks & cleaned up the variable names for clarity
along with a doc block cleanup.

I decided that rather than set _userID in contributionBase we should remove it
(it is only referred to in 4 places) and call the more specific function at each usage.

Otherwise we change the meaning of userID that is used somewhat differently later.

Also I rather prefer functions that will perform the same whenever called over relying
on a variable having been set correctly the first time

19 months agoMerge pull request #27005 from eileenmcnaughton/end_date
demeritcowboy [Sat, 12 Aug 2023 20:30:45 +0000 (15:30 -0500)]
Merge pull request #27005 from eileenmcnaughton/end_date

Fix event templates to use end_date token

19 months agoApi4 - Remove unused key from getFields
colemanw [Sat, 12 Aug 2023 19:56:26 +0000 (15:56 -0400)]
Api4 - Remove unused key from getFields

19 months agotoo many brackets
demeritcowboy [Sat, 12 Aug 2023 19:52:01 +0000 (15:52 -0400)]
too many brackets

19 months agoMerge pull request #27057 from larssandergreen/Fix-event-fee-help
colemanw [Sat, 12 Aug 2023 14:58:30 +0000 (10:58 -0400)]
Merge pull request #27057 from larssandergreen/Fix-event-fee-help

Fix event fee help

19 months agoFix event fee help
larssandergreen [Sat, 12 Aug 2023 04:47:54 +0000 (22:47 -0600)]
Fix event fee help

19 months agoMerge pull request #27056 from larssandergreen/Use-statusBounce-instead-of-redirect...
Eileen McNaughton [Sat, 12 Aug 2023 03:41:48 +0000 (15:41 +1200)]
Merge pull request #27056 from larssandergreen/Use-statusBounce-instead-of-redirect-when-can't-delete-custom-group

dev/core#4094 Use statusBounce instead of redirect when cannot delete custom group

19 months agoMerge pull request #27052 from totten/master-data-nonphp
Eileen McNaughton [Sat, 12 Aug 2023 02:23:10 +0000 (14:23 +1200)]
Merge pull request #27052 from totten/master-data-nonphp

(REF) civicrm_data.tpl - Stop using Smarty's {php}

19 months agoMerge pull request #27055 from totten/nfc-eventtest
Eileen McNaughton [Sat, 12 Aug 2023 01:44:20 +0000 (13:44 +1200)]
Merge pull request #27055 from totten/nfc-eventtest

(NFC) Test class - Fix inconsistent namespace

19 months agoMerge pull request #27032 from eileenmcnaughton/dep
Tim Otten [Sat, 12 Aug 2023 00:47:17 +0000 (17:47 -0700)]
Merge pull request #27032 from eileenmcnaughton/dep

Unit tests - replace deprecated function with newer one

19 months agoUse statusBounce instead of redirect when cannot delete custom group
larssandergreen [Sat, 12 Aug 2023 00:26:30 +0000 (18:26 -0600)]
Use statusBounce instead of redirect when cannot delete custom group

19 months ago(NFC) Test class - Fix inconsistent namespace
Tim Otten [Fri, 11 Aug 2023 23:04:59 +0000 (16:04 -0700)]
(NFC) Test class - Fix inconsistent namespace

Most tests in this folder have a namespace...

19 months agoMerge pull request #27053 from mlutfy/fixContributionBaseImplode
colemanw [Fri, 11 Aug 2023 18:20:53 +0000 (14:20 -0400)]
Merge pull request #27053 from mlutfy/fixContributionBaseImplode

Fix PHP 8.0 implode on ContributionBase

19 months agoFix PHP 8.0 implode on ContributionBase
Mathieu Lu [Fri, 11 Aug 2023 13:32:25 +0000 (09:32 -0400)]
Fix PHP 8.0 implode on ContributionBase

19 months agoMerge pull request #27041 from kurund/afform-submission-schema-changes
colemanw [Fri, 11 Aug 2023 12:59:12 +0000 (08:59 -0400)]
Merge pull request #27041 from kurund/afform-submission-schema-changes

(dev/core#4232) Afform submission schema changes

19 months agoMerge pull request #27051 from eileenmcnaughton/event_price
colemanw [Fri, 11 Aug 2023 12:57:09 +0000 (08:57 -0400)]
Merge pull request #27051 from eileenmcnaughton/event_price

Clarify doc-block for form variable

19 months agoMerge pull request #27047 from eileenmcnaughton/is_required
colemanw [Fri, 11 Aug 2023 12:55:44 +0000 (08:55 -0400)]
Merge pull request #27047 from eileenmcnaughton/is_required

Remove do-nothing code.

19 months agoMerge pull request #27028 from larssandergreen/Show-which-extension-has-a-parse-error...
colemanw [Fri, 11 Aug 2023 12:54:36 +0000 (08:54 -0400)]
Merge pull request #27028 from larssandergreen/Show-which-extension-has-a-parse-error-in-info.xml

Show which extension has a parse error in info.xml

19 months agoMerge pull request #27038 from bugfolder/80_global_language
colemanw [Fri, 11 Aug 2023 12:52:00 +0000 (08:52 -0400)]
Merge pull request #27038 from bugfolder/80_global_language

Issue dev/backdrop#80: global $language should be an object.

19 months agoadd status column to afform submissions table
Kurund Jalmi [Wed, 9 Aug 2023 18:55:54 +0000 (19:55 +0100)]
add status column to afform submissions table

19 months ago(REF) civicrm_data.tpl - Stop using Smarty's {php}
Tim Otten [Fri, 11 Aug 2023 09:21:47 +0000 (02:21 -0700)]
(REF) civicrm_data.tpl - Stop using Smarty's {php}

This should make it easier to try out Smarty 4

19 months agoClarify doc-block of for form variable
Eileen McNaughton [Fri, 11 Aug 2023 06:32:33 +0000 (18:32 +1200)]
Clarify doc-block of for form variable

19 months agoExtract getDiscountID()
Eileen McNaughton [Fri, 11 Aug 2023 04:29:08 +0000 (16:29 +1200)]
Extract getDiscountID()

This is part of a general cleanup to stop passing the form into functions & then checking the form
for a possible property. Instead each form that calls the function has a consistent
(publicly supported) getDiscountID() function that it calls & discountID is passed in.

Note I was actually trying to give getPriceSetID this treatment but discountID was in the
way. In general I'm trying to make some consisent public functions available on forms
for retrieving relevant entity IDs rather than the current property / form
variable patchwork

19 months agoMerge pull request #27048 from eileenmcnaughton/notices
Seamus Lee [Fri, 11 Aug 2023 04:36:32 +0000 (00:36 -0400)]
Merge pull request #27048 from eileenmcnaughton/notices

E-notice fix, don't skip loading NULL fields

19 months agoE-notice fix, don't skip loading NULL fields
Eileen McNaughton [Fri, 11 Aug 2023 03:20:05 +0000 (15:20 +1200)]
E-notice fix, don't skip loading NULL fields

This addresses e-notices (e.g) when help_pre is NULL & assigned to the template

19 months agoRemove do-nothing code.
Eileen McNaughton [Fri, 11 Aug 2023 03:14:40 +0000 (15:14 +1200)]
Remove do-nothing code.

This code conditionally adds the field is_required to the array that already
contains the field is_required

19 months agoShow which extension has a parse error in info.xml
larssandergreen [Fri, 11 Aug 2023 03:11:09 +0000 (21:11 -0600)]
Show which extension has a parse error in info.xml

19 months agoMerge pull request #27045 from civicrm/5.65
Seamus Lee [Fri, 11 Aug 2023 00:52:37 +0000 (20:52 -0400)]
Merge pull request #27045 from civicrm/5.65

5.65

19 months agoMerge pull request #27043 from seamuslee001/dev_core_4492
colemanw [Fri, 11 Aug 2023 00:03:33 +0000 (20:03 -0400)]
Merge pull request #27043 from seamuslee001/dev_core_4492

dev/core#4492 Ensure that when determining if tokens should be show c…

19 months agodev/core#4492 Ensure that when determining if tokens should be show check if the...
Seamus Lee [Thu, 10 Aug 2023 22:58:24 +0000 (08:58 +1000)]
dev/core#4492 Ensure that when determining if tokens should be show check if the Entity is in list of Avaliable Entities

19 months agoMerge pull request #27033 from colemanw/fixSkEditable
colemanw [Thu, 10 Aug 2023 19:52:32 +0000 (15:52 -0400)]
Merge pull request #27033 from colemanw/fixSkEditable

Fix dev/core#4483 SearchKit crash when in-place-editing a field in a joined entity

19 months agoSearchKit - Cleanup upgrade code
colemanw [Thu, 10 Aug 2023 18:17:54 +0000 (14:17 -0400)]
SearchKit - Cleanup upgrade code

19 months agoMerge pull request #27039 from sebalis/contributor-details-sebalis
colemanw [Thu, 10 Aug 2023 15:16:41 +0000 (11:16 -0400)]
Merge pull request #27039 from sebalis/contributor-details-sebalis

added details for sebalis in contributor-key.xml

19 months agoadded details for sebalis in contributor.xml
Sebastian Lisken [Thu, 10 Aug 2023 14:22:15 +0000 (16:22 +0200)]
added details for sebalis in contributor.xml

19 months agoMerge pull request #27037 from larssandergreen/Fix-paymentBlock-url-concat
colemanw [Thu, 10 Aug 2023 14:07:08 +0000 (10:07 -0400)]
Merge pull request #27037 from larssandergreen/Fix-paymentBlock-url-concat

dev/core#4487 Alternative option: Fix paymentBlock url concat

19 months agoMerge pull request #27024 from yashodha/dev-4485
Mathieu Lu [Thu, 10 Aug 2023 13:44:52 +0000 (09:44 -0400)]
Merge pull request #27024 from yashodha/dev-4485

(dev/core#4485) Replace Event Total by Total Amount

19 months agoIssue #80: global $language should be an object.
Robert J. Lang [Thu, 10 Aug 2023 13:42:22 +0000 (06:42 -0700)]
Issue #80: global $language should be an object.

19 months agoFix event templates to use end_date token
Eileen McNaughton [Thu, 3 Aug 2023 23:55:36 +0000 (11:55 +1200)]
Fix event templates to use end_date token

19 months agoUnit tests - replace deprecated function with newer one
Eileen McNaughton [Wed, 9 Aug 2023 21:49:49 +0000 (09:49 +1200)]
Unit tests - replace deprecated function with newer one

Also minor clean ups

19 months agoFix paymentBlock url concat
larssandergreen [Thu, 10 Aug 2023 05:44:35 +0000 (23:44 -0600)]
Fix paymentBlock url concat

19 months agoMerge pull request #27036 from eileenmcnaughton/phpunit
Seamus Lee [Thu, 10 Aug 2023 03:31:13 +0000 (23:31 -0400)]
Merge pull request #27036 from eileenmcnaughton/phpunit

Use phpunit when running on php 7.3+

19 months agoUse phpunit when running on php 7.3+
Eileen McNaughton [Thu, 10 Aug 2023 01:11:32 +0000 (13:11 +1200)]
Use phpunit when running on php 7.3+

19 months agoFix dev/core#4483
colemanw [Thu, 10 Aug 2023 00:51:32 +0000 (20:51 -0400)]
Fix dev/core#4483

19 months agoActionMapping - Allow getDateFields to filter by entity_value
colemanw [Sun, 6 Aug 2023 15:21:03 +0000 (11:21 -0400)]
ActionMapping - Allow getDateFields to filter by entity_value

19 months agoActionSchedule - Filter out mappings from disabled components
colemanw [Fri, 4 Aug 2023 19:29:54 +0000 (15:29 -0400)]
ActionSchedule - Filter out mappings from disabled components

19 months agoAPIv4 ConformanceTest - Be smarter about conditionally-required fields
colemanw [Fri, 4 Aug 2023 02:38:53 +0000 (22:38 -0400)]
APIv4 ConformanceTest - Be smarter about conditionally-required fields

Before: fields with 'required_if' were blindly treated as 'required'
After: 'required_if' condition is evaluated

19 months agoActionSchedule - Update APIs & tests to work with new metadata
colemanw [Thu, 3 Aug 2023 17:14:34 +0000 (13:14 -0400)]
ActionSchedule - Update APIs & tests to work with new metadata

Before: Name was not automatically generated by the DAO so lots of manual wrangling
After: Now that name has a unique index, the DAO handles it automatically

19 months agoActionSchedule - Add unique index to name column
colemanw [Thu, 3 Aug 2023 22:33:54 +0000 (18:33 -0400)]
ActionSchedule - Add unique index to name column

19 months agoScheduledReminders - Remove unnecessary template coupling
colemanw [Thu, 3 Aug 2023 03:13:58 +0000 (23:13 -0400)]
ScheduledReminders - Remove unnecessary template coupling

19 months agoScheduledReminders - Rewrite form to use metadata
colemanw [Thu, 3 Aug 2023 02:41:25 +0000 (22:41 -0400)]
ScheduledReminders - Rewrite form to use metadata

The complexity of the form lies in the fact that various fields have different meanings depending on the selected mapping type.
For example the entity_value field might mean "Activity Type" or "Financial Account" or "Event Type" or "Event ID". The
entity_status field also refers to different option lists, sometimes dependent on the selection of entity_value and it may or
may not allow multiple values and it may or may not be required.
The form also allows those fields to be pre-selected when embedded on an Event page, and the old Quickform HierSelect widget coped
very poorly with all those scenarios. As a result the form employed a lot of javascript to handle specific hard-coded issues, and
a few bespoke ajax callbacks. None of which worked perfectly.
The postProcess & validate functions employed a sub-function called parseActionSchedule which was doing way too much work:
1. to detangle all the overcomplicated form values
2. preprocessing that really belonged in the BAO
3. to save a field-mapping (alarmingly this was happening during form validation AND postProcess!).

This rewrite moves all of that logic into the BAO and getFields, allowing each mapping-type to set metadata appropriately
(e.g. is a particular field required for this mapping type? does it support multiple values? does it have a different
option list depending on another field selection?). This allowed me to delete the bespoke ajax callbacks and just call
api4.getFields from the form. The new metadata also describes the relationship between fields (so when you update one
field it knows which others to reload).

19 months agoMerge pull request #27027 from allinappliadmin/patch-1-AIA
colemanw [Wed, 9 Aug 2023 17:44:12 +0000 (13:44 -0400)]
Merge pull request #27027 from allinappliadmin/patch-1-AIA

E:: to make it look after the extension's translation

19 months agoE:: to make it look after the extension's translation
ALL IN APPLI admin [Wed, 9 Aug 2023 14:44:57 +0000 (16:44 +0200)]
E:: to make it look after the extension's translation

19 months agoMerge pull request #27026 from aydun/path_fixes
colemanw [Wed, 9 Aug 2023 12:31:02 +0000 (08:31 -0400)]
Merge pull request #27026 from aydun/path_fixes

Path fixes

19 months agoPath fixes
Aidan Saunders [Wed, 9 Aug 2023 11:54:14 +0000 (12:54 +0100)]
Path fixes

19 months ago(dev/core#4485) Replace Event Total by Total Amount
yashodha [Wed, 9 Aug 2023 09:52:57 +0000 (15:22 +0530)]
(dev/core#4485) Replace Event Total by Total Amount

19 months agoMerge pull request #27023 from eileenmcnaughton/test_twice
Eileen McNaughton [Wed, 9 Aug 2023 06:21:46 +0000 (18:21 +1200)]
Merge pull request #27023 from eileenmcnaughton/test_twice

Re-enable any queues that were disabled for background processing, on end

19 months agoAdd queue runner test
Eileen McNaughton [Wed, 9 Aug 2023 04:52:36 +0000 (16:52 +1200)]
Add queue runner test

19 months agoRe-enable any queues that were disabled for background processing, on end
Eileen McNaughton [Wed, 9 Aug 2023 04:30:42 +0000 (16:30 +1200)]
Re-enable any queues that were disabled for background processing, on end

This addresses what is likely an artificial scenario but

essentially if these steps are followed twice within the same function
- create a queue
- run the queue via runAll

The second time will fail because the queue was disabled & no re-enabled, despite
being perisistent

19 months agoActionMapping - Add icons
colemanw [Sun, 30 Jul 2023 22:00:28 +0000 (18:00 -0400)]
ActionMapping - Add icons

19 months agoActionMapping - Use APIv4 SpecProviderInterface to alter metadata for each mapping...
colemanw [Sun, 30 Jul 2023 02:59:21 +0000 (22:59 -0400)]
ActionMapping - Use APIv4 SpecProviderInterface to alter metadata for each mapping type

19 months agoMerge pull request #26292 from larssandergreen/Remove-more-unneeded-descriptions...
Mathieu Lu [Tue, 8 Aug 2023 00:45:23 +0000 (20:45 -0400)]
Merge pull request #26292 from larssandergreen/Remove-more-unneeded-descriptions---pledges,-etc

Remove unneeded descriptions and clean up on search forms

19 months agoMerge pull request #27022 from eileenmcnaughton/unsubscribe
Seamus Lee [Mon, 7 Aug 2023 21:37:13 +0000 (17:37 -0400)]
Merge pull request #27022 from eileenmcnaughton/unsubscribe

Wording changes in the Unsubscribe form

19 months agocode clean up
PhilMB [Thu, 27 Jul 2023 01:10:40 +0000 (20:10 -0500)]
code clean up

ts variable method updated and OptOutURL removed

19 months agoMerge pull request #27015 from eileenmcnaughton/extend
colemanw [Mon, 7 Aug 2023 20:14:42 +0000 (16:14 -0400)]
Merge pull request #27015 from eileenmcnaughton/extend

Separate getStatusMessage function

19 months agoMerge pull request #27021 from civicrm/5.65
Eileen McNaughton [Mon, 7 Aug 2023 20:06:04 +0000 (08:06 +1200)]
Merge pull request #27021 from civicrm/5.65

5.65 to master

19 months agoMerge pull request #26969 from demeritcowboy/view-only-merge-hook
Eileen McNaughton [Mon, 7 Aug 2023 20:05:23 +0000 (08:05 +1200)]
Merge pull request #26969 from demeritcowboy/view-only-merge-hook

dev/core#4481 - View-only custom fields should be merged during merges

19 months agoMerge pull request #27019 from eileenmcnaughton/user_name
demeritcowboy [Mon, 7 Aug 2023 16:34:22 +0000 (12:34 -0400)]
Merge pull request #27019 from eileenmcnaughton/user_name

Remove excessive data handling & some unused variables

19 months agoMerge pull request #27020 from civicrm/5.65
demeritcowboy [Mon, 7 Aug 2023 13:19:22 +0000 (09:19 -0400)]
Merge pull request #27020 from civicrm/5.65

5.65

19 months agoMerge pull request #27004 from eileenmcnaughton/offline_tokens
demeritcowboy [Mon, 7 Aug 2023 13:17:30 +0000 (09:17 -0400)]
Merge pull request #27004 from eileenmcnaughton/offline_tokens

Update a couple more tpl variables to tokens

19 months agoMerge pull request #27018 from larssandergreen/Fix-MailSettings-add-path
Aidan Saunders [Mon, 7 Aug 2023 11:15:04 +0000 (12:15 +0100)]
Merge pull request #27018 from larssandergreen/Fix-MailSettings-add-path

dev/core#4480 Fix MailSettings add path

19 months agoRemove excessive data handling & some unused variables
Eileen McNaughton [Mon, 7 Aug 2023 06:43:58 +0000 (18:43 +1200)]
Remove excessive data handling & some unused variables

19 months agoFix MailSettings add path
larssandergreen [Mon, 7 Aug 2023 05:49:20 +0000 (23:49 -0600)]
Fix MailSettings add path

19 months agoSeparate getStatusMessage function
Eileen McNaughton [Mon, 7 Aug 2023 01:41:00 +0000 (13:41 +1200)]
Separate getStatusMessage function

The  CRM_Event_Form_Task_Register form was once part of CRM_Event_Form_Participant

It now extends it & the goal is to disentangle it from the parent.

In general _single is only set for the parent & describes actions for that
whereas the Register form is a task that can act on many

19 months agoMerge pull request #27014 from civicrm/5.65
Eileen McNaughton [Mon, 7 Aug 2023 00:15:51 +0000 (12:15 +1200)]
Merge pull request #27014 from civicrm/5.65

5.65 to master