civicrm-core.git
3 years agoSearchKit - Use a searchDisplay instead of ad-hoc table to display main list of saved...
Coleman Watts [Thu, 26 Aug 2021 15:29:12 +0000 (11:29 -0400)]
SearchKit - Use a searchDisplay instead of ad-hoc table to display main list of saved searches

3 years agoSearchKit - only show sortable help text for sortable columns in table display
Coleman Watts [Thu, 26 Aug 2021 14:02:51 +0000 (10:02 -0400)]
SearchKit - only show sortable help text for sortable columns in table display

3 years agoSearchKit - Add custom template column type
Coleman Watts [Thu, 26 Aug 2021 12:52:48 +0000 (08:52 -0400)]
SearchKit - Add custom template column type

3 years agoMerge pull request #21332 from civicrm/5.41
Eileen McNaughton [Tue, 31 Aug 2021 19:21:31 +0000 (07:21 +1200)]
Merge pull request #21332 from civicrm/5.41

5.41 to master

3 years agoMerge pull request #21330 from demeritcowboy/contrib-token-warning
Eileen McNaughton [Tue, 31 Aug 2021 19:00:46 +0000 (07:00 +1200)]
Merge pull request #21330 from demeritcowboy/contrib-token-warning

dev/core#2807 - Contribution thank-you letters give Undefined index: contribution when you don't use any contribution tokens

3 years agoput loop back inside the if
demeritcowboy [Tue, 31 Aug 2021 14:47:43 +0000 (10:47 -0400)]
put loop back inside the if

3 years agoMerge pull request #21310 from eileenmcnaughton/prepro
demeritcowboy [Tue, 31 Aug 2021 13:03:09 +0000 (09:03 -0400)]
Merge pull request #21310 from eileenmcnaughton/prepro

[REF] dev/core#2790 Pre process cleanup on pdf tasks

3 years agoMerge pull request #21276 from eileenmcnaughton/pdf
demeritcowboy [Tue, 31 Aug 2021 13:02:55 +0000 (09:02 -0400)]
Merge pull request #21276 from eileenmcnaughton/pdf

[REF] dev/core#2790 towards pdf task trait

3 years agoMerge pull request #21254 from colemanw/afformLocationType
Seamus Lee [Tue, 31 Aug 2021 08:26:52 +0000 (18:26 +1000)]
Merge pull request #21254 from colemanw/afformLocationType

Afform - selectable location type for address, email, etc

3 years agoMerge pull request #21320 from colemanw/searchKitRun
Eileen McNaughton [Tue, 31 Aug 2021 05:26:14 +0000 (17:26 +1200)]
Merge pull request #21320 from colemanw/searchKitRun

 dev/core#2732 SearchKit - Move field formatting from client-side to server-side

3 years agoMerge pull request #21256 from demeritcowboy/support-link
Eileen McNaughton [Tue, 31 Aug 2021 04:47:58 +0000 (16:47 +1200)]
Merge pull request #21256 from demeritcowboy/support-link

Fix support link just added in oauth-client extension info.xml

3 years ago[REF] Pre process cleanup
Eileen McNaughton [Sun, 29 Aug 2021 23:14:27 +0000 (11:14 +1200)]
[REF] Pre process cleanup

3 years ago[REF] dev/core#2790 towards pdf task trait
Eileen McNaughton [Fri, 27 Aug 2021 02:29:55 +0000 (14:29 +1200)]
[REF] dev/core#2790 towards pdf task trait

Deprecate CRM_Activity_Form_Task_PDFLetterCommon

This gets us to having 2 classes rather than 3 that manage the activityPDF task
functionality.

CRM_Activity_Form_Task_PDFLetterCommon doesn't really add anything from a structure POV
but it does make it more confusing. There are also functions on the parent
that are only used by this class - which makes switching to a trait
harder. This untangles that part.

Note that once we have the trait (& some more token cleanup done) we will be well placed
to re-share some of these functions again

3 years agoMerge pull request #21325 from eileenmcnaughton/build
Seamus Lee [Tue, 31 Aug 2021 01:15:01 +0000 (11:15 +1000)]
Merge pull request #21325 from eileenmcnaughton/build

Remove extraneous buildQuickForm

3 years agoMerge pull request #21324 from seamuslee001/fix_php8_testing
Eileen McNaughton [Tue, 31 Aug 2021 00:39:08 +0000 (12:39 +1200)]
Merge pull request #21324 from seamuslee001/fix_php8_testing

[NFC] Fix UpdateSubscriptionTest on php8 by creating a Payment Processor

3 years agoRemove extraneous buildQuickForm
Eileen McNaughton [Mon, 30 Aug 2021 23:06:49 +0000 (11:06 +1200)]
Remove extraneous buildQuickForm

3 years agoMerge pull request #21297 from eileenmcnaughton/pdftrait
demeritcowboy [Mon, 30 Aug 2021 22:33:59 +0000 (18:33 -0400)]
Merge pull request #21297 from eileenmcnaughton/pdftrait

[REF] dev/core#2790 move buildForm to pdfTrait

3 years ago[NFC] Fix UpdateSubscriptionTest on php8 by creating a Payment Processor
Seamus Lee [Mon, 30 Aug 2021 22:28:54 +0000 (08:28 +1000)]
[NFC] Fix UpdateSubscriptionTest on php8 by creating a Payment Processor

3 years agoMerge pull request #21323 from civicrm/5.41
Eileen McNaughton [Mon, 30 Aug 2021 21:52:57 +0000 (09:52 +1200)]
Merge pull request #21323 from civicrm/5.41

5.41 to master

3 years agoMerge pull request #21322 from alifrumin/rn5.41
Eileen McNaughton [Mon, 30 Aug 2021 21:52:30 +0000 (09:52 +1200)]
Merge pull request #21322 from alifrumin/rn5.41

[NFC] 5.41 Release Notes - First pass

3 years agoMerge pull request #21177 from colemanw/rand
colemanw [Mon, 30 Aug 2021 20:02:39 +0000 (16:02 -0400)]
Merge pull request #21177 from colemanw/rand

SearchKit - Allow random sorting (Fixes dev/report#75)

3 years agoMerge pull request #21321 from colemanw/basicCriteria
Eileen McNaughton [Mon, 30 Aug 2021 19:40:59 +0000 (07:40 +1200)]
Merge pull request #21321 from colemanw/basicCriteria

[REF] Fix undefined smarty vars in Advanced Search

3 years agorelease notes 5.41 - first pass
Alice Frumin [Mon, 16 Aug 2021 15:10:13 +0000 (11:10 -0400)]
release notes 5.41 - first pass

3 years agoSearchKit - Move field formatting from client-side to server-side
Coleman Watts [Mon, 30 Aug 2021 15:39:02 +0000 (11:39 -0400)]
SearchKit - Move field formatting from client-side to server-side

Formattig field values server-side allows the view values to be reused in exports.
It also opens the door for more complex formatting to happen on the server, if needed.

3 years agoSearchKit - Break part of Run action into a base class
Coleman Watts [Sat, 28 Aug 2021 19:16:34 +0000 (15:16 -0400)]
SearchKit - Break part of Run action into a base class

3 years agoFix undefined smarty vars in Advanced Search
Coleman Watts [Mon, 30 Aug 2021 17:24:13 +0000 (13:24 -0400)]
Fix undefined smarty vars in Advanced Search

3 years agoMerge pull request #21317 from michaelmcandrew/dev-core-2797
colemanw [Mon, 30 Aug 2021 17:19:24 +0000 (13:19 -0400)]
Merge pull request #21317 from michaelmcandrew/dev-core-2797

better target multivalue checkbox and multiselect import validation

3 years agobetter target multivalue checkbox and multiselect import validation
Michael McAndrew [Mon, 30 Aug 2021 14:59:30 +0000 (15:59 +0100)]
better target multivalue checkbox and multiselect import validation

3 years agoMerge pull request #21120 from eileenmcnaughton/acl_setting
colemanw [Mon, 30 Aug 2021 11:55:16 +0000 (07:55 -0400)]
Merge pull request #21120 from eileenmcnaughton/acl_setting

Move financial acl setting to the extension

3 years agoMerge pull request #21315 from deb1990/fix-searchkit-add-button-ui
colemanw [Mon, 30 Aug 2021 11:45:45 +0000 (07:45 -0400)]
Merge pull request #21315 from deb1990/fix-searchkit-add-button-ui

Fix Searchkit "Add" columns button UI

3 years agoMerge pull request #21314 from seamuslee001/fix_php8_testing
Eileen McNaughton [Mon, 30 Aug 2021 09:40:07 +0000 (21:40 +1200)]
Merge pull request #21314 from seamuslee001/fix_php8_testing

[NFC] Fix undefined array key when running CRM unit test suite in php8

3 years agoFix searchkit add button ui
Debarshi Bhaumik [Mon, 30 Aug 2021 08:11:26 +0000 (09:11 +0100)]
Fix searchkit add button ui

3 years ago[NFC] Fix undefined array key when running CRM unit test suite in php8
Seamus Lee [Mon, 30 Aug 2021 07:30:36 +0000 (17:30 +1000)]
[NFC] Fix undefined array key when running CRM unit test suite in php8

3 years agoMerge pull request #21313 from seamuslee001/address_custom_data
Seamus Lee [Mon, 30 Aug 2021 05:01:13 +0000 (15:01 +1000)]
Merge pull request #21313 from seamuslee001/address_custom_data

[REF] Improve Custom data insert performance when using the copyCusto…

3 years agoMerge pull request #21312 from colemanw/entityOptions
Eileen McNaughton [Mon, 30 Aug 2021 04:39:04 +0000 (16:39 +1200)]
Merge pull request #21312 from colemanw/entityOptions

SavedSearch - Add pseudoconstant for api_entity field

3 years agoFix Address test failure by passing the hook through to copyCustomFields and fix...
Seamus Lee [Mon, 30 Aug 2021 03:01:02 +0000 (13:01 +1000)]
Fix Address test failure by passing the hook through to copyCustomFields and fix Contribution Recur test failures by doing some cleanup

3 years agoMerge pull request #21241 from eileenmcnaughton/entity_batch
Seamus Lee [Mon, 30 Aug 2021 01:44:04 +0000 (11:44 +1000)]
Merge pull request #21241 from eileenmcnaughton/entity_batch

dev/core#2682 Entity batch declare option group for pseudoconstant

3 years ago[REF] Improve Custom data insert performance when using the copyCustomFields
Seamus Lee [Mon, 30 Aug 2021 01:07:12 +0000 (11:07 +1000)]
[REF] Improve Custom data insert performance when using the copyCustomFields

3 years agoAPIv4 - Add caching in Entity.get to avoid repeated file scanning
Coleman Watts [Mon, 30 Aug 2021 00:25:39 +0000 (20:25 -0400)]
APIv4 - Add caching in Entity.get to avoid repeated file scanning

3 years agoSavedSearch - Add pseudoconstant for api_entity field
Coleman Watts [Sun, 29 Aug 2021 23:58:17 +0000 (19:58 -0400)]
SavedSearch - Add pseudoconstant for api_entity field

This makes it easier to display in the UI what a search is for,
e.g. `->addSelect('api_entity:label')` would return "Contacts" for a search of Contacts.

3 years agoMerge pull request #21309 from eileenmcnaughton/get
Seamus Lee [Sun, 29 Aug 2021 23:25:56 +0000 (09:25 +1000)]
Merge pull request #21309 from eileenmcnaughton/get

Use getter to get subscription id

3 years agoMerge pull request #21306 from eileenmcnaughton/prepro
demeritcowboy [Sun, 29 Aug 2021 23:10:42 +0000 (19:10 -0400)]
Merge pull request #21306 from eileenmcnaughton/prepro

[REF] Copy preProcessFromAddress back into the pdf function

3 years agoRegenerate Generated sql file and also set civicrm_financial_trxn to be default entit...
Seamus Lee [Sun, 29 Aug 2021 22:36:58 +0000 (08:36 +1000)]
Regenerate Generated sql file and also set civicrm_financial_trxn to be default entity_table when created via APIv4

3 years agoMerge pull request #21282 from eileenmcnaughton/test_sub
Eileen McNaughton [Sun, 29 Aug 2021 22:36:51 +0000 (10:36 +1200)]
Merge pull request #21282 from eileenmcnaughton/test_sub

Add test to UpdateSubscription form

3 years agoUse getter to get subscription id
Eileen McNaughton [Sun, 29 Aug 2021 21:32:36 +0000 (09:32 +1200)]
Use getter to get subscription id

These places all effectively do the same as

I was tempted to update that function to set the type to 'Integer'
since it is retrieved that way once it must be the case that
it could only be an integer (or that line will fail).

3 years agodev/core#2682 Entity batch declare option group for pseudoconstant
Eileen McNaughton [Mon, 23 Aug 2021 19:46:54 +0000 (07:46 +1200)]
dev/core#2682 Entity batch declare option group for pseudoconstant

3 years agoMerge pull request #21308 from mattwire/deprecatedjoi
Seamus Lee [Sun, 29 Aug 2021 21:18:45 +0000 (07:18 +1000)]
Merge pull request #21308 from mattwire/deprecatedjoi

Fix deprecated API4 Join on Email in dynamic profile

3 years agoAdd test to UpdateSubscription form
Eileen McNaughton [Fri, 27 Aug 2021 07:31:39 +0000 (19:31 +1200)]
Add test to UpdateSubscription form

3 years agoFix deprecated API4 Join
Matthew Wire [Sun, 29 Aug 2021 19:37:43 +0000 (20:37 +0100)]
Fix deprecated API4 Join

3 years agoMerge pull request #20115 from larssandergreen/fix-internal-anchor-URLs-in-mailings
Matthew Wire [Sun, 29 Aug 2021 18:06:53 +0000 (19:06 +0100)]
Merge pull request #20115 from larssandergreen/fix-internal-anchor-URLs-in-mailings

Do not add tracking to internal anchor URLs

3 years agoMerge pull request #20135 from larssandergreen/add-settings,-disable,-delete-to-group...
Matthew Wire [Sun, 29 Aug 2021 17:48:16 +0000 (18:48 +0100)]
Merge pull request #20135 from larssandergreen/add-settings,-disable,-delete-to-group-page

dev/core#2546 Add settings button to group page

3 years agoMerge pull request #21307 from civicrm/5.41
Seamus Lee [Sun, 29 Aug 2021 09:40:59 +0000 (19:40 +1000)]
Merge pull request #21307 from civicrm/5.41

5.41

3 years agoMerge pull request #21295 from eileenmcnaughton/541test
Seamus Lee [Sun, 29 Aug 2021 06:49:04 +0000 (16:49 +1000)]
Merge pull request #21295 from eileenmcnaughton/541test

Fix restoreMembershipTypes to use the api

3 years agoREF Copy preProcessFromAddress back into the pdf function
Eileen McNaughton [Sun, 29 Aug 2021 05:02:10 +0000 (17:02 +1200)]
REF Copy preProcessFromAddress back into the pdf function

This is really hard to unravel without splitting it between classes -
mostly because it does stuff to do with setting properties on the form
that are not even relevant to all forms. This is a divide & conquer
case to cleaning up the function from
the deprecated class

Note that I removed the bounce on no-email. It felt like we would still want
to be able to download pdfs if the logged in user had no email. The bounce param seems
to have been added as an after thought - presumably to block
the bounce in a flow where they realised it made no sense

3 years agoMerge pull request #21303 from civicrm/5.41
Seamus Lee [Sun, 29 Aug 2021 03:41:10 +0000 (13:41 +1000)]
Merge pull request #21303 from civicrm/5.41

5.41

3 years agoMerge pull request #21302 from seamuslee001/fix_conformance_tests
Eileen McNaughton [Sun, 29 Aug 2021 03:08:47 +0000 (15:08 +1200)]
Merge pull request #21302 from seamuslee001/fix_conformance_tests

[NFC] Fix APIv4 Conformance tests on php8

3 years agoMerge pull request #21291 from eileenmcnaughton/541r
Seamus Lee [Sun, 29 Aug 2021 01:22:26 +0000 (11:22 +1000)]
Merge pull request #21291 from eileenmcnaughton/541r

dev/core#2786 Ensure non-English installs have a default financial type for membership default price set

3 years ago[NFC] Fix APIv4 Conformance tests on php8
Seamus Lee [Sun, 29 Aug 2021 01:20:13 +0000 (11:20 +1000)]
[NFC] Fix APIv4 Conformance tests on php8

3 years agoMerge pull request #21289 from eileenmcnaughton/tokens
demeritcowboy [Sun, 29 Aug 2021 00:48:07 +0000 (20:48 -0400)]
Merge pull request #21289 from eileenmcnaughton/tokens

[Ref] intial testing on case tokens, make knownTokens optional

3 years agodev/core#2786 Ensure non-English installs have a default financial type for membershi...
Eileen McNaughton [Sat, 28 Aug 2021 00:21:34 +0000 (12:21 +1200)]
dev/core#2786 Ensure non-English installs have a default financial type for membership default price set

3 years agoFix Restore Membership types to create price set
Eileen McNaughton [Sat, 28 Aug 2021 23:13:50 +0000 (11:13 +1200)]
Fix Restore Membership types to create price set

3 years agoMerge pull request #21300 from colemanw/imageField
colemanw [Sat, 28 Aug 2021 18:37:24 +0000 (14:37 -0400)]
Merge pull request #21300 from colemanw/imageField

SearchKit - Image field handler implementation

3 years agoSearchKit - Image field handler implementation
Kurund Jalmi [Mon, 23 Aug 2021 17:05:42 +0000 (18:05 +0100)]
SearchKit - Image field handler implementation

Fixes dev/core#2781

3 years agoMerge pull request #21298 from eileenmcnaughton/silly
demeritcowboy [Sat, 28 Aug 2021 14:27:04 +0000 (10:27 -0400)]
Merge pull request #21298 from eileenmcnaughton/silly

[REF] Remove duplicate IF

3 years agoMerge pull request #21292 from eileenmcnaughton/camps
Eileen McNaughton [Sat, 28 Aug 2021 08:11:48 +0000 (20:11 +1200)]
Merge pull request #21292 from eileenmcnaughton/camps

Fix for new prefetch key

3 years ago[REF] Remove duplicate IF
Eileen McNaughton [Sat, 28 Aug 2021 07:33:58 +0000 (19:33 +1200)]
[REF] Remove duplicate IF

Earlier in the function there was already a RETURN if
so this IF is always true

3 years agoMerge pull request #21296 from eileenmcnaughton/auth2
Eileen McNaughton [Sat, 28 Aug 2021 07:09:26 +0000 (19:09 +1200)]
Merge pull request #21296 from eileenmcnaughton/auth2

[REF] Minor extraction

3 years agoFix for new prefetch key
Eileen McNaughton [Sat, 28 Aug 2021 02:17:57 +0000 (14:17 +1200)]
Fix for new prefetch key

Fixes a bug in
https://github.com/civicrm/civicrm-core/pull/21184
which was masked in the test by the lack of campaigns to load.

The ?? operator handles FALSE differently to the ?: operator
so this was casting FALSE to TRUE

3 years ago[REF] dev/core#2790 move buildForm to pdfTrait
Eileen McNaughton [Sat, 28 Aug 2021 05:26:42 +0000 (17:26 +1200)]
[REF] dev/core#2790 move buildForm to pdfTrait

This moves the buildForm function over the pdfTrait

I note that some of the functions have

I wonder if they all should  - I suspect so

3 years agoMerge pull request #21294 from eileenmcnaughton/cont_form
colemanw [Sat, 28 Aug 2021 05:40:38 +0000 (01:40 -0400)]
Merge pull request #21294 from eileenmcnaughton/cont_form

[REF] Remove unreachable code

3 years ago[REF] Minor extraction
Eileen McNaughton [Sat, 28 Aug 2021 05:09:49 +0000 (17:09 +1200)]
[REF] Minor extraction

3 years agoMerge pull request #21293 from eileenmcnaughton/auth2
Eileen McNaughton [Sat, 28 Aug 2021 04:41:13 +0000 (16:41 +1200)]
Merge pull request #21293 from eileenmcnaughton/auth2

[Ref] Minor extraction

3 years agoMerge pull request #21290 from eileenmcnaughton/pdftrait
colemanw [Sat, 28 Aug 2021 03:22:15 +0000 (23:22 -0400)]
Merge pull request #21290 from eileenmcnaughton/pdftrait

[REF] dev/core#2790 Initial creation of pdf trait

3 years ago[REF] Remove unreachable code
Eileen McNaughton [Sat, 28 Aug 2021 02:58:22 +0000 (14:58 +1200)]
[REF] Remove unreachable code

3 years ago[Ref] Minor extraction
Eileen McNaughton [Sat, 28 Aug 2021 02:32:38 +0000 (14:32 +1200)]
[Ref] Minor extraction

Simply extracts getting the subscription id & since the retrieve function throws
defaults to 'abort' the next line is unreachable

3 years agoMerge pull request #21268 from totten/master-ml-optlabel
Eileen McNaughton [Sat, 28 Aug 2021 00:36:44 +0000 (12:36 +1200)]
Merge pull request #21268 from totten/master-ml-optlabel

(dev/translation#70) Multilingual - Fix loading multiple translations within same page-view (OptionValues, ContactTypes)

3 years ago[Ref] intial testing on case tokens, make knownTokens optional
Eileen McNaughton [Fri, 27 Aug 2021 23:39:42 +0000 (11:39 +1200)]
[Ref] intial testing on case tokens, make knownTokens optional

There is a perception in the token code that passing around knownTokens is more performant

This may or may not be true - but since the goal is to migrate the code to the
token processor making the code simpler is
a higher priority as any performance change will change again.

This makes knownTokens optional in the replaceCaseTokens and adds test cover.
It is a step towards simplification in the PdfLetter code
which could be simplified if not needing to pass in knowntokens here

3 years ago[REF] dev/core#2790 Initial creation of pdf trait
Eileen McNaughton [Fri, 27 Aug 2021 23:55:59 +0000 (11:55 +1200)]
[REF] dev/core#2790 Initial creation of pdf trait

Only one function copied over for now - setDefaultValues

3 years agoMerge pull request #21220 from agileware/CIVICRM-1812
demeritcowboy [Fri, 27 Aug 2021 13:49:04 +0000 (09:49 -0400)]
Merge pull request #21220 from agileware/CIVICRM-1812

Change the default PDF file name from "CiviLetter.pdf" to use the Activity Subject, if available

3 years agoAfform - Selectable location_type, is_primary, etc.
Coleman Watts [Wed, 25 Aug 2021 13:25:18 +0000 (09:25 -0400)]
Afform - Selectable location_type, is_primary, etc.

This allows the user to set a join block (email, phone, address, etc) as either repeatable
OR with a set value for is_primary or location_type.

Fixes dev/core#2703

3 years agoAfform - move max-repeat to entity definition not afform block definition
Coleman Watts [Tue, 24 Aug 2021 17:36:11 +0000 (13:36 -0400)]
Afform - move max-repeat to entity definition not afform block definition

Adds entity definition files for joins like Email, Address, etc,
and pre-loads all joined entities including custom on the afform gui screen.

3 years agoMerge pull request #21139 from totten/master-msgtpl-class
Eileen McNaughton [Fri, 27 Aug 2021 09:04:43 +0000 (21:04 +1200)]
Merge pull request #21139 from totten/master-msgtpl-class

(dev/mail#83) Workflow Messages - Introduce class contracts

3 years agoMerge pull request #21281 from civicrm/5.41
Seamus Lee [Fri, 27 Aug 2021 08:15:14 +0000 (18:15 +1000)]
Merge pull request #21281 from civicrm/5.41

5.41

3 years agoMerge pull request #21275 from eileenmcnaughton/541
Seamus Lee [Fri, 27 Aug 2021 06:15:07 +0000 (16:15 +1000)]
Merge pull request #21275 from eileenmcnaughton/541

Fix token deprecation to be a check not an upgrade notice

3 years agoMerge pull request #21280 from civicrm/5.41
Seamus Lee [Fri, 27 Aug 2021 06:04:05 +0000 (16:04 +1000)]
Merge pull request #21280 from civicrm/5.41

5.41

3 years agoMerge pull request #21150 from colemanw/afformUpload
Seamus Lee [Fri, 27 Aug 2021 05:59:58 +0000 (15:59 +1000)]
Merge pull request #21150 from colemanw/afformUpload

Afform - support file uploads

3 years agodev/translation#70 - Cache separate ContactType lists per-locale
Tim Otten [Fri, 27 Aug 2021 05:21:49 +0000 (22:21 -0700)]
dev/translation#70 - Cache separate ContactType lists per-locale

Notes:

* If you grep to see how `contactTypes` cache is used, it appears that they never
  access this row individually outside this function.
* There are coarse-grained `clear()` invocations all `contactTypes`-related data.
  These should hit the old+new keys the same way.
* I made the cache-lookup a little more micro-optimal. :shrug:

To verify that this fixes the bug, I enabled multilingual with fr_CA+es_MX and manually translated the labels for "Individual" contacts.
Then used the following command:

```
cv ev -U admin 'function go($l){ CRM_Core_I18n::singleton()->setLocale($l); return \Civi\Test\Invasive::call(["CRM_Contact_BAO_ContactType","getAllContactTypes"])["Individual"]; } return [go("fr_CA"),go("es_MX")];'
```

Before the patch, it returns the en_US labels ("Individual"..."Individual"...).

After the patch, it returns the fr_CA and es_MX labels that I had created ("Particulier"..."Persona"...).

3 years agoOptionGroup - Fix loading of localized labels
Tim Otten [Thu, 26 Aug 2021 09:12:15 +0000 (02:12 -0700)]
OptionGroup - Fix loading of localized labels

3 years agoLocaleTest - Add example for loading localized labels
Tim Otten [Thu, 26 Aug 2021 09:12:00 +0000 (02:12 -0700)]
LocaleTest - Add example for loading localized labels

3 years agoMerge pull request #21278 from seamuslee001/5.41
Seamus Lee [Fri, 27 Aug 2021 04:12:41 +0000 (14:12 +1000)]
Merge pull request #21278 from seamuslee001/5.41

Add release-notes/5.40.4.md

3 years agoAdd release-notes/5.40.4.md
Tim Otten [Fri, 27 Aug 2021 03:00:33 +0000 (20:00 -0700)]
Add release-notes/5.40.4.md

3 years agoCIVICRM-1812 Change the default PDF file name from "CiviLetter.pdf" to use the Activi...
Justin Freeman [Fri, 27 Aug 2021 03:10:24 +0000 (13:10 +1000)]
CIVICRM-1812 Change the default PDF file name from "CiviLetter.pdf" to use the Activity Subject, if available

3 years agoMerge pull request #21259 from demeritcowboy/better-file
Eileen McNaughton [Fri, 27 Aug 2021 02:01:25 +0000 (14:01 +1200)]
Merge pull request #21259 from demeritcowboy/better-file

dev/core#2789 - Filename is not non-english-friendly in print/merge document

3 years agoAfform - support file uploads
Coleman Watts [Mon, 16 Aug 2021 01:33:57 +0000 (21:33 -0400)]
Afform - support file uploads

Adds a new API action Afform.submitFile which receives uploaded files one at a time after the form is submitted.

3 years agoFix token deprecation to be a check not an upgrade notice
Eileen McNaughton [Fri, 27 Aug 2021 01:21:43 +0000 (13:21 +1200)]
Fix token deprecation to be a check not an upgrade notice

It turns out the upgrade notice is calculated before the upgrade action runs
- this means that currently the upgrade notice is displayed even though
manual intervention will only be required in edge cases (since the
upgrade replaces the most common usage and it would require the
presence of an if or something like that for it to still exist).

3 years agoMerge pull request #21274 from mattwire/contributionviewid
Seamus Lee [Fri, 27 Aug 2021 00:31:52 +0000 (10:31 +1000)]
Merge pull request #21274 from mattwire/contributionviewid

REF Don't check if id is set in ContributionView form - it's required

3 years agoMerge pull request #21273 from eileenmcnaughton/mem
Eileen McNaughton [Fri, 27 Aug 2021 00:07:08 +0000 (12:07 +1200)]
Merge pull request #21273 from eileenmcnaughton/mem

[REF] Remove meaningless if

3 years agoDon't check if id is set in ContributionView - it's required
Matthew Wire [Thu, 26 Aug 2021 22:04:32 +0000 (23:04 +0100)]
Don't check if id is set in ContributionView - it's required

3 years ago[REF] Remove meaningless if
Eileen McNaughton [Thu, 26 Aug 2021 21:48:16 +0000 (09:48 +1200)]
[REF] Remove meaningless if

This if is meaningless but I left it in last time to reduce
visual change

3 years agoMerge pull request #21126 from eileenmcnaughton/batch
Eileen McNaughton [Thu, 26 Aug 2021 21:37:11 +0000 (09:37 +1200)]
Merge pull request #21126 from eileenmcnaughton/batch

dev/core#2717  - further cleanup