civicrm-core.git
3 years agoComment intent to remove call to transition components
eileen [Tue, 2 Feb 2021 20:55:16 +0000 (09:55 +1300)]
Comment intent to remove call to transition components

The other usages have been migrated to contributioncancelactions so only update-to-completed remains

3 years agoMerge pull request #19503 from mattwire/casecomponentignoreexception
Seamus Lee [Tue, 2 Feb 2021 20:00:23 +0000 (07:00 +1100)]
Merge pull request #19503 from mattwire/casecomponentignoreexception

Use exceptions when enabling case component / checking for 'CREATE VIEW' permissions

3 years agoUse exceptions when enabling case component / checking for 'CREATE VIEW' permissions
Matthew Wire [Tue, 2 Feb 2021 14:27:34 +0000 (14:27 +0000)]
Use exceptions when enabling case component / checking for 'CREATE VIEW' permissions

3 years agoMerge pull request #19499 from eileenmcnaughton/silly_if
Seamus Lee [Tue, 2 Feb 2021 09:50:50 +0000 (20:50 +1100)]
Merge pull request #19499 from eileenmcnaughton/silly_if

Remove always true if

3 years agoMerge pull request #19289 from eileenmcnaughton/cancel
Monish Deb [Tue, 2 Feb 2021 04:21:46 +0000 (09:51 +0530)]
Merge pull request #19289 from eileenmcnaughton/cancel

dev/core#2206 Move cancel pledge into Contribution.create and fix

3 years agoMerge pull request #19493 from civicrm/5.34
Seamus Lee [Tue, 2 Feb 2021 03:58:15 +0000 (14:58 +1100)]
Merge pull request #19493 from civicrm/5.34

5.34

3 years agoMerge pull request #19497 from eileenmcnaughton/534
Seamus Lee [Tue, 2 Feb 2021 02:14:59 +0000 (13:14 +1100)]
Merge pull request #19497 from eileenmcnaughton/534

Fix for ReportTest when launching a pdf

3 years agoRemove always true if
eileen [Tue, 2 Feb 2021 01:19:13 +0000 (14:19 +1300)]
Remove always true if

This if is logically always true based on the if that precedes it

3 years agoFix for ReportTest when launching a pdf
eileen [Tue, 2 Feb 2021 00:59:37 +0000 (13:59 +1300)]
Fix for ReportTest when launching a pdf

3 years agoMerge pull request #19468 from mattwire/cpcleanup
Seamus Lee [Mon, 1 Feb 2021 22:25:16 +0000 (09:25 +1100)]
Merge pull request #19468 from mattwire/cpcleanup

NFC Minor code cleanup to contribution pages

3 years agoMerge pull request #19481 from eileenmcnaughton/pdffix
Seamus Lee [Mon, 1 Feb 2021 22:07:34 +0000 (09:07 +1100)]
Merge pull request #19481 from eileenmcnaughton/pdffix

dev/core#2344 unit test for fix regression affecting sending thank you letters when grouped

3 years agoMerge pull request #19490 from mlutfy/fixTokenProcessorEscape
Matthew Wire [Mon, 1 Feb 2021 21:10:13 +0000 (21:10 +0000)]
Merge pull request #19490 from mlutfy/fixTokenProcessorEscape

Token Processor: fix PHP syntax for purifyHTML

3 years agoMinor code cleanup to contribution pages
Matthew Wire [Sat, 30 Jan 2021 17:26:19 +0000 (17:26 +0000)]
Minor code cleanup to contribution pages

3 years agoMerge pull request #19489 from colemanw/searchKitBugs
Eileen McNaughton [Mon, 1 Feb 2021 20:16:48 +0000 (09:16 +1300)]
Merge pull request #19489 from colemanw/searchKitBugs

Search Kit: Misc bug fixes

3 years agoMerge pull request #19487 from civicrm/5.34
Eileen McNaughton [Mon, 1 Feb 2021 20:13:12 +0000 (09:13 +1300)]
Merge pull request #19487 from civicrm/5.34

5.34

3 years agoMerge pull request #19491 from herbdool/issue-2352
Eileen McNaughton [Mon, 1 Feb 2021 20:08:57 +0000 (09:08 +1300)]
Merge pull request #19491 from herbdool/issue-2352

Issue #2352: fix Views integration suggestion

3 years agoMerge pull request #19461 from colemanw/searchCancel
Eileen McNaughton [Mon, 1 Feb 2021 20:04:42 +0000 (09:04 +1300)]
Merge pull request #19461 from colemanw/searchCancel

Greenwich: Fix BS3 conflict with html5 search clear button

3 years agoMerge pull request #19485 from seamuslee001/composer_update
Eileen McNaughton [Mon, 1 Feb 2021 20:03:27 +0000 (09:03 +1300)]
Merge pull request #19485 from seamuslee001/composer_update

[NFC] Update composer.lock

3 years agoAfform Gui - Align buttons to right on admin list
Coleman Watts [Mon, 1 Feb 2021 19:00:02 +0000 (14:00 -0500)]
Afform Gui - Align buttons to right on admin list

3 years agoIssue #2352: fix Views integration suggestion
Herb v/d Dool [Mon, 1 Feb 2021 18:17:54 +0000 (13:17 -0500)]
Issue #2352: fix Views integration suggestion

3 years agoToken Processor: fix PHP syntax for purifyHTML
Mathieu Lutfy [Mon, 1 Feb 2021 15:30:08 +0000 (10:30 -0500)]
Token Processor: fix PHP syntax for purifyHTML

3 years agodev/core#2349 Fix Search Kit display of pseudoconstant fields
Coleman Watts [Mon, 1 Feb 2021 15:23:27 +0000 (10:23 -0500)]
dev/core#2349 Fix Search Kit display of pseudoconstant fields

3 years agoMerge pull request #19488 from eileenmcnaughton/act_map_form
Yashodha Chaku [Mon, 1 Feb 2021 15:22:51 +0000 (20:52 +0530)]
Merge pull request #19488 from eileenmcnaughton/act_map_form

[REF] Remove copy & paste code from Activity mapping form

3 years agoSearch Kit: Fix rowCount to run only if results exceed limit
Coleman Watts [Mon, 1 Feb 2021 15:22:39 +0000 (10:22 -0500)]
Search Kit: Fix rowCount to run only if results exceed limit

3 years agodev/core#2347 Search Kit: Fix 'Select All' in table display
Coleman Watts [Mon, 1 Feb 2021 14:43:52 +0000 (09:43 -0500)]
dev/core#2347 Search Kit: Fix 'Select All' in table display

3 years agoMerge pull request #19479 from colemanw/afformSearchBugFixes
Seamus Lee [Mon, 1 Feb 2021 07:01:32 +0000 (18:01 +1100)]
Merge pull request #19479 from colemanw/afformSearchBugFixes

Search Kit - Fix display pager and improve error handling

3 years agoMerge pull request #19483 from eileenmcnaughton/part
Seamus Lee [Mon, 1 Feb 2021 07:01:09 +0000 (18:01 +1100)]
Merge pull request #19483 from eileenmcnaughton/part

dev/core#2348 fix unreleased regression

3 years agodev/core#2344 fix regression affecting sending thank you letters when grouped
eileen [Mon, 1 Feb 2021 04:49:46 +0000 (17:49 +1300)]
dev/core#2344 fix regression affecting sending thank you letters when grouped

3 years agoMerge pull request #19482 from eileenmcnaughton/pdfprep2
Seamus Lee [Mon, 1 Feb 2021 06:52:30 +0000 (17:52 +1100)]
Merge pull request #19482 from eileenmcnaughton/pdfprep2

dev/core#2344 fix regression affecting sending thank you letters when grouped

3 years agoMerge pull request #19480 from eileenmcnaughton/pdf
Eileen McNaughton [Mon, 1 Feb 2021 06:50:55 +0000 (19:50 +1300)]
Merge pull request #19480 from eileenmcnaughton/pdf

[REF] Prelminary tidy up to support fix for dev/core#2344

3 years ago[REF] Remove copy & paste code from Activity mapping form
eileen [Mon, 1 Feb 2021 06:50:25 +0000 (19:50 +1300)]
[REF] Remove copy & paste code from Activity mapping form

All this code to support location types appears to be copied & pasted & not accessed in this form

3 years ago[NFC] Update composer.lock
Seamus Lee [Mon, 1 Feb 2021 05:29:00 +0000 (16:29 +1100)]
[NFC] Update composer.lock

3 years agoMerge pull request #19484 from eileenmcnaughton/upit
Eileen McNaughton [Mon, 1 Feb 2021 05:27:17 +0000 (18:27 +1300)]
Merge pull request #19484 from eileenmcnaughton/upit

Merge 5.34 to master

3 years agoMerge branch '5.34' of https://github.com/civicrm/civicrm-core into upit
eileen [Mon, 1 Feb 2021 05:25:51 +0000 (18:25 +1300)]
Merge branch '5.34' of https://github.com/civicrm/civicrm-core into upit

3 years agoMerge pull request #19457 from seamuslee001/dev_core_2324
Eileen McNaughton [Mon, 1 Feb 2021 05:23:10 +0000 (18:23 +1300)]
Merge pull request #19457 from seamuslee001/dev_core_2324

dev/core#2324 Update jquery-validaton to be 1.19.3

3 years agoMerge pull request #19448 from mattwire/countryactive
Eileen McNaughton [Mon, 1 Feb 2021 05:19:41 +0000 (18:19 +1300)]
Merge pull request #19448 from mattwire/countryactive

dev/core#2329 Add is_active field to Country/StateProvince/County

3 years agodev/core#2348 fix unreleased regression
eileen [Mon, 1 Feb 2021 05:02:04 +0000 (18:02 +1300)]
dev/core#2348 fix unreleased regression

3 years agodev/core#2344 fix regression affecting sending thank you letters when grouped
eileen [Mon, 1 Feb 2021 04:49:46 +0000 (17:49 +1300)]
dev/core#2344 fix regression affecting sending thank you letters when grouped

3 years ago[REF] Prelminary tidy up to support fix for dev/core#2344
eileen [Mon, 1 Feb 2021 04:41:02 +0000 (17:41 +1300)]
[REF] Prelminary tidy up to support fix for dev/core#2344

3 years agoMerge pull request #19460 from colemanw/afformFix
Seamus Lee [Mon, 1 Feb 2021 03:36:57 +0000 (14:36 +1100)]
Merge pull request #19460 from colemanw/afformFix

Afform - Fix form submit button

3 years agoMerge pull request #19472 from eileenmcnaughton/amtg
Seamus Lee [Mon, 1 Feb 2021 03:27:17 +0000 (14:27 +1100)]
Merge pull request #19472 from eileenmcnaughton/amtg

dev/core#2333 Fix issue when clicking on alpha links from 'amtg' search

3 years agoSearch Kit - Fix display pager
Coleman Watts [Mon, 1 Feb 2021 02:43:19 +0000 (21:43 -0500)]
Search Kit - Fix display pager

3 years agoFix hard-crash when afform fails to render
Coleman Watts [Mon, 1 Feb 2021 02:42:48 +0000 (21:42 -0500)]
Fix hard-crash when afform fails to render

3 years agoMerge pull request #19477 from seamuslee001/php_74_afform
Eileen McNaughton [Mon, 1 Feb 2021 01:27:17 +0000 (14:27 +1300)]
Merge pull request #19477 from seamuslee001/php_74_afform

[NFC] Fix PHP 7.4 Syntax issue in Afform HTML Extension

3 years agoMerge pull request #19455 from colemanw/afformMeta
Seamus Lee [Mon, 1 Feb 2021 00:06:31 +0000 (11:06 +1100)]
Merge pull request #19455 from colemanw/afformMeta

Afform GUI enhancements & Search Kit integration

3 years ago[NFC] Fix PHP 7.4 Syntax issue in Afform HTML Extension
Seamus Lee [Sun, 31 Jan 2021 23:39:35 +0000 (10:39 +1100)]
[NFC] Fix PHP 7.4 Syntax issue in Afform HTML Extension

3 years agoMerge pull request #19471 from colemanw/searchBuilderSelect2
Seamus Lee [Sun, 31 Jan 2021 20:38:58 +0000 (07:38 +1100)]
Merge pull request #19471 from colemanw/searchBuilderSelect2

Search Builder - Enhance UI with Select2 and EntityRef

3 years agoMerge pull request #19431 from mattwire/membershiptypedisabledcontacttab
Eileen McNaughton [Sun, 31 Jan 2021 19:35:12 +0000 (08:35 +1300)]
Merge pull request #19431 from mattwire/membershiptypedisabledcontacttab

Show disabled membership types on contact tab

3 years agoSearch Builder - Enhance UI with Select2 and EntityRef
Coleman Watts [Sat, 30 Jan 2021 19:39:30 +0000 (14:39 -0500)]
Search Builder - Enhance UI with Select2 and EntityRef

This changes the simple select fields to use Select2
and the plain text inputs for e.g. participant_contact_id will now present a searchable dropdown for selecting a contact.

3 years agoMerge pull request #19450 from totten/master-rest-escape
Eileen McNaughton [Sat, 30 Jan 2021 22:28:46 +0000 (11:28 +1300)]
Merge pull request #19450 from totten/master-rest-escape

API Explorer - Fix URL encoding in REST examples

3 years agodev/core#2333 Fix issue when clicking on alpha links from 'amtg' search
eileen [Sat, 30 Jan 2021 22:24:53 +0000 (11:24 +1300)]
dev/core#2333 Fix issue when clicking on alpha links from 'amtg' search

3 years agoMerge pull request #19465 from colemanw/AfformDataTypes
Eileen McNaughton [Sat, 30 Jan 2021 20:57:34 +0000 (09:57 +1300)]
Merge pull request #19465 from colemanw/AfformDataTypes

dev/core#2341 Set data_type on various fields in Afform API

3 years agoMerge pull request #19467 from mattwire/membershipblock
Eileen McNaughton [Sat, 30 Jan 2021 20:56:16 +0000 (09:56 +1300)]
Merge pull request #19467 from mattwire/membershipblock

REF Move buildMembershipBlock function from ContributionPage to Main/Confirm/Thankyou page

3 years agoMerge pull request #19470 from civicrm/5.34
Seamus Lee [Sat, 30 Jan 2021 20:19:02 +0000 (07:19 +1100)]
Merge pull request #19470 from civicrm/5.34

5.34

3 years agoMerge pull request #19466 from demeritcowboy/api4-reldate-5.34
Seamus Lee [Sat, 30 Jan 2021 19:57:34 +0000 (06:57 +1100)]
Merge pull request #19466 from demeritcowboy/api4-reldate-5.34

backport of 19462 - relative date test failure

3 years agoInitial simplification of buildMembershipBlock
Matthew Wire [Sat, 30 Jan 2021 14:20:44 +0000 (14:20 +0000)]
Initial simplification of buildMembershipBlock

3 years agoMove buildMembershipBlock function from ContributionPage to Main/Confirm/Thankyou...
Matthew Wire [Sat, 30 Jan 2021 13:39:53 +0000 (13:39 +0000)]
Move buildMembershipBlock function from ContributionPage to Main/Confirm/Thankyou page

3 years agoReplace CRM_Utils_Array
Matthew Wire [Sat, 30 Jan 2021 13:39:31 +0000 (13:39 +0000)]
Replace CRM_Utils_Array

3 years agotest fails at end of month
demeritcowboy [Sat, 30 Jan 2021 13:55:39 +0000 (08:55 -0500)]
test fails at end of month

3 years agoSet data_type on various fields in Afform API
Coleman Watts [Sat, 30 Jan 2021 01:51:32 +0000 (20:51 -0500)]
Set data_type on various fields in Afform API

3 years agoAfform Gui - Fix html preview to use complete form
Coleman Watts [Fri, 29 Jan 2021 03:49:31 +0000 (22:49 -0500)]
Afform Gui - Fix html preview to use complete form

3 years agoSearch Kit - Fix encoding of search metadata in afforms
Coleman Watts [Fri, 29 Jan 2021 01:17:04 +0000 (20:17 -0500)]
Search Kit - Fix encoding of search metadata in afforms

3 years agoAfform Gui - Support editing search forms
Coleman Watts [Thu, 28 Jan 2021 19:04:32 +0000 (14:04 -0500)]
Afform Gui - Support editing search forms

This permits search forms to be edited and saved in the Afform GUI,
and also provides a link to do so from the Search Kit admin screen.

3 years agoAfform Gui - Support cloning existing forms
Coleman Watts [Wed, 27 Jan 2021 20:13:04 +0000 (15:13 -0500)]
Afform Gui - Support cloning existing forms

3 years agoAfform Gui - Support editing blocks
Coleman Watts [Wed, 27 Jan 2021 19:24:01 +0000 (14:24 -0500)]
Afform Gui - Support editing blocks

3 years agoAfform - Fix custom field blocks
Coleman Watts [Wed, 27 Jan 2021 16:59:47 +0000 (11:59 -0500)]
Afform - Fix custom field blocks

Ensure auto-generated custom field blocks appear in the UI and load correctly

3 years agoAfform - delete unused entityDefaults dir
Coleman Watts [Wed, 27 Jan 2021 14:14:42 +0000 (09:14 -0500)]
Afform - delete unused entityDefaults dir

3 years agoAfformAdmin - use api-callback for loading metadata
Coleman Watts [Mon, 25 Jan 2021 15:51:55 +0000 (10:51 -0500)]
AfformAdmin - use api-callback for loading metadata

This switches from pre-loading all field data, to a more incremental approach of only loading the data needed by the form being edited,
then loading more metadata if additional entities or blocks are added to the form.

The Afform.loadAdminData api action is added to facilitate loading metadata for different types of afforms,
and incrementally loading metadata for new entities & blocks as they are added to an afform being edited.

3 years agoSearchKit - improve handling of dynamic tags for search displays
Coleman Watts [Sat, 23 Jan 2021 20:36:40 +0000 (15:36 -0500)]
SearchKit - improve handling of dynamic tags for search displays

The searchDisplay.type option list now includes tags instead of downstream code needing to construct them,
And the standalone pages for search displays now use server-generated partials instead of an ad-hoc switch on the client side.

3 years agoAfform - Move entity boilerplate out of runtime code & into metadata files
Coleman Watts [Fri, 22 Jan 2021 21:41:55 +0000 (16:41 -0500)]
Afform - Move entity boilerplate out of runtime code & into metadata files

3 years agoAfform - move angular dependency mapper code to its own class
Coleman Watts [Fri, 22 Jan 2021 18:19:53 +0000 (13:19 -0500)]
Afform - move angular dependency mapper code to its own class

3 years agoMerge pull request #19425 from colemanw/searchBulkActions
Eileen McNaughton [Fri, 29 Jan 2021 23:41:58 +0000 (12:41 +1300)]
Merge pull request #19425 from colemanw/searchBulkActions

dev/core#2310 Searchkit - Perform bulk updates in batches; improve user feedback.

3 years agoMerge pull request #19462 from demeritcowboy/api4-reldate
Eileen McNaughton [Fri, 29 Jan 2021 22:42:01 +0000 (11:42 +1300)]
Merge pull request #19462 from demeritcowboy/api4-reldate

dev/core#2339 - Fix failing relativeDate test

3 years agodon't let dates roll over and then not match
demeritcowboy [Fri, 29 Jan 2021 21:09:21 +0000 (16:09 -0500)]
don't let dates roll over and then not match

3 years agoFix BS3 conflict with html5 search clear button
Coleman Watts [Fri, 29 Jan 2021 19:01:15 +0000 (14:01 -0500)]
Fix BS3 conflict with html5 search clear button

3 years agoAfform - Fix form submit button
Coleman Watts [Fri, 29 Jan 2021 18:32:13 +0000 (13:32 -0500)]
Afform - Fix form submit button

3 years agoMerge pull request #19459 from wintermoor/patch-2
Seamus Lee [Fri, 29 Jan 2021 10:11:47 +0000 (21:11 +1100)]
Merge pull request #19459 from wintermoor/patch-2

Update contributor-key.yml

3 years agoShow disabled membership types on contact tab
Matthew Wire [Thu, 21 Jan 2021 16:50:27 +0000 (16:50 +0000)]
Show disabled membership types on contact tab

3 years agoAdd is_active field to Country/StateProvince/County
Matthew Wire [Tue, 26 Jan 2021 10:54:41 +0000 (10:54 +0000)]
Add is_active field to Country/StateProvince/County

3 years agoUpdate contributor-key.yml
wintermoor [Fri, 29 Jan 2021 07:14:29 +0000 (08:14 +0100)]
Update contributor-key.yml

3 years agoMerge pull request #19438 from colemanw/afformDropAttrSupport
colemanw [Fri, 29 Jan 2021 04:02:42 +0000 (23:02 -0500)]
Merge pull request #19438 from colemanw/afformDropAttrSupport

Afform - Drop directive support for attribute, only support elements as afforms

3 years agoAPIExplorer - Tweak layout in "Rest" section
Tim Otten [Fri, 29 Jan 2021 03:17:58 +0000 (19:17 -0800)]
APIExplorer - Tweak layout in "Rest" section

1. Layout looks wonky on D7 Bartik
2. Tested in D7 Bartik+Garland+Seven

3 years agoMerge pull request #19412 from JKingsnorth/patch-17
Eileen McNaughton [Fri, 29 Jan 2021 03:40:14 +0000 (16:40 +1300)]
Merge pull request #19412 from JKingsnorth/patch-17

dev/core#2305 Fix schema differences in MariaDB 10.2.x+

3 years agoMerge pull request #19456 from eileenmcnaughton/act_update
Seamus Lee [Fri, 29 Jan 2021 02:49:40 +0000 (13:49 +1100)]
Merge pull request #19456 from eileenmcnaughton/act_update

Do not set source_contact_id in summary function

3 years agooauth-client - Switch from (a)ttribute notation to (e)lement notation
Tim Otten [Fri, 29 Jan 2021 00:22:46 +0000 (16:22 -0800)]
oauth-client - Switch from (a)ttribute notation to (e)lement notation

3 years agoMerge pull request #19452 from colemanw/searchKitCustom
Eileen McNaughton [Thu, 28 Jan 2021 23:11:01 +0000 (12:11 +1300)]
Merge pull request #19452 from colemanw/searchKitCustom

SearchKit: Add support for multi-record custom field groups

3 years agoUpdate jquery-validaton to be 1.19.3
Seamus Lee [Thu, 28 Jan 2021 23:00:54 +0000 (10:00 +1100)]
Update jquery-validaton to be 1.19.3

3 years agoDo not set source_contact_id in summary function
eileen [Tue, 19 Jan 2021 01:15:13 +0000 (14:15 +1300)]
Do not set source_contact_id in summary function

This params array is discarded so this acheives nothing

3 years agoMerge pull request #19111 from eileenmcnaughton/act_custom
Seamus Lee [Thu, 28 Jan 2021 22:49:07 +0000 (09:49 +1100)]
Merge pull request #19111 from eileenmcnaughton/act_custom

dev/core#866, dev/core#1318 Fix failure to import checkboxes for activities

3 years agoMerge pull request #19454 from alifrumin/revrec
Eileen McNaughton [Thu, 28 Jan 2021 21:49:33 +0000 (10:49 +1300)]
Merge pull request #19454 from alifrumin/revrec

[dev/financial#164] Cannot edit contribution with revenue recognition date in a past year

3 years agoMerge pull request #19451 from wintermoor/patch-1
Eileen McNaughton [Thu, 28 Jan 2021 21:43:03 +0000 (10:43 +1300)]
Merge pull request #19451 from wintermoor/patch-1

Update TemplateList.tpl

3 years agofix revenue recognition date
Alice Frumin [Thu, 28 Jan 2021 19:18:23 +0000 (14:18 -0500)]
fix revenue recognition date

3 years agoafform - Add note to backlog.md about element/attribute modes
Tim Otten [Thu, 28 Jan 2021 01:15:35 +0000 (17:15 -0800)]
afform - Add note to backlog.md about element/attribute modes

The expectation is that this is not used very much.  At the moment, we don't
have a validation mechanism to warn if this expectation is broken. But whenever
we get it, it might be good to check.

3 years agoAPIExplorer - Split "Rest" in two ("Rest" vs "curl")
Tim Otten [Thu, 28 Jan 2021 00:16:33 +0000 (16:16 -0800)]
APIExplorer - Split "Rest" in two ("Rest" vs "curl")

We're serving a dual purpose of educating generally about the REST request,
and providing an example that is runnable.

However, we're not doing either well if the REST example is simultaneously
incorrect and an obscure block of text.

This splits it into two examples, one emphasizing general structure
and the other emphasizing precision/correctness.

3 years agoMerge pull request #19439 from eileenmcnaughton/act_req
Seamus Lee [Wed, 27 Jan 2021 20:36:22 +0000 (07:36 +1100)]
Merge pull request #19439 from eileenmcnaughton/act_req

dev/core#2308 do not require fields if activity_id is present

3 years agoMerge pull request #19453 from demeritcowboy/translate
Seamus Lee [Wed, 27 Jan 2021 19:44:49 +0000 (06:44 +1100)]
Merge pull request #19453 from demeritcowboy/translate

dev/translation#64 - Using %1%2 seems to confuse transifex - System status check Cms.php

3 years agodon't confuse transifex
demeritcowboy [Wed, 27 Jan 2021 15:57:42 +0000 (10:57 -0500)]
don't confuse transifex

3 years agoSearchKit: Add support for multi-record custom field groups
Coleman Watts [Wed, 27 Jan 2021 13:32:48 +0000 (08:32 -0500)]
SearchKit: Add support for multi-record custom field groups

This adds support for multi-record custom field group pseudo-entities to be added to the search as joins

3 years agoUpdate TemplateList.tpl
wintermoor [Wed, 27 Jan 2021 12:46:37 +0000 (13:46 +0100)]
Update TemplateList.tpl

missing {ts} string

3 years agoMerge pull request #19449 from mattwire/paymentgetspec
Tim Otten [Wed, 27 Jan 2021 07:17:09 +0000 (23:17 -0800)]
Merge pull request #19449 from mattwire/paymentgetspec

Payment API - Add description of `order_reference` parameter