civicrm-core.git
16 months agoMerge pull request #26712 from larssandergreen/Install-SK-on-headless-tests
Eileen McNaughton [Mon, 3 Jul 2023 19:25:03 +0000 (12:25 -0700)]
Merge pull request #26712 from larssandergreen/Install-SK-on-headless-tests

Install SK as part of headless test baseline

16 months agoInstall SK as part of headless test baseline
larssandergreen [Mon, 3 Jul 2023 18:14:54 +0000 (12:14 -0600)]
Install SK as part of headless test baseline

16 months agoMerge pull request #26696 from mlutfy/cleanupTmpTables
demeritcowboy [Mon, 3 Jul 2023 17:43:27 +0000 (13:43 -0400)]
Merge pull request #26696 from mlutfy/cleanupTmpTables

clearTempTables: fix condition for user_job check

16 months agoMerge pull request #26713 from reflexive-communications/unsubscribe-properties
colemanw [Mon, 3 Jul 2023 17:10:44 +0000 (10:10 -0700)]
Merge pull request #26713 from reflexive-communications/unsubscribe-properties

CRM_Mailing_Form_Optout, CRM_Mailing_Form_Unsubscribe: change properties to protected from private

16 months agoMerge pull request #26711 from larssandergreen/Don't-show-SQL-text-in-SK-if-the-user...
colemanw [Mon, 3 Jul 2023 15:38:36 +0000 (08:38 -0700)]
Merge pull request #26711 from larssandergreen/Don't-show-SQL-text-in-SK-if-the-user-doesn't-have-permission

Don't show SQL text in SK if user does not have view debug permission

16 months agomake properties protected to get accessed by CRM_Core_Form::getVar()
Sandor Semsey [Mon, 3 Jul 2023 14:33:02 +0000 (16:33 +0200)]
make properties protected to get accessed by CRM_Core_Form::getVar()

16 months agoMerge pull request #26698 from colemanw/customJoin
Aidan Saunders [Mon, 3 Jul 2023 10:18:43 +0000 (11:18 +0100)]
Merge pull request #26698 from colemanw/customJoin

SearchKit - Allow custom fields in join conditions

16 months agoMerge pull request #26708 from eileenmcnaughton/part_create
Seamus Lee [Mon, 3 Jul 2023 05:40:38 +0000 (01:40 -0400)]
Merge pull request #26708 from eileenmcnaughton/part_create

Use eventCreateUnpaid in participantCreate

16 months agoUse eventCreateUnpaid in participantCreate
Eileen McNaughton [Mon, 3 Jul 2023 04:11:35 +0000 (16:11 +1200)]
Use eventCreateUnpaid in participantCreate

16 months agoMerge pull request #26707 from eileenmcnaughton/event_change
Eileen McNaughton [Mon, 3 Jul 2023 04:51:39 +0000 (21:51 -0700)]
Merge pull request #26707 from eileenmcnaughton/event_change

Fix ACLPermissionTrait to use EventTest create function

16 months agoDon't show SQL text in SK if user does not have view debug permission
larssandergreen [Mon, 3 Jul 2023 04:41:36 +0000 (22:41 -0600)]
Don't show SQL text in SK if user does not have view debug permission

16 months agoFix ACLPermissionTrait to use EventTest create function
Eileen McNaughton [Mon, 3 Jul 2023 03:40:24 +0000 (15:40 +1200)]
Fix ACLPermissionTrait to use EventTest create function

Cleanup in related classes

16 months agoMerge pull request #26706 from civicrm/5.63
Seamus Lee [Mon, 3 Jul 2023 03:42:40 +0000 (23:42 -0400)]
Merge pull request #26706 from civicrm/5.63

5.63

16 months agoMerge pull request #26695 from alifrumin/rn5.63
Seamus Lee [Mon, 3 Jul 2023 03:01:34 +0000 (23:01 -0400)]
Merge pull request #26695 from alifrumin/rn5.63

[NFC] First pass at 5.63 release notes

16 months agoMerge pull request #26703 from larssandergreen/Give-webtest-user-permission-to-view...
Seamus Lee [Mon, 3 Jul 2023 02:59:30 +0000 (22:59 -0400)]
Merge pull request #26703 from larssandergreen/Give-webtest-user-permission-to-view-debug

Allow Drupal webstest user to view debug output

16 months agoMerge pull request #26702 from larssandergreen/Fix-debug-permissions-issue-in-API4
Seamus Lee [Mon, 3 Jul 2023 02:59:12 +0000 (22:59 -0400)]
Merge pull request #26702 from larssandergreen/Fix-debug-permissions-issue-in-API4

Fix debug permissions for API 4 Explorer debug

16 months agoMerge pull request #26704 from eileenmcnaughton/event_t
Eileen McNaughton [Mon, 3 Jul 2023 02:57:53 +0000 (19:57 -0700)]
Merge pull request #26704 from eileenmcnaughton/event_t

Test cleanup in BAO_ParticipantTest

16 months agoTest cleanup in BAO_ParticipantTest
Eileen McNaughton [Mon, 3 Jul 2023 02:05:39 +0000 (14:05 +1200)]
Test cleanup in BAO_ParticipantTest

Fixes to use the trait. Also simplifies the fixEventLevel test
- the fixEventLevel function has a lot of set up with
some legacy function calls. However, the set up is not
relevent the the string-processing function being tested

16 months agoFix debug permissions for API 4 Explorer debug
larssandergreen [Mon, 3 Jul 2023 01:45:41 +0000 (19:45 -0600)]
Fix debug permissions for API 4 Explorer debug

16 months agoAllow Drupal webstest user to view debug output
larssandergreen [Mon, 3 Jul 2023 01:40:11 +0000 (19:40 -0600)]
Allow Drupal webstest user to view debug output

16 months agoMerge pull request #26701 from eileenmcnaughton/event
Eileen McNaughton [Mon, 3 Jul 2023 01:34:10 +0000 (18:34 -0700)]
Merge pull request #26701 from eileenmcnaughton/event

[Tests] Fix a few more places to use eventTrait & remove `legacyEventCreate`

16 months agoFix a few more places to use eventTrait & remove legacyEventCreate
Eileen McNaughton [Mon, 3 Jul 2023 00:20:34 +0000 (12:20 +1200)]
Fix a few more places to use eventTrait & remove legacyEventCreate

16 months agoMerge pull request #26672 from totten/master-standalone-obj
Tim Otten [Sun, 2 Jul 2023 21:26:45 +0000 (14:26 -0700)]
Merge pull request #26672 from totten/master-standalone-obj

Standalone - Track logged-in user object

16 months agoMerge pull request #26697 from larssandergreen/Re-order-SearchDisplay-Links-options
colemanw [Sun, 2 Jul 2023 20:27:54 +0000 (13:27 -0700)]
Merge pull request #26697 from larssandergreen/Re-order-SearchDisplay-Links-options

Put link first in SearchDisplay Links options

16 months agoSearchKit - Allow custom fields in join conditions
colemanw [Sun, 2 Jul 2023 17:39:34 +0000 (13:39 -0400)]
SearchKit - Allow custom fields in join conditions

16 months agoclearTempTables: fix condition for user_job check, move check inside the loop
Mathieu Lutfy [Sun, 2 Jul 2023 03:25:32 +0000 (23:25 -0400)]
clearTempTables: fix condition for user_job check, move check inside the loop

16 months agoPut link first in SearchDisplay Links options
larssandergreen [Sun, 2 Jul 2023 15:51:55 +0000 (09:51 -0600)]
Put link first in SearchDisplay Links options

16 months agoMerge pull request #25224 from braders/casecreation-medium-options-suffixes
demeritcowboy [Sun, 2 Jul 2023 13:49:02 +0000 (09:49 -0400)]
Merge pull request #25224 from braders/casecreation-medium-options-suffixes

APIv4, Case API, configure options and suffixes for medium_id field

16 months ago[NFC] 5.63 release notes
Alice Frumin [Mon, 26 Jun 2023 17:29:44 +0000 (13:29 -0400)]
[NFC] 5.63 release notes

16 months agoMerge pull request #26694 from larssandergreen/Add-unsub-and-optout-combined-to-maili...
colemanw [Sat, 1 Jul 2023 21:24:16 +0000 (14:24 -0700)]
Merge pull request #26694 from larssandergreen/Add-unsub-and-optout-combined-to-mailing-stats

Add calculated optout & unsub mailing stats to API 4

16 months agoAdd calculated optout & unsub mailing stats to API 4
larssandergreen [Sat, 1 Jul 2023 20:48:10 +0000 (14:48 -0600)]
Add calculated optout & unsub mailing stats to API 4

16 months agoMerge pull request #26689 from larssandergreen/Calculated-field-for-mailing-successfu...
colemanw [Sat, 1 Jul 2023 20:05:44 +0000 (13:05 -0700)]
Merge pull request #26689 from larssandergreen/Calculated-field-for-mailing-successful-deliveries

Add calculated fields to API 4 for total mailing stats

16 months agoMerge pull request #26693 from larssandergreen/Remove-PHP5-check
demeritcowboy [Sat, 1 Jul 2023 18:27:12 +0000 (14:27 -0400)]
Merge pull request #26693 from larssandergreen/Remove-PHP5-check

Don't check for PHP 5 on Mapping Settings

16 months agoAdd calculated fields to API 4 for overall mailing stats
larssandergreen [Sat, 1 Jul 2023 17:31:31 +0000 (11:31 -0600)]
Add calculated fields to API 4 for overall mailing stats

16 months agoDon't check for PHP 5
larssandergreen [Sat, 1 Jul 2023 16:50:56 +0000 (10:50 -0600)]
Don't check for PHP 5

16 months agoMerge pull request #26692 from larssandergreen/Correct-type-in-API-mailing-events
Eileen McNaughton [Sat, 1 Jul 2023 03:45:38 +0000 (20:45 -0700)]
Merge pull request #26692 from larssandergreen/Correct-type-in-API-mailing-events

Typo correct for MailingEventReply.php

16 months agoTypo correct for MailingEventReply.php
larssandergreen [Fri, 30 Jun 2023 23:41:25 +0000 (17:41 -0600)]
Typo correct for MailingEventReply.php

16 months agoAPIv4, Case API, configure options and suffixes for medium_id field
Bradley Taylor [Tue, 27 Dec 2022 11:37:32 +0000 (11:37 +0000)]
APIv4, Case API, configure options and suffixes for medium_id field

16 months agoMerge pull request #26691 from MegaphoneJon/replace-deprecated-event-fee-quickform
Eileen McNaughton [Fri, 30 Jun 2023 20:19:12 +0000 (13:19 -0700)]
Merge pull request #26691 from MegaphoneJon/replace-deprecated-event-fee-quickform

replace deprecated functions in event fee form

16 months agoreplace deprecated functions in event fee form
Jon Goldberg [Fri, 30 Jun 2023 19:46:05 +0000 (15:46 -0400)]
replace deprecated functions in event fee form

16 months agoMerge pull request #26686 from mlutfy/noteEntityId
Eileen McNaughton [Fri, 30 Jun 2023 19:24:54 +0000 (12:24 -0700)]
Merge pull request #26686 from mlutfy/noteEntityId

Note Form: use EntityFormTrait and setEntityId for postProcess hooks

16 months agoStandalone - Drop extra lookup
Tim Otten [Fri, 30 Jun 2023 18:57:21 +0000 (11:57 -0700)]
Standalone - Drop extra lookup

16 months agoStandalone - Fix reference to session-variable
Tim Otten [Thu, 29 Jun 2023 23:19:20 +0000 (16:19 -0700)]
Standalone - Fix reference to session-variable

16 months ago(REF) Invert relation between login functions. Prepare to reduce loads.
Tim Otten [Tue, 27 Jun 2023 21:36:23 +0000 (14:36 -0700)]
(REF) Invert relation between login functions. Prepare to reduce loads.

Before:

* Civi\Standalone\Security::loginAuthenticatedUserRecord() calls
  Civix\Authx\Standalone::loginStateless() and Civix\Authx\Standalone::loginStateful()
* The logged-in user may be loaded twice - e.g. for workflows that
  hit `loginAuthenticatedUserRecord()`

After

* Civix\Authx\Standalone::loginStateless() and Civix\Authx\Standalone::loginStateful()
  call Civi\Standalone\Security::loginAuthenticatedUserRecord()
* The logged-in user is still loaded twice... but it'll small fix to load only once.

Comments

* The redundancy arose because `loginAuthenticatedUserRecord()` had the full-record,
  and it called to `loginStateless()` (etc) with just ID or name - which then loaded
  the full-record again.
* One might ask: "Is one orientation conceptually or philosophically better
  than the other?" I don't have a good answer to that, but...  I think this
  patch makes for a nicer symmetry between `Civi\Authx\Standalone` and
  `Civi\Authx\{Drupal,WordPress,etc}`.  In all cases, they take the
  userID/username and then perform a 1-4 SLOC incantation that
  populates the global user-record.

16 months agoMerge pull request #26687 from colemanw/grantAutocomplete
Eileen McNaughton [Fri, 30 Jun 2023 17:42:46 +0000 (10:42 -0700)]
Merge pull request #26687 from colemanw/grantAutocomplete

CiviGrant - Support APIv4 autocompletes

16 months agoMerge pull request #26683 from larssandergreen/Add-Mailing-delivered-to-API4
Eileen McNaughton [Fri, 30 Jun 2023 17:41:29 +0000 (10:41 -0700)]
Merge pull request #26683 from larssandergreen/Add-Mailing-delivered-to-API4

Add missing Mailing Events to API4: Delivered, Forward, Reply

16 months agoMerge pull request #26681 from colemanw/isPrettyMuchEqual
Eileen McNaughton [Fri, 30 Jun 2023 17:40:30 +0000 (10:40 -0700)]
Merge pull request #26681 from colemanw/isPrettyMuchEqual

crmAutocomplete - Fix endless loop (again)

16 months agocrmAutocomplete - Fix endless loop (again)
colemanw [Thu, 29 Jun 2023 17:07:19 +0000 (13:07 -0400)]
crmAutocomplete - Fix endless loop (again)

This regressed in 65a6ae6b9228ad945b0f2dc9b80886468098555f because the comparison
needs to equivocate numbers and numeric strings.

Update ang/crmUi.js

Co-authored-by: Rich Lott <artfulrobot@users.noreply.github.com>
16 months agoMerge pull request #26685 from artfulrobot/artfulrobot-add-port-to-FB-redirect
colemanw [Fri, 30 Jun 2023 16:08:00 +0000 (09:08 -0700)]
Merge pull request #26685 from artfulrobot/artfulrobot-add-port-to-FB-redirect

Fix ommitted port when constructing redirect URL

16 months agoNote Form: use EntityFormTrait and setEntityId for postProcess hooks
Mathieu Lu [Fri, 30 Jun 2023 15:16:22 +0000 (11:16 -0400)]
Note Form: use EntityFormTrait and setEntityId for postProcess hooks

16 months agoFix ommitted port when constructing redirect URL
Rich Lott / Artful Robot [Fri, 30 Jun 2023 15:03:00 +0000 (16:03 +0100)]
Fix ommitted port when constructing redirect URL

Form Builder can be configured to send a redirect after a submission
form has submitted. Before this change it rebuilt URLs with all the
parts except the port, causing failures on sites that use a non standard
port. After this change, a port is used if there is one.

16 months agoAdd missing Mailing Events to API4: Delivered, Forward, Reply
larssandergreen [Fri, 30 Jun 2023 00:25:41 +0000 (18:25 -0600)]
Add missing Mailing Events to API4: Delivered, Forward, Reply

16 months agoMerge pull request #26682 from samuelsov/dev/core#4396
colemanw [Fri, 30 Jun 2023 00:10:48 +0000 (17:10 -0700)]
Merge pull request #26682 from samuelsov/dev/core#4396

dev/core#4396 AdminUI Find contact using sort_name

17 months agoStandalone - Track logged-in user object
Tim Otten [Tue, 27 Jun 2023 08:49:36 +0000 (01:49 -0700)]
Standalone - Track logged-in user object

Overview
--------

This is a partial solution for running `E2E_Extern_CliRunnerTest::testPermissionLookup()` on Standalone.

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

The test calls:

```
cv ev --user='admin' 'echo json_encode(CRM_Core_Config::singleton()->userPermissionClass->check("administer CiviCRM", 0));'
```

Internally, this command relies on `CRM_Core_BAO_UFMatch::synchronize()` by way of:

https://github.com/civicrm/cv/blob/59efd9ffefde8dc500643e048d37db90e0de11b7/src/Util/BootTrait.php#L213-L235

Calls to `UFMatch::synchronize($user)` are expected to pass in a user-record.

Before
------

Standalone logins record the active user-ID.

After
------

Standalone logins record the active user-ID and active user-record (which can be supplied to `UFMatch::synchronize()`).

17 months agodev/core#4396
Samuel Vanhove [Thu, 29 Jun 2023 20:12:03 +0000 (16:12 -0400)]
dev/core#4396

17 months agoMerge pull request #26680 from demeritcowboy/codegen-php8
Eileen McNaughton [Thu, 29 Jun 2023 20:10:19 +0000 (13:10 -0700)]
Merge pull request #26680 from demeritcowboy/codegen-php8

[PHP8] Codegen - Don't generate invalid secondary emails

17 months agoCiviGrant - Support APIv4 autocompletes
colemanw [Thu, 29 Jun 2023 18:10:01 +0000 (14:10 -0400)]
CiviGrant - Support APIv4 autocompletes

17 months agoMerge pull request #26673 from larssandergreen/Rename-dedupe-rules
demeritcowboy [Thu, 29 Jun 2023 14:39:15 +0000 (10:39 -0400)]
Merge pull request #26673 from larssandergreen/Rename-dedupe-rules

Clarify dedupe rules as "Name or Email"

17 months agoavoid invalid secondary emails
demeritcowboy [Thu, 29 Jun 2023 13:57:17 +0000 (09:57 -0400)]
avoid invalid secondary emails

17 months agoMerge pull request #26654 from eileenmcnaughton/survey_2
colemanw [Thu, 29 Jun 2023 02:17:35 +0000 (19:17 -0700)]
Merge pull request #26654 from eileenmcnaughton/survey_2

Add workflow message template for sign_petition, confirm petition

17 months agoMerge pull request #26655 from eileenmcnaughton/survey_3
colemanw [Thu, 29 Jun 2023 02:17:16 +0000 (19:17 -0700)]
Merge pull request #26655 from eileenmcnaughton/survey_3

Fix test to use created workflow

17 months agoMerge pull request #26675 from totten/master-data-cleanup
Eileen McNaughton [Wed, 28 Jun 2023 16:49:13 +0000 (09:49 -0700)]
Merge pull request #26675 from totten/master-data-cleanup

(REF) Simplify some more installation data

17 months agoMerge pull request #26678 from totten/master-joomla-setup
Eileen McNaughton [Wed, 28 Jun 2023 16:47:41 +0000 (09:47 -0700)]
Merge pull request #26678 from totten/master-joomla-setup

(dev/core#1615) Setup - Prepare to generate Joomla-style "civicrm.settings.php"

17 months agoMerge pull request #26677 from totten/master-dist
Eileen McNaughton [Wed, 28 Jun 2023 16:46:52 +0000 (09:46 -0700)]
Merge pull request #26677 from totten/master-dist

distmaker - Add some options to speed up frequent rebuilds

17 months agoMerge pull request #24681 from larssandergreen/force-refresh-cache-for-smart-groups...
Eileen McNaughton [Wed, 28 Jun 2023 16:45:11 +0000 (09:45 -0700)]
Merge pull request #24681 from larssandergreen/force-refresh-cache-for-smart-groups-when-scheduling-mailing

dev/core#3890 Rebuild smart groups included in mailing on scheduling

17 months agoMerge pull request #26679 from artfulrobot/tidy-ufId-to-ufID
Eileen McNaughton [Wed, 28 Jun 2023 16:34:13 +0000 (09:34 -0700)]
Merge pull request #26679 from artfulrobot/tidy-ufId-to-ufID

NFC: standardise ufId to ufID to avoid confusion

17 months agoNFC: standardise ufId to ufID to avoid confusion
Rich Lott / Artful Robot [Wed, 28 Jun 2023 13:55:36 +0000 (14:55 +0100)]
NFC: standardise ufId to ufID to avoid confusion

17 months agoInstallSettingsFile - Split out separate rules for Joomla settings files
Tim Otten [Wed, 28 Jun 2023 08:41:01 +0000 (01:41 -0700)]
InstallSettingsFile - Split out separate rules for Joomla settings files

17 months agoSettingsUtil::evaluate - Substitute variables atomically
Tim Otten [Wed, 28 Jun 2023 08:11:44 +0000 (01:11 -0700)]
SettingsUtil::evaluate - Substitute variables atomically

Iterative substitution allows silliness. It's not a specific problem because
the range of inputs is so narrow here, but it's good cleanup the code-smell.

17 months ago(REF) InstallSettingsFile - Extract 'createParams()` and `evaluate()`
Tim Otten [Wed, 28 Jun 2023 08:00:21 +0000 (01:00 -0700)]
(REF) InstallSettingsFile - Extract 'createParams()` and `evaluate()`

17 months agodistmaker - Add option DM_SKIP_EXT
Tim Otten [Wed, 28 Jun 2023 06:37:01 +0000 (23:37 -0700)]
distmaker - Add option DM_SKIP_EXT

17 months agodistmaker - Don't print every statement (Joomla build script)
Tim Otten [Wed, 28 Jun 2023 06:28:12 +0000 (23:28 -0700)]
distmaker - Don't print every statement (Joomla build script)

17 months agodistmaker - Use quieter "rsync"
Tim Otten [Wed, 28 Jun 2023 06:27:50 +0000 (23:27 -0700)]
distmaker - Use quieter "rsync"

17 months agodistmaker - Add options DM_KEEP_GIT, DM_KEEP_DEPS, DM_SKIP_ALT
Tim Otten [Wed, 28 Jun 2023 05:57:12 +0000 (22:57 -0700)]
distmaker - Add options DM_KEEP_GIT, DM_KEEP_DEPS, DM_SKIP_ALT

If you're going through a frequent build/test cycle on Joomla patches, it's nice to cutdown
unnecessary build steps.

17 months ago(REF) Simplify civicrm_tag.sqldata.php
Tim Otten [Wed, 28 Jun 2023 00:00:31 +0000 (17:00 -0700)]
(REF) Simplify civicrm_tag.sqldata.php

17 months ago(REF) Simplify civicrm_membership_status.sqldata.php
Tim Otten [Wed, 28 Jun 2023 00:00:24 +0000 (17:00 -0700)]
(REF) Simplify civicrm_membership_status.sqldata.php

17 months ago(REF) Simplify civicrm_location_type.sqldata.php
Tim Otten [Wed, 28 Jun 2023 00:00:18 +0000 (17:00 -0700)]
(REF) Simplify civicrm_location_type.sqldata.php

17 months ago(REF) Simplify civicrm_job.sqldata.php
Tim Otten [Tue, 27 Jun 2023 23:59:43 +0000 (16:59 -0700)]
(REF) Simplify civicrm_job.sqldata.php

17 months ago(REF) Simplify civicrm_contact_type.sqldata.php
Tim Otten [Tue, 27 Jun 2023 23:59:20 +0000 (16:59 -0700)]
(REF) Simplify civicrm_contact_type.sqldata.php

17 months agoMerge pull request #26657 from totten/master-standalone-403
Tim Otten [Tue, 27 Jun 2023 21:09:41 +0000 (14:09 -0700)]
Merge pull request #26657 from totten/master-standalone-403

Standalone - Generate proper HTTP response code for permission-errors

17 months agoregenerate civicrm_generated
larssandergreen [Tue, 27 Jun 2023 21:01:37 +0000 (21:01 +0000)]
regenerate civicrm_generated

17 months agoRename "Name and Email" dedupe rules to "Name or Email"
larssandergreen [Tue, 27 Jun 2023 20:55:53 +0000 (14:55 -0600)]
Rename "Name and Email" dedupe rules to "Name or Email"

17 months agoMerge pull request #26604 from christianwach/lab-wp-121
demeritcowboy [Tue, 27 Jun 2023 20:53:06 +0000 (16:53 -0400)]
Merge pull request #26604 from christianwach/lab-wp-121

Fix UTC offsets when retrieving timezone string in WordPress

17 months agoMerge pull request #26671 from colemanw/deleteTpl
Yashodha Chaku [Tue, 27 Jun 2023 11:31:54 +0000 (17:01 +0530)]
Merge pull request #26671 from colemanw/deleteTpl

Delete unused tpl file

17 months agoDelete unused tpl file
colemanw [Tue, 27 Jun 2023 04:57:52 +0000 (00:57 -0400)]
Delete unused tpl file

This tpl is unused since b30809e49e9ed5142092f2157877a24ad1df17ee

17 months agoMerge pull request #26383 from MegaphoneJon/crmmoney-filter
Eileen McNaughton [Tue, 27 Jun 2023 00:06:38 +0000 (17:06 -0700)]
Merge pull request #26383 from MegaphoneJon/crmmoney-filter

crmMoney filter - allow coercing locale

17 months agoMerge pull request #25989 from eileenmcnaughton/import_county
Eileen McNaughton [Tue, 27 Jun 2023 00:00:09 +0000 (17:00 -0700)]
Merge pull request #25989 from eileenmcnaughton/import_county

Ensure counties are properly imported even if ambiguous

17 months agoensure counties are properly imported even if ambiguous
Jamie McClelland [Mon, 5 Dec 2022 21:49:21 +0000 (16:49 -0500)]
ensure counties are properly imported even if ambiguous

If a county has a unique name, you can import it by name.

But, if there is one or more counties with the same name, the county is
not properly converted to an id, and we get a foreign constraint error
and/or a invalid value error.

17 months agoMerge pull request #26651 from eileenmcnaughton/workflow
Tim Otten [Mon, 26 Jun 2023 22:22:28 +0000 (15:22 -0700)]
Merge pull request #26651 from eileenmcnaughton/workflow

Follow up to #26618 - set locale consistently when exporting model

17 months agoStandalone - Generate proper HTTP response code for permission-errors
Tim Otten [Sun, 25 Jun 2023 08:13:57 +0000 (01:13 -0700)]
Standalone - Generate proper HTTP response code for permission-errors

`E2E_Core_ErrorTest` checks for HTTP response codes on permission-errors

* Before: Sends HTTP 200. Tests for `frontend_permission` and `backend_permission` fails.
* After: Sends HTTP 403. Tests for `frontend_permission` and `backend_permission` passes.

17 months agoMerge pull request #26649 from totten/master-standalone-paths
Tim Otten [Mon, 26 Jun 2023 20:01:07 +0000 (13:01 -0700)]
Merge pull request #26649 from totten/master-standalone-paths

Standalone - Fix some path calculations

17 months agoMerge pull request #26643 from totten/master-auto-enable
Tim Otten [Mon, 26 Jun 2023 19:34:46 +0000 (12:34 -0700)]
Merge pull request #26643 from totten/master-auto-enable

Standalone - Auto-enable user subsystem. Tweak default user.

17 months agoMerge pull request #26670 from larssandergreen/Remove-Search-Builder-links-from-searc...
demeritcowboy [Mon, 26 Jun 2023 18:37:45 +0000 (14:37 -0400)]
Merge pull request #26670 from larssandergreen/Remove-Search-Builder-links-from-search-results

Remove Search Builder link from search results

17 months agoStandaloneUsers.civi-setup.php - Fix log message for recently added 'adminUser' property
Tim Otten [Mon, 26 Jun 2023 18:34:41 +0000 (11:34 -0700)]
StandaloneUsers.civi-setup.php - Fix log message for recently added 'adminUser' property

17 months agoRemove Search Builder link from search results
larssandergreen [Mon, 26 Jun 2023 18:01:15 +0000 (12:01 -0600)]
Remove Search Builder link from search results

17 months agoMerge pull request #26667 from civicrm/5.63
Seamus Lee [Mon, 26 Jun 2023 15:27:02 +0000 (11:27 -0400)]
Merge pull request #26667 from civicrm/5.63

5.63

17 months agoMerge pull request #26668 from demeritcowboy/adminui-reserved
Seamus Lee [Mon, 26 Jun 2023 15:26:40 +0000 (11:26 -0400)]
Merge pull request #26668 from demeritcowboy/adminui-reserved

Admin UI - be like regular civi and don't show reserved custom groups

17 months agoMerge pull request #26665 from eileenmcnaughton/import
demeritcowboy [Mon, 26 Jun 2023 14:00:41 +0000 (10:00 -0400)]
Merge pull request #26665 from eileenmcnaughton/import

dev/core#4317 Fix import issue when civicrm_custom_group.name ends in `_`

17 months agoMerge pull request #26661 from eileenmcnaughton/tokens
colemanw [Mon, 26 Jun 2023 13:42:13 +0000 (06:42 -0700)]
Merge pull request #26661 from eileenmcnaughton/tokens

Add survey tokens

17 months agoMerge pull request #26664 from eileenmcnaughton/custom_search
colemanw [Mon, 26 Jun 2023 13:37:03 +0000 (06:37 -0700)]
Merge pull request #26664 from eileenmcnaughton/custom_search

Move last (hopefully) custom search classes to the extension, unhide