Matthew Wire [Sun, 29 Aug 2021 19:37:43 +0000 (20:37 +0100)]
Fix deprecated API4 Join
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
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
Seamus Lee [Sun, 29 Aug 2021 09:40:59 +0000 (19:40 +1000)]
Merge pull request #21307 from civicrm/5.41
5.41
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
Seamus Lee [Sun, 29 Aug 2021 03:41:10 +0000 (13:41 +1000)]
Merge pull request #21303 from civicrm/5.41
5.41
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
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
Seamus Lee [Sun, 29 Aug 2021 01:20:13 +0000 (11:20 +1000)]
[NFC] Fix APIv4 Conformance tests on php8
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
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
Eileen McNaughton [Sat, 28 Aug 2021 23:13:50 +0000 (11:13 +1200)]
Fix Restore Membership types to create price set
colemanw [Sat, 28 Aug 2021 18:37:24 +0000 (14:37 -0400)]
Merge pull request #21300 from colemanw/imageField
SearchKit - 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
demeritcowboy [Sat, 28 Aug 2021 14:27:04 +0000 (10:27 -0400)]
Merge pull request #21298 from eileenmcnaughton/silly
[REF] Remove duplicate IF
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
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
Eileen McNaughton [Sat, 28 Aug 2021 07:09:26 +0000 (19:09 +1200)]
Merge pull request #21296 from eileenmcnaughton/auth2
[REF] Minor extraction
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
colemanw [Sat, 28 Aug 2021 05:40:38 +0000 (01:40 -0400)]
Merge pull request #21294 from eileenmcnaughton/cont_form
[REF] Remove unreachable code
Eileen McNaughton [Sat, 28 Aug 2021 05:09:49 +0000 (17:09 +1200)]
[REF] Minor extraction
Eileen McNaughton [Sat, 28 Aug 2021 04:41:13 +0000 (16:41 +1200)]
Merge pull request #21293 from eileenmcnaughton/auth2
[Ref] Minor extraction
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
Eileen McNaughton [Sat, 28 Aug 2021 02:58:22 +0000 (14:58 +1200)]
[REF] Remove unreachable code
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
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)
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
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
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
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
Seamus Lee [Fri, 27 Aug 2021 08:15:14 +0000 (18:15 +1000)]
Merge pull request #21281 from civicrm/5.41
5.41
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
Seamus Lee [Fri, 27 Aug 2021 06:04:05 +0000 (16:04 +1000)]
Merge pull request #21280 from civicrm/5.41
5.41
Seamus Lee [Fri, 27 Aug 2021 05:59:58 +0000 (15:59 +1000)]
Merge pull request #21150 from colemanw/afformUpload
Afform - support file uploads
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"...).
Tim Otten [Thu, 26 Aug 2021 09:12:15 +0000 (02:12 -0700)]
OptionGroup - Fix loading of localized labels
Tim Otten [Thu, 26 Aug 2021 09:12:00 +0000 (02:12 -0700)]
LocaleTest - Add example for loading localized labels
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
Tim Otten [Fri, 27 Aug 2021 03:00:33 +0000 (20:00 -0700)]
Add release-notes/5.40.4.md
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
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
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.
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).
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
Eileen McNaughton [Fri, 27 Aug 2021 00:07:08 +0000 (12:07 +1200)]
Merge pull request #21273 from eileenmcnaughton/mem
[REF] Remove meaningless if
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
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
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
Coleman Watts [Sun, 15 Aug 2021 15:29:43 +0000 (11:29 -0400)]
APIv4 - Add util function to get name of id field (primary key)
colemanw [Thu, 26 Aug 2021 18:40:10 +0000 (14:40 -0400)]
Merge pull request #21269 from mattwire/removeisdevelopment
Remove deprecated isDevelopment() function
Matthew Wire [Thu, 26 Aug 2021 13:28:18 +0000 (14:28 +0100)]
Remove deprecated isDevelopment() function
demeritcowboy [Thu, 26 Aug 2021 13:25:51 +0000 (09:25 -0400)]
Merge pull request #21221 from agileware/CIVICRM-1813
Change PDF file name from "civicrmContributionReceipt.pdf" to use the standard "receipt.pdf" file name
Seamus Lee [Thu, 26 Aug 2021 08:34:17 +0000 (18:34 +1000)]
Merge pull request #21266 from civicrm/5.41
5.41
Seamus Lee [Thu, 26 Aug 2021 05:13:04 +0000 (15:13 +1000)]
Merge pull request #21265 from seamuslee001/5.41
[NFC] Do not generate a result cache file when running legacycustomse…
Seamus Lee [Thu, 26 Aug 2021 03:13:44 +0000 (13:13 +1000)]
[NFC] Do not generate a result cache file when running legacycustomsearches phpunit tests
Seamus Lee [Thu, 26 Aug 2021 02:46:36 +0000 (12:46 +1000)]
Merge pull request #21260 from eileenmcnaughton/act_search
Do not enable custom activity search on new installs
Eileen McNaughton [Thu, 26 Aug 2021 02:06:37 +0000 (14:06 +1200)]
Merge pull request #21235 from seamuslee001/dev_core_2768
Resolve dev/core#2768 Reinstate code into APIv4 that handled magic fu…
Eileen McNaughton [Thu, 26 Aug 2021 01:58:46 +0000 (13:58 +1200)]
Merge pull request #21264 from civicrm/5.41
5.41 to master
Eileen McNaughton [Thu, 26 Aug 2021 01:50:31 +0000 (13:50 +1200)]
Merge pull request #21250 from agileware/CIVICRM-1820
CiviCRM Scheduled Reminders, Effective Start Date and Effective End Date are incorrectly evaluated if these fields contain a value '0000-00-00 00:00:00'
Seamus Lee [Thu, 26 Aug 2021 01:26:00 +0000 (11:26 +1000)]
Merge pull request #21243 from mattwire/contributionpageerrors
Logging improvements for "Failed to update contribution in database"
Eileen McNaughton [Thu, 26 Aug 2021 00:34:04 +0000 (12:34 +1200)]
Do not enable custom activity search on new installs
In general we want to get away from maintaining the custom searches. Reading the docs I realised
this search does not do anything not done through advanced search and activity search (even
before we start talking about search kit) so this is 'one down
demeritcowboy [Thu, 26 Aug 2021 00:07:54 +0000 (20:07 -0400)]
make filename non-english-friendly
Justin Freeman [Wed, 25 Aug 2021 23:59:14 +0000 (09:59 +1000)]
CIVICRM-1820 CiviCRM Scheduled Reminders, Effective Start Date and Effective End Date are incorrectly evaluated if these fields contain a value '0000-00-00 00:00:00'
Seamus Lee [Wed, 25 Aug 2021 23:51:48 +0000 (09:51 +1000)]
Merge pull request #21258 from civicrm/5.41
5.41
Eileen McNaughton [Mon, 16 Aug 2021 05:08:37 +0000 (17:08 +1200)]
Cleanup input params on legacyProcessMembership
Joe Murray [Wed, 25 Aug 2021 22:50:10 +0000 (18:50 -0400)]
Changed support to dev/core from ext/oauth
Seamus Lee [Wed, 25 Aug 2021 22:36:25 +0000 (08:36 +1000)]
Merge pull request #20935 from eileenmcnaughton/hhhh
dev/core#2717 Simplify batch membership renewal
Seamus Lee [Wed, 25 Aug 2021 22:16:38 +0000 (08:16 +1000)]
Merge pull request #21106 from eileenmcnaughton/order
dev/core#2634 Add v4 Membership api, access it via order
Seamus Lee [Wed, 25 Aug 2021 22:10:03 +0000 (08:10 +1000)]
Merge pull request #21230 from eileenmcnaughton/541-w-order
FIx order api regression
Seamus Lee [Wed, 25 Aug 2021 22:07:39 +0000 (08:07 +1000)]
Merge pull request #21257 from eileenmcnaughton/cset
Template fixes - notices, syntax
Seamus Lee [Wed, 25 Aug 2021 22:07:31 +0000 (08:07 +1000)]
Merge pull request #21255 from demeritcowboy/not-so-hidden
Fix invalid parameter giving E_WARNING
Eileen McNaughton [Wed, 25 Aug 2021 19:55:04 +0000 (07:55 +1200)]
E notice fixes
demeritcowboy [Wed, 25 Aug 2021 19:44:58 +0000 (15:44 -0400)]
fix invalid parameter
Tim Otten [Wed, 25 Aug 2021 06:50:10 +0000 (23:50 -0700)]
Settings.tpl - Fix syntax error
Eileen McNaughton [Tue, 24 Aug 2021 02:03:48 +0000 (14:03 +1200)]
Add order fix
Eileen McNaughton [Wed, 25 Aug 2021 19:24:23 +0000 (07:24 +1200)]
Merge pull request #21252 from civicrm/JoeMurray-patch-1
Provided standard links in ext/oauth-client/info.xml, fixed typo
demeritcowboy [Wed, 25 Aug 2021 18:09:04 +0000 (14:09 -0400)]
Merge pull request #21251 from eileenmcnaughton/email
[Ref] Copy emailcommon function back to email trait
demeritcowboy [Wed, 25 Aug 2021 16:24:17 +0000 (12:24 -0400)]
Merge pull request #21101 from eileenmcnaughton/inv3
[REF] Update a few references to invoicing
Joe Murray [Wed, 25 Aug 2021 13:25:25 +0000 (09:25 -0400)]
Provided standard links, fixed typo
Seamus Lee [Wed, 25 Aug 2021 10:11:02 +0000 (20:11 +1000)]
Merge pull request #21217 from colemanw/searchKitButtonTokens
SearchKit - Allow tokens in menu button text
Tim Otten [Wed, 25 Aug 2021 09:35:54 +0000 (02:35 -0700)]
Merge pull request #21134 from eileenmcnaughton/tok_nearly
dev/core#2745 - Contribution Tokens - Support 'contributionId'
Eileen McNaughton [Wed, 25 Aug 2021 07:35:32 +0000 (19:35 +1200)]
[Ref] Copy emailcommon function back to email trait
This is part of ending the email common trait. It is currently 'shared'
with a couple of other places - but most of the functionality is
not that shared & could be easily cleaned up when separated out.
I want to create a trait for PdfTrait like the email trait so
getting the email trait better separated for that
Eileen McNaughton [Wed, 25 Aug 2021 07:21:36 +0000 (19:21 +1200)]
Merge pull request #21006 from
deb1990/rename-pdf-file
dev/core#2121 Ability to change pdf filename before downloading
Seamus Lee [Wed, 25 Aug 2021 01:24:13 +0000 (11:24 +1000)]
Merge pull request #21246 from eileenmcnaughton/master
5.41 to master
colemanw [Wed, 25 Aug 2021 01:21:25 +0000 (21:21 -0400)]
Merge pull request #21244 from demeritcowboy/angular-loader
[NFC] - Replace deprecated function in AngularLoaderTest
Eileen McNaughton [Wed, 25 Aug 2021 01:04:03 +0000 (13:04 +1200)]
Merge pull request #21245 from agileware/CIVICRM-1816
CiviCRM Mailing, function unsub_from_mailing has spelling error, "experiement" impacts A/B Mailing unsubscribes
Eileen McNaughton [Tue, 24 Aug 2021 23:36:12 +0000 (11:36 +1200)]
Revert "Re-fix test to work with new check"
This reverts commit
77136dc6d4216211998729cea305d81868309809.
Eileen McNaughton [Tue, 24 Aug 2021 23:35:28 +0000 (11:35 +1200)]
Merge branch '5.41' of github.com:civicrm/civicrm-core
Justin Freeman [Tue, 24 Aug 2021 23:13:51 +0000 (09:13 +1000)]
CIVICRM-1816 CiviCRM Mailing, function unsub_from_mailing has spelling error, "experiement" impacts A/B Mailing unsubscribes
Seamus Lee [Tue, 24 Aug 2021 22:20:40 +0000 (08:20 +1000)]
Merge pull request #21169 from eileenmcnaughton/email
dev/core#2769 use php email validation not hacked & bad quickform function
demeritcowboy [Tue, 24 Aug 2021 22:01:15 +0000 (18:01 -0400)]
replace deprecated function
Matthew Wire [Tue, 24 Aug 2021 19:07:59 +0000 (20:07 +0100)]
Set error level for mail configuration errors
Matthew Wire [Tue, 24 Aug 2021 16:01:35 +0000 (17:01 +0100)]
Log actual error message when contribution page submission fails to complete
Monish Deb [Tue, 24 Aug 2021 15:59:24 +0000 (21:29 +0530)]
Merge pull request #21212 from eileenmcnaughton/541-orig
dev/financial#180 Fix line item calculation regression on line items (incorrectly treating as exclusive)
demeritcowboy [Tue, 24 Aug 2021 13:58:55 +0000 (09:58 -0400)]
Merge pull request #20898 from JMAConsulting/issue_2701
(Smart Group) is being constantly added while editing the smart group title from 'Manage Group' page
Eileen McNaughton [Tue, 17 Aug 2021 22:44:19 +0000 (10:44 +1200)]
dev/core#2769 use php email validation not hacked qf
Per https://lab.civicrm.org/dev/core/-/issues/2769 we have had problems over the years with
quickform's email validation and we now have a hacked version that is
problematic from a maintenance pov & also doesn't work
with the string I have just encountered: name.-o-.i.10@example.com
(which I am told is valid and which passes the php filter).
We already have an email rule which calls a php native function
which is better maintained than our layers of hacks. This
PR registers our email rule - which overrides the quickform
one. If we merge this we can revert quickform back to
unhacked which will improve debugging
and maintenance (although it's actually bypassed
now with this change)
Eileen McNaughton [Tue, 24 Aug 2021 07:26:45 +0000 (19:26 +1200)]
Merge pull request #21240 from civicrm/5.41
5.41 to master
Eileen McNaughton [Tue, 24 Aug 2021 00:22:35 +0000 (12:22 +1200)]
Revert test change that 'supported' incorrect code change
https://github.com/civicrm/civicrm-core/commit/
e967ce8fe2b58b94e2163dde395542e55599da13#diff-44a947115564a688b2d6e0772ad25039b8d244225cf250dbc27ed32a134467a3L395-R396
Eileen McNaughton [Tue, 24 Aug 2021 07:09:40 +0000 (19:09 +1200)]
Merge pull request #21239 from kcristiano/dev-2784
dev/core#2784 Export PRIMARY fields Fails on CiviCRM 5.40.2 and MariaDB 10.3 with row size issue
Eileen McNaughton [Tue, 24 Aug 2021 04:58:29 +0000 (16:58 +1200)]
Merge pull request #21105 from colemanw/afformSubmission
Afform - Store submissions in a new database table