civicrm-core.git
2 years agoMerge pull request #22371 from eileenmcnaughton/acl2
colemanw [Wed, 5 Jan 2022 02:32:53 +0000 (21:32 -0500)]
Merge pull request #22371 from eileenmcnaughton/acl2

Do not escape showHideBlocks by default

2 years agoMerge pull request #22374 from eileenmcnaughton/format
Seamus Lee [Wed, 5 Jan 2022 02:20:36 +0000 (13:20 +1100)]
Merge pull request #22374 from eileenmcnaughton/format

Formatting cleanup

2 years agoMerge pull request #21483 from jmcclelland/leaky-honoree-variable
demeritcowboy [Wed, 5 Jan 2022 00:54:36 +0000 (19:54 -0500)]
Merge pull request #21483 from jmcclelland/leaky-honoree-variable

Ensure we don't get previously set honoree values in receipts

2 years agoFormatting cleanup
Eileen McNaughton [Wed, 5 Jan 2022 00:41:39 +0000 (13:41 +1300)]
Formatting cleanup

2 years agoMerge pull request #22370 from eileenmcnaughton/acl
Eileen McNaughton [Wed, 5 Jan 2022 00:35:55 +0000 (13:35 +1300)]
Merge pull request #22370 from eileenmcnaughton/acl

Fix notices on acl page

2 years agoMerge pull request #22356 from colemanw/searchKitLinks
colemanw [Tue, 4 Jan 2022 23:05:24 +0000 (18:05 -0500)]
Merge pull request #22356 from colemanw/searchKitLinks

SearchKit - Allow aggregate columns to be links

2 years agoDo not escape showHideBlocks by default
Eileen McNaughton [Tue, 4 Jan 2022 22:49:42 +0000 (11:49 +1300)]
Do not escape showHideBlocks by default

Affects civicrm/acl?action=add&reset=1

2 years agoFix notices on acl page
Eileen McNaughton [Tue, 4 Jan 2022 22:41:26 +0000 (11:41 +1300)]
Fix notices on acl page

civicrm/acl?reset=1

2 years agoMerge pull request #21517 from mattwire/propertybagrecurinstallments
demeritcowboy [Tue, 4 Jan 2022 22:03:35 +0000 (17:03 -0500)]
Merge pull request #21517 from mattwire/propertybagrecurinstallments

Fix PropertyBag setRecurInstallments to accept 0

2 years agoMerge pull request #22309 from eileenmcnaughton/brickit
demeritcowboy [Tue, 4 Jan 2022 16:34:47 +0000 (11:34 -0500)]
Merge pull request #22309 from eileenmcnaughton/brickit

Use new money formatting util for smarty formatting

2 years agoMerge pull request #21916 from mattwire/recurprocessorid
demeritcowboy [Tue, 4 Jan 2022 06:09:07 +0000 (01:09 -0500)]
Merge pull request #21916 from mattwire/recurprocessorid

dev/financial#57 Hide recur trxn_id if it matches recur processor_id

2 years agoMerge pull request #22361 from braders/phone-email-label-accessibility
Yashodha Chaku [Tue, 4 Jan 2022 04:11:25 +0000 (09:41 +0530)]
Merge pull request #22361 from braders/phone-email-label-accessibility

Improve accessibility - associate label and fields

2 years agoMerge pull request #22364 from eileenmcnaughton/defaults
colemanw [Tue, 4 Jan 2022 02:35:28 +0000 (21:35 -0500)]
Merge pull request #22364 from eileenmcnaughton/defaults

Fix campaign dashboard to work with default escaping

2 years agoMerge pull request #22363 from eileenmcnaughton/noticey2
Seamus Lee [Tue, 4 Jan 2022 01:38:45 +0000 (12:38 +1100)]
Merge pull request #22363 from eileenmcnaughton/noticey2

Fix over-escaping when default escaping is on

2 years agoMerge pull request #22362 from eileenmcnaughton/noticey
Seamus Lee [Tue, 4 Jan 2022 01:18:41 +0000 (12:18 +1100)]
Merge pull request #22362 from eileenmcnaughton/noticey

Fix escape-by-default

2 years agoFix campaign dashboard to work with default escaping
Eileen McNaughton [Mon, 3 Jan 2022 23:51:11 +0000 (12:51 +1300)]
Fix campaign dashboard to work with default escaping

2 years agoFix over-escaping when default escaping is on
Eileen McNaughton [Mon, 3 Jan 2022 22:51:48 +0000 (11:51 +1300)]
Fix over-escaping when default escaping is on

2 years agoFix escape-by-default
Eileen McNaughton [Mon, 3 Jan 2022 22:48:07 +0000 (11:48 +1300)]
Fix escape-by-default

2 years agoMerge pull request #22357 from yashodha/dev-3012
Eileen McNaughton [Mon, 3 Jan 2022 22:29:04 +0000 (11:29 +1300)]
Merge pull request #22357 from yashodha/dev-3012

(dev/core#3012) Expose email on hold as filter for report

2 years agoMerge pull request #22359 from colemanw/api4ActivityCreate
Eileen McNaughton [Mon, 3 Jan 2022 22:28:33 +0000 (11:28 +1300)]
Merge pull request #22359 from colemanw/api4ActivityCreate

APIv4 - Set 'activity_type_id' to required

2 years agoMerge pull request #22360 from braders/import-field-docblock-improvements
colemanw [Mon, 3 Jan 2022 20:00:22 +0000 (15:00 -0500)]
Merge pull request #22360 from braders/import-field-docblock-improvements

[NFC] docblock improvements to Import_Field classes

2 years agoImprove accessibility - associate label and fields
Bradley Taylor [Mon, 3 Jan 2022 17:39:03 +0000 (17:39 +0000)]
Improve accessibility - associate label and fields

2 years agodocblock improvements to Import_Field classes
Bradley Taylor [Mon, 3 Jan 2022 17:20:07 +0000 (17:20 +0000)]
docblock improvements to Import_Field classes

2 years agoAPIv4 - Set 'activity_type_id' to required
Coleman Watts [Tue, 28 Dec 2021 15:40:58 +0000 (10:40 -0500)]
APIv4 - Set 'activity_type_id' to required

In APIv4 GetFields, sets activity field to required because the
database default is problematic.

2 years agoMerge pull request #22349 from braders/chart-label-translatable
demeritcowboy [Mon, 3 Jan 2022 14:14:34 +0000 (09:14 -0500)]
Merge pull request #22349 from braders/chart-label-translatable

Allow chart dropdown labels to be translatable.

2 years agoAllow chart dropdown labels to be translatable.
Bradley Taylor [Fri, 31 Dec 2021 12:19:19 +0000 (12:19 +0000)]
Allow chart dropdown labels to be translatable.

Prior to this change, the strings 'Tabular', 'Bar Chart' and 'Pie Chart' were hardcoded.

2 years agoMerge pull request #22318 from jitendrapurohit/state_name
Yashodha Chaku [Mon, 3 Jan 2022 05:48:35 +0000 (11:18 +0530)]
Merge pull request #22318 from jitendrapurohit/state_name

Add state name to export fields

2 years ago(dev/core#3012) expose email on hold as filter for report
yashodha [Mon, 3 Jan 2022 03:31:48 +0000 (09:01 +0530)]
(dev/core#3012) expose email on hold as filter for report

2 years agoSearchKit - Allow aggregate columns to be links
Coleman Watts [Sun, 2 Jan 2022 22:02:30 +0000 (17:02 -0500)]
SearchKit - Allow aggregate columns to be links

Previously aggregate columns were excluded from being shown as links.
That's overly strict. They can't have autogenerated links, but they can
have custom links.

2 years agoMerge pull request #22350 from demeritcowboy/managed-entities-drupal
colemanw [Sun, 2 Jan 2022 15:35:18 +0000 (10:35 -0500)]
Merge pull request #22350 from demeritcowboy/managed-entities-drupal

dev/drupal#172 - module status used incorrectly in drupal 8 to determine which modules to care about for managed entities

2 years agoMerge pull request #22347 from braders/price-set-unnecessary-ids
colemanw [Sun, 2 Jan 2022 15:33:14 +0000 (10:33 -0500)]
Merge pull request #22347 from braders/price-set-unnecessary-ids

Remove unnecessary id attribute.

2 years agoMerge pull request #22354 from civicrm/5.45
Seamus Lee [Sat, 1 Jan 2022 23:52:28 +0000 (10:52 +1100)]
Merge pull request #22354 from civicrm/5.45

5.45

2 years agoMerge pull request #22353 from seamuslee001/5.45
Tim Otten [Sat, 1 Jan 2022 23:00:23 +0000 (17:00 -0600)]
Merge pull request #22353 from seamuslee001/5.45

[REF] Fix tests that fail after 2021

2 years agofix expired credit card
demeritcowboy [Sat, 1 Jan 2022 19:25:41 +0000 (14:25 -0500)]
fix expired credit card

2 years agofix tests that will fail after 2021
demeritcowboy [Sat, 1 Jan 2022 19:06:35 +0000 (14:06 -0500)]
fix tests that will fail after 2021

2 years agoMerge pull request #22352 from demeritcowboy/stuck-in-2020
Tim Otten [Sat, 1 Jan 2022 21:16:01 +0000 (15:16 -0600)]
Merge pull request #22352 from demeritcowboy/stuck-in-2020

Fix tests that fail after 2021

2 years agofix expired credit card
demeritcowboy [Sat, 1 Jan 2022 19:25:41 +0000 (14:25 -0500)]
fix expired credit card

2 years agofix tests that will fail after 2021
demeritcowboy [Sat, 1 Jan 2022 19:06:35 +0000 (14:06 -0500)]
fix tests that will fail after 2021

2 years agoRemove unnecessary id attribute.
Bradley Taylor [Fri, 31 Dec 2021 10:54:39 +0000 (10:54 +0000)]
Remove unnecessary id attribute.

The min_amount ID was used for both a tr and a input element, breaking accessibility links

2 years agoAdd state name to export fields
jitendrapurohit [Fri, 24 Dec 2021 14:28:03 +0000 (19:58 +0530)]
Add state name to export fields

2 years agostatus used incorrectly in drupal 8
demeritcowboy [Fri, 31 Dec 2021 15:21:02 +0000 (10:21 -0500)]
status used incorrectly in drupal 8

2 years agoMerge pull request #22326 from totten/master-sqlpara
colemanw [Fri, 31 Dec 2021 23:53:01 +0000 (18:53 -0500)]
Merge pull request #22326 from totten/master-sqlpara

SqlParallel - Enable more tests. Fix compatiblity with `release_time`

2 years agoMerge pull request #22337 from demeritcowboy/deprecated-schema
Seamus Lee [Fri, 31 Dec 2021 22:21:40 +0000 (09:21 +1100)]
Merge pull request #22337 from demeritcowboy/deprecated-schema

dev/drupal#172 - Deprecated function call in Drupal 9.3

2 years agoMerge pull request #22348 from braders/js-ts-escape-strategy
colemanw [Fri, 31 Dec 2021 22:07:22 +0000 (17:07 -0500)]
Merge pull request #22348 from braders/js-ts-escape-strategy

Use JS escaping for {ts} calls in a JS context

2 years agoMerge pull request #22351 from demeritcowboy/membership-testfail
Tim Otten [Fri, 31 Dec 2021 19:34:20 +0000 (13:34 -0600)]
Merge pull request #22351 from demeritcowboy/membership-testfail

Fix membership test fail for Dec 31

2 years agofix failing test on Dec 31
demeritcowboy [Fri, 31 Dec 2021 16:26:13 +0000 (11:26 -0500)]
fix failing test on Dec 31

2 years agoremove unused deprecated function call
demeritcowboy [Tue, 28 Dec 2021 20:13:13 +0000 (15:13 -0500)]
remove unused deprecated function call

2 years agoUse JS escaping for {ts} calls in a JS context
Bradley Taylor [Fri, 31 Dec 2021 11:13:12 +0000 (11:13 +0000)]
Use JS escaping for {ts} calls in a JS context

2 years agoMerge pull request #22340 from eileenmcnaughton/wktemplates
Eileen McNaughton [Fri, 31 Dec 2021 03:26:23 +0000 (16:26 +1300)]
Merge pull request #22340 from eileenmcnaughton/wktemplates

Add workflow template classes for contributions

2 years agoMerge pull request #22241 from colemanw/searchKitFunctions
Eileen McNaughton [Fri, 31 Dec 2021 03:24:54 +0000 (16:24 +1300)]
Merge pull request #22241 from colemanw/searchKitFunctions

SearchKit - Allow functions in the WHERE clause

2 years ago(NFC) ContributionTrait
Tim Otten [Fri, 31 Dec 2021 00:57:50 +0000 (18:57 -0600)]
(NFC) ContributionTrait

2 years agoMerge pull request #21181 from eileenmcnaughton/perm3
colemanw [Fri, 31 Dec 2021 00:55:02 +0000 (19:55 -0500)]
Merge pull request #21181 from eileenmcnaughton/perm3

dev/core#2752  Use acl, not blanket permissions on FinancialAccount, FinancialType, EntityFinancialAccount

2 years agoMerge pull request #22345 from eileenmcnaughton/statuses
colemanw [Fri, 31 Dec 2021 00:47:47 +0000 (19:47 -0500)]
Merge pull request #22345 from eileenmcnaughton/statuses

[REF] Deprecated old getContributionStatuses

2 years agoAdd workflow template classes for contributions
Eileen McNaughton [Wed, 29 Dec 2021 22:00:08 +0000 (11:00 +1300)]
Add workflow template classes for contributions

2 years agoUse new money formatting util for smarty formatting
Eileen McNaughton [Thu, 23 Dec 2021 05:26:19 +0000 (18:26 +1300)]
Use new money formatting util for smarty formatting

This switches us from the old function to the new function

2 years agoMerge pull request #22285 from eileenmcnaughton/token_quotes
Eileen McNaughton [Thu, 30 Dec 2021 21:10:38 +0000 (10:10 +1300)]
Merge pull request #22285 from eileenmcnaughton/token_quotes

dev/core#3001 escape single quotes when rendering tokens in html format

2 years ago[REF] Deprecated old getContributionStatuses
Eileen McNaughton [Thu, 30 Dec 2021 21:05:46 +0000 (10:05 +1300)]
[REF] Deprecated old getContributionStatuses

It is no longer used in core but I found 2 universe places so I added back
some handling for other entities & deprecated it and stopped using it
entirely in core

See https://github.com/civicrm/civicrm-core/pull/22280

2 years agoTokenSmartyTest - Add more coverage re: HTML escaping of data
Tim Otten [Thu, 30 Dec 2021 17:58:41 +0000 (11:58 -0600)]
TokenSmartyTest - Add more coverage re: HTML escaping of data

2 years agoMerge pull request #22280 from eileenmcnaughton/statuses
demeritcowboy [Thu, 30 Dec 2021 13:21:43 +0000 (08:21 -0500)]
Merge pull request #22280 from eileenmcnaughton/statuses

[REF] Simplify getContributionStatuses

2 years agoMerge pull request #22342 from civicrm/5.45
Eileen McNaughton [Thu, 30 Dec 2021 00:55:05 +0000 (13:55 +1300)]
Merge pull request #22342 from civicrm/5.45

5.45 to master

2 years agoMerge pull request #22341 from MegaphoneJon/core-3013
Eileen McNaughton [Thu, 30 Dec 2021 00:54:35 +0000 (13:54 +1300)]
Merge pull request #22341 from MegaphoneJon/core-3013

fixes core#3013 - error when creating > 25 thank-you letters

2 years agofixes core#3013 - error when creating > 25 thank-you letters
Jon Goldberg [Wed, 29 Dec 2021 23:11:21 +0000 (18:11 -0500)]
fixes core#3013 - error when creating > 25 thank-you letters

2 years agoMerge pull request #22321 from colemanw/searchAdminPagerConfigFix
Eileen McNaughton [Wed, 29 Dec 2021 22:50:50 +0000 (11:50 +1300)]
Merge pull request #22321 from colemanw/searchAdminPagerConfigFix

SearchKit - Fix UI for configuring display pager limit

2 years agoSimplify handing when name not present (new contribution)
Eileen McNaughton [Mon, 20 Dec 2021 01:17:24 +0000 (14:17 +1300)]
Simplify handing when name not present (new contribution)

2 years ago[REF] Simplify getContributionStatuses
Eileen McNaughton [Mon, 20 Dec 2021 01:15:14 +0000 (14:15 +1300)]
[REF] Simplify getContributionStatuses

The effect of the altered calls to getContributionStatus is to get a small set of options returned.

In the cases of participant & membership forms this is pending or completed. For
the ufGroup option it seems cancelled & failed are also data entry options (this method
should still cope if they don't exist).

The existing function is really confusing - but all that confusion is designed for one
form - back office contribution form - and augmented by overloading by other functions.

This splits it out.

Could sites be using 'weird and wonderful other statuses'? Our system really is set up
around supporting specific statuses and doing financial entries for those so I think maybe
we are right to not try to pander to any that could exist

2 years agoMerge pull request #22339 from braders/exception-missing-message-fix
demeritcowboy [Wed, 29 Dec 2021 18:09:56 +0000 (13:09 -0500)]
Merge pull request #22339 from braders/exception-missing-message-fix

[NFC] CRM_Core_Exception incorrectly called without message

2 years agoMerge pull request #21596 from agileware/CIVICRM-1845
demeritcowboy [Wed, 29 Dec 2021 16:45:18 +0000 (11:45 -0500)]
Merge pull request #21596 from agileware/CIVICRM-1845

Find Activities Search, default search option for Activity Status will exclude Activities by default which do not have a status of Scheduled or Completed. Confuses and frustrates End Users.

2 years agoMerge pull request #22303 from braders/core-2926-crm-summary-links
demeritcowboy [Wed, 29 Dec 2021 16:43:48 +0000 (11:43 -0500)]
Merge pull request #22303 from braders/core-2926-crm-summary-links

"Open in new tab" on .crm-summary-link icons should open contact page

2 years agoMerge pull request #22338 from braders/setstatus-param-fixes
demeritcowboy [Wed, 29 Dec 2021 16:41:50 +0000 (11:41 -0500)]
Merge pull request #22338 from braders/setstatus-param-fixes

Fix params passed to setStatus method

2 years agoMerge pull request #22333 from mlutfy/fixTsRecaptcha
demeritcowboy [Wed, 29 Dec 2021 16:27:16 +0000 (11:27 -0500)]
Merge pull request #22333 from mlutfy/fixTsRecaptcha

Fix Profile helptext menu reference to reCaptcha (by r4zoli)

2 years agoFix Profile helptext menu reference to reCaptcha (by r4zoli)
Mathieu Lutfy [Tue, 28 Dec 2021 13:38:41 +0000 (08:38 -0500)]
Fix Profile helptext menu reference to reCaptcha (by r4zoli)

2 years agoCRM_Core_Exception incorrectly called without message
Bradley Taylor [Wed, 29 Dec 2021 13:49:19 +0000 (13:49 +0000)]
CRM_Core_Exception incorrectly called without message

2 years agoFix params passed to setStatus method
Bradley Taylor [Wed, 29 Dec 2021 13:33:59 +0000 (13:33 +0000)]
Fix params passed to setStatus method

2 years agoMerge pull request #22315 from braders/more-hardcoded-strings-2
Yashodha Chaku [Wed, 29 Dec 2021 11:03:45 +0000 (16:33 +0530)]
Merge pull request #22315 from braders/more-hardcoded-strings-2

Wrap another set of hardcoded strings in {ts}

2 years agoMerge pull request #22334 from braders/docblock-and-comment-improvements
colemanw [Wed, 29 Dec 2021 02:34:05 +0000 (21:34 -0500)]
Merge pull request #22334 from braders/docblock-and-comment-improvements

Fix inaccuracies and mistakes in comments (especially phpdoc comments)

2 years agoMerge pull request #22335 from braders/participant-static-method
demeritcowboy [Tue, 28 Dec 2021 21:03:27 +0000 (16:03 -0500)]
Merge pull request #22335 from braders/participant-static-method

Correctly mark updateStatusMessage method as static

2 years agoMerge pull request #22336 from braders/crm-core-extension-typo
demeritcowboy [Tue, 28 Dec 2021 20:58:29 +0000 (15:58 -0500)]
Merge pull request #22336 from braders/crm-core-extension-typo

Fix typo. CRM_Core_Execption should be CRM_Core_Exception

2 years agoFix typo. CRM_Core_Execption should be CRM_Core_Exception
Bradley Taylor [Tue, 28 Dec 2021 19:25:56 +0000 (19:25 +0000)]
Fix typo. CRM_Core_Execption should be CRM_Core_Exception

2 years agoCorrectly mark updateStatusMessage method as static
Bradley Taylor [Tue, 28 Dec 2021 19:18:24 +0000 (19:18 +0000)]
Correctly mark updateStatusMessage method as static

2 years agoFix inaccuracies and mistakes in comments
Bradley Taylor [Tue, 28 Dec 2021 13:53:46 +0000 (13:53 +0000)]
Fix inaccuracies and mistakes in comments
(especially phpdoc comments)

2 years agoMerge pull request #22332 from braders/remove-getGrantStatusOptGroup
colemanw [Tue, 28 Dec 2021 14:01:20 +0000 (09:01 -0500)]
Merge pull request #22332 from braders/remove-getGrantStatusOptGroup

Remove unused method getGrantStatusOptGroup

2 years agoRemove unused method getGrantStatusOptGroup
Bradley Taylor [Tue, 28 Dec 2021 11:54:20 +0000 (11:54 +0000)]
Remove unused method getGrantStatusOptGroup

2 years agoMerge pull request #22310 from sunilpawar/fix_js_error
Seamus Lee [Tue, 28 Dec 2021 03:26:08 +0000 (14:26 +1100)]
Merge pull request #22310 from sunilpawar/fix_js_error

Fix JS Error for Free event with multiple participant on registration…

2 years agoMerge pull request #22331 from colemanw/fixDefaultDisplay
demeritcowboy [Mon, 27 Dec 2021 23:30:17 +0000 (18:30 -0500)]
Merge pull request #22331 from colemanw/fixDefaultDisplay

SearchKit - Fix column headers for custom fields in default display

2 years agoSearchKit - Fix column headers for custom fields in default display (standalone)
Coleman Watts [Mon, 27 Dec 2021 21:38:12 +0000 (16:38 -0500)]
SearchKit - Fix column headers for custom fields in default display (standalone)

- Create a search with at least one custom field as a column
- Click the "View" button to visit the standalone display
- Column header for custom fields will be blank without this patch

2 years agoMerge pull request #22328 from colemanw/fixCustomNull
demeritcowboy [Mon, 27 Dec 2021 16:29:06 +0000 (11:29 -0500)]
Merge pull request #22328 from colemanw/fixCustomNull

APIv4 - Fix saving NULL as custom field value

2 years agoAPIv4 - Fix saving NULL as custom field value
Coleman Watts [Mon, 27 Dec 2021 14:15:36 +0000 (09:15 -0500)]
APIv4 - Fix saving NULL as custom field value

Fixes dev/report#89

2 years agoSqlParallel - Fix compatiblity with `release_time`
Tim Otten [Sat, 25 Dec 2021 09:25:56 +0000 (01:25 -0800)]
SqlParallel - Fix compatiblity with `release_time`

The scenario `CRM_Queue_QueueTest::testTimeoutRelease()` ensures that
queue-items can be released for re-try after some period of time.

The test was not running with `SqlParallel` backend -- and once I tried
enableing it, it failed.

The patch enables testing for `SqlParallel` and gets it to pass.

2 years agoFix JS Error for Free event with multiple participant on registration screen
Sunil Pawar [Thu, 23 Dec 2021 08:34:48 +0000 (14:04 +0530)]
Fix JS Error for Free event with multiple participant on registration screen

added comment and same check on waiting list

2 years agoMerge pull request #22322 from colemanw/groupContactDefaults
Eileen McNaughton [Mon, 27 Dec 2021 05:37:36 +0000 (18:37 +1300)]
Merge pull request #22322 from colemanw/groupContactDefaults

APIv4 - Set default status when creating GroupContact record

2 years agoAPIv4 - Set default status when creating GroupContact record
Coleman Watts [Mon, 27 Dec 2021 00:52:57 +0000 (19:52 -0500)]
APIv4 - Set default status when creating GroupContact record

Fixes dev/core#2924

2 years agoAPIv4 - Allow functions in WHERE clause
Coleman Watts [Mon, 27 Dec 2021 00:16:12 +0000 (19:16 -0500)]
APIv4 - Allow functions in WHERE clause

2 years agoSearchKit - Fix UI for configuring display pager limit
Coleman Watts [Sun, 26 Dec 2021 21:19:27 +0000 (16:19 -0500)]
SearchKit - Fix UI for configuring display pager limit

Fixes dev/core#3006

2 years agoMerge pull request #22292 from totten/master-authxlogin-2
demeritcowboy [Fri, 24 Dec 2021 16:04:55 +0000 (11:04 -0500)]
Merge pull request #22292 from totten/master-authxlogin-2

Add authx_login() API for backend script authentication (alt)

2 years agoMerge pull request #22307 from eileenmcnaughton/mixed_currency
demeritcowboy [Fri, 24 Dec 2021 15:10:50 +0000 (10:10 -0500)]
Merge pull request #22307 from eileenmcnaughton/mixed_currency

Demo sample data - Add in some mixed currency contributions

2 years agoWrap another set of hardcoded strings in {ts}
Bradley Taylor [Thu, 23 Dec 2021 16:20:37 +0000 (16:20 +0000)]
Wrap another set of hardcoded strings in {ts}

2 years agoMerge pull request #22311 from braders/docurl-translate-text-and-fix-urls
Tim Otten [Fri, 24 Dec 2021 05:39:01 +0000 (21:39 -0800)]
Merge pull request #22311 from braders/docurl-translate-text-and-fix-urls

Allow text to be translated and fix URL paths in calls to docURL() function.

2 years agoMerge pull request #22312 from mlutfy/eventPhpTweak
Tim Otten [Fri, 24 Dec 2021 01:02:41 +0000 (17:02 -0800)]
Merge pull request #22312 from mlutfy/eventPhpTweak

Event Registration: initialize array

2 years agoMerge pull request #22317 from civicrm/5.45
Seamus Lee [Fri, 24 Dec 2021 00:02:03 +0000 (11:02 +1100)]
Merge pull request #22317 from civicrm/5.45

5.45

2 years agoauthx - Report a valid outcome if you are already logged in
Tim Otten [Thu, 23 Dec 2021 23:36:14 +0000 (15:36 -0800)]
authx - Report a valid outcome if you are already logged in