colemanw [Fri, 1 Dec 2023 09:26:45 +0000 (09:26 +0000)]
Merge pull request #24699 from colemanw/afformConditional
Afform: Support conditional logic
colemanw [Fri, 1 Dec 2023 09:14:15 +0000 (09:14 +0000)]
Merge pull request #28389 from eileenmcnaughton/membership_type_form
Use getSubmittedValues() rather than ad-hoc money 'cleaning' on membershipType form
Seamus Lee [Fri, 1 Dec 2023 06:23:22 +0000 (17:23 +1100)]
Merge pull request #28391 from eileenmcnaughton/sort_fix
[REF] Use Token Processor to generate sort name and display name for individuals
Seamus Lee [Thu, 2 Feb 2023 00:42:21 +0000 (11:42 +1100)]
[REF] Use Token Processor to generate sort name and display name for individuals
Fix handling for when certain things should only show if there tokens filled out
Handle for when the nameFormat is null (import tests)
Eileen McNaughton [Fri, 1 Dec 2023 03:30:43 +0000 (16:30 +1300)]
Merge pull request #27934 from MegaphoneJon/uncached-ext-dir-issue
set extension browser timeout to minimum of 10 seconds.
Eileen McNaughton [Fri, 1 Dec 2023 02:43:01 +0000 (15:43 +1300)]
Merge pull request #28390 from sebalis/contributors_civiservice
contributor_key.yml: add civiservice.de to four users, remove one duplicate
sebalis [Fri, 1 Dec 2023 01:16:06 +0000 (02:16 +0100)]
add civiservice.de to four users, remove one duplicate
Jon Goldberg [Wed, 25 Oct 2023 18:09:14 +0000 (14:09 -0400)]
set extension browser timeout to minimum of 10 seconds.
Eileen McNaughton [Fri, 1 Dec 2023 00:31:08 +0000 (13:31 +1300)]
Use getSubmittedValues() rather than ad-hoc money 'cleaning'
Eileen McNaughton [Fri, 1 Dec 2023 00:19:11 +0000 (13:19 +1300)]
Merge pull request #28384 from eileenmcnaughton/activity_type
Remove some calls to deprecated function
Seamus Lee [Thu, 30 Nov 2023 22:38:07 +0000 (09:38 +1100)]
Merge pull request #28385 from eileenmcnaughton/member_required
Superficial cleanup
Eileen McNaughton [Thu, 30 Nov 2023 20:34:01 +0000 (09:34 +1300)]
Remove some calls to deprecated function
https://github.com/civicrm/civicrm-core/pull/23880 is
thoroughly stale so I'm closing it - but just thought I'd rescue a couple of changes
These are in the barely maintained legacycustomsearches so of marginal risk &
marginal benefit but since I looked maybe no-one else has to ever again...
colemanw [Thu, 30 Nov 2023 21:41:17 +0000 (16:41 -0500)]
Merge pull request #28356 from eileenmcnaughton/membership_renew_notice
Fix notice, caching, master-only-regression- showing inactive fields on membership config
colemanw [Thu, 30 Nov 2023 21:40:59 +0000 (16:40 -0500)]
Merge pull request #28364 from eileenmcnaughton/confirm_notice
Fix a whole lot of conditional assignments on confirm & thank you pages
colemanw [Thu, 30 Nov 2023 21:40:04 +0000 (16:40 -0500)]
Merge pull request #28370 from eileenmcnaughton/payment_fields
Fix notices on credit_card & bank number on Confirm & ThankYou
Eileen McNaughton [Thu, 30 Nov 2023 21:18:25 +0000 (10:18 +1300)]
Superficial cleanup
Removes some unused variables & other minor cleanups
Eileen McNaughton [Thu, 30 Nov 2023 20:08:06 +0000 (09:08 +1300)]
Merge pull request #28383 from MegaphoneJon/activity-filter-case-speedup
Activity case filter speedup
Eileen McNaughton [Thu, 30 Nov 2023 20:06:20 +0000 (09:06 +1300)]
Merge pull request #28382 from demeritcowboy/strstart
fix error on confirm page when using on-behalf-of
Jon Goldberg [Thu, 30 Nov 2023 18:09:26 +0000 (13:09 -0500)]
Activity case filter speedup
colemanw [Thu, 30 Nov 2023 17:28:40 +0000 (12:28 -0500)]
Merge pull request #28366 from eileenmcnaughton/membership
Unconditionally assign membership variables to fix notices on thankYou page
demeritcowboy [Thu, 30 Nov 2023 15:14:40 +0000 (10:14 -0500)]
Merge pull request #28381 from civicrm/5.68
5.68
demeritcowboy [Thu, 30 Nov 2023 15:12:32 +0000 (10:12 -0500)]
fix
demeritcowboy [Thu, 30 Nov 2023 15:09:31 +0000 (10:09 -0500)]
Merge pull request #28367 from eileenmcnaughton/behalf
Ensure onBehalfProfile assigned
Yashodha Chaku [Thu, 30 Nov 2023 13:43:41 +0000 (19:13 +0530)]
Merge pull request #28378 from eileenmcnaughton/contact
dev/core#4820 fix contact id search
Tim Otten [Thu, 30 Nov 2023 13:08:20 +0000 (13:08 +0000)]
Merge pull request #28354 from eileenmcnaughton/568_verp
Fix incoming bounce processing
demeritcowboy [Thu, 30 Nov 2023 03:54:13 +0000 (22:54 -0500)]
Merge pull request #28363 from reflexive-communications/codegen-drop-tpl
CRM_Core_CodeGen_Schema: fix generated comments and whitespace
colemanw [Thu, 30 Nov 2023 03:23:06 +0000 (22:23 -0500)]
Merge pull request #28320 from eileenmcnaughton/prem_3
Fix notices on premiums across all 3 pages
demeritcowboy [Thu, 30 Nov 2023 03:21:02 +0000 (22:21 -0500)]
Merge pull request #28377 from eileenmcnaughton/adv_search
Fix notice, minor code cleanup with searching for a free text tag (advanced search)
Eileen McNaughton [Thu, 30 Nov 2023 02:12:03 +0000 (15:12 +1300)]
Fix to still record empty amount levels for secondary contributions
Eileen McNaughton [Thu, 30 Nov 2023 00:29:32 +0000 (13:29 +1300)]
Merge pull request #28368 from colemanw/booleanCleanup
REF - Cleanup overly-verbose conditionals
colemanw [Wed, 29 Nov 2023 16:56:28 +0000 (11:56 -0500)]
REF - Cleanup overly-verbose conditionals
Eileen McNaughton [Wed, 29 Nov 2023 11:49:45 +0000 (00:49 +1300)]
Fix a whole lot of conditional assignments on confirm & thank you pages
Eileen McNaughton [Wed, 29 Nov 2023 23:32:12 +0000 (12:32 +1300)]
dev/core#4820 fix contact id search
Eileen McNaughton [Wed, 29 Nov 2023 23:19:44 +0000 (12:19 +1300)]
Use single quotes where double not required
Eileen McNaughton [Wed, 29 Nov 2023 23:14:34 +0000 (12:14 +1300)]
Suppress notice
Eileen McNaughton [Wed, 29 Nov 2023 23:10:35 +0000 (12:10 +1300)]
Merge pull request #28376 from civicrm/5.68
5.68 to master
Eileen McNaughton [Wed, 29 Nov 2023 23:09:19 +0000 (12:09 +1300)]
Remove unnecessary pass-by-ref
Eileen McNaughton [Wed, 29 Nov 2023 22:57:12 +0000 (11:57 +1300)]
Merge pull request #28375 from demeritcowboy/relimp
dev/core#4563 - fix related contact mapping fields on import
Eileen McNaughton [Wed, 29 Nov 2023 22:33:37 +0000 (11:33 +1300)]
Merge pull request #28374 from eileenmcnaughton/cont_page
Fix quotes causing function call to be in quotes (master only regression)
Eileen McNaughton [Wed, 29 Nov 2023 22:21:56 +0000 (11:21 +1300)]
Merge pull request #28361 from eileenmcnaughton/current_member
Fix master-only regression on Membership page, option not selected
Eileen McNaughton [Wed, 29 Nov 2023 22:12:41 +0000 (11:12 +1300)]
Merge pull request #28373 from eileenmcnaughton/bool
REF - Cleanup overly-verbose conditionals
Eileen McNaughton [Wed, 29 Nov 2023 22:12:24 +0000 (11:12 +1300)]
Merge pull request #28348 from Damilare1/master
Coworker create Searchkit over view of queue status
colemanw [Wed, 29 Nov 2023 22:02:41 +0000 (17:02 -0500)]
Api - Fix premium & product permissions for anonymous users
demeritcowboy [Wed, 29 Nov 2023 21:48:37 +0000 (16:48 -0500)]
fix related contact mapping fields
Eileen McNaughton [Wed, 29 Nov 2023 21:40:08 +0000 (10:40 +1300)]
Fix quotes causing function call to be in quotes
Eileen McNaughton [Wed, 29 Nov 2023 11:08:05 +0000 (00:08 +1300)]
Fix failure to set membership default to existing membership (master regression)
Eileen McNaughton [Wed, 29 Nov 2023 21:26:43 +0000 (10:26 +1300)]
REF - Cleanup overly-verbose conditionals
Eileen McNaughton [Wed, 29 Nov 2023 21:17:31 +0000 (10:17 +1300)]
Merge pull request #28372 from civicrm/5.68
5.68 to master
Eileen McNaughton [Wed, 29 Nov 2023 21:16:42 +0000 (10:16 +1300)]
Merge pull request #28371 from mlutfy/568fixNumericCaseCustom
Case Custom Data: fix non-US numeric decimals - 5.68
Eileen McNaughton [Sun, 26 Nov 2023 19:56:28 +0000 (08:56 +1300)]
Fix notices on premiums across all 3 pages
This includes switching to apiv4 & adding escape to the templates
to reflect that change
Eileen McNaughton [Wed, 29 Nov 2023 20:16:09 +0000 (09:16 +1300)]
Merge pull request #28339 from colemanw/inlineArray
[NFC] Array formatting cleanup
colemanw [Wed, 29 Nov 2023 20:10:23 +0000 (15:10 -0500)]
Merge pull request #28316 from eileenmcnaughton/prem_2
Check financial acls for product in extension
Mathieu Lu [Wed, 29 Nov 2023 19:39:39 +0000 (14:39 -0500)]
Case Custom Data: fix non-US numeric decimals
Eileen McNaughton [Wed, 29 Nov 2023 19:43:19 +0000 (08:43 +1300)]
Fix notices on credit_card & bank number on Confirm & ThankYou
Adedoyin Damilare [Wed, 29 Nov 2023 19:40:22 +0000 (19:40 +0000)]
Update ext/civicrm_admin_ui/ang/afsearchCiviCRMQueues.aff.php
Co-authored-by: colemanw <coleman@civicrm.org>
colemanw [Wed, 29 Nov 2023 18:13:12 +0000 (13:13 -0500)]
Merge pull request #28332 from eileenmcnaughton/import_ug
dev/core#4726 Set field to do-not-import if not configured
colemanw [Tue, 28 Nov 2023 15:27:22 +0000 (10:27 -0500)]
Array formatting cleanup
Multiline arrays aren't always the most readable.
These were all done by an autoformatting tool which got a little too zealous
about breaking every array into multiple lines. They are especially silly within if() statements.
colemanw [Wed, 29 Nov 2023 15:21:42 +0000 (10:21 -0500)]
Merge pull request #28336 from eileenmcnaughton/part_form
Remove handling from previously shared code
colemanw [Wed, 29 Nov 2023 15:20:25 +0000 (10:20 -0500)]
Merge pull request #28365 from eileenmcnaughton/confirm_notices
Ensure onBehalfEmail always assigned to prevent notices
Damilare Adedoyin [Tue, 28 Nov 2023 16:26:48 +0000 (16:26 +0000)]
Coworker create Searchkit over view of queue status
colemanw [Wed, 29 Nov 2023 14:21:13 +0000 (09:21 -0500)]
Merge pull request #28360 from eileenmcnaughton/code
Remove unreachable code
Eileen McNaughton [Wed, 29 Nov 2023 12:54:20 +0000 (01:54 +1300)]
Ensure onBehalfProfile assigned
Eileen McNaughton [Wed, 29 Nov 2023 12:48:15 +0000 (01:48 +1300)]
Unconditionally assign membership variables to fix notices on thankYou page
Eileen McNaughton [Tue, 28 Nov 2023 12:30:46 +0000 (01:30 +1300)]
Remove handling from previously shared code
Eileen McNaughton [Wed, 29 Nov 2023 12:22:25 +0000 (01:22 +1300)]
Ensure onBehalfEmail always assigned to prevent notices
Yashodha Chaku [Wed, 29 Nov 2023 11:24:48 +0000 (16:54 +0530)]
Merge pull request #28362 from eileenmcnaughton/notices
Add notice fix for Confirm & thank you pages
Eileen McNaughton [Wed, 29 Nov 2023 11:22:24 +0000 (00:22 +1300)]
Merge pull request #28358 from eileenmcnaughton/thank_notice
Thank you page notice - ensure friendText & linkText is assigned
Eileen McNaughton [Wed, 29 Nov 2023 11:22:09 +0000 (00:22 +1300)]
Merge pull request #28359 from eileenmcnaughton/social
Notice fix - specify emailMode is false when including SocialNetwork.tpl
Eileen McNaughton [Wed, 29 Nov 2023 11:17:48 +0000 (00:17 +1300)]
Add notice fix for Confirm & thank you pages
Sandor Semsey [Wed, 29 Nov 2023 11:13:34 +0000 (12:13 +0100)]
drop.tpl: fix comments and whitespace
Eileen McNaughton [Wed, 29 Nov 2023 10:27:31 +0000 (23:27 +1300)]
Remove unreachable code
Eileen McNaughton [Wed, 29 Nov 2023 10:03:06 +0000 (23:03 +1300)]
Notice fix - specify emailMode is false when including SocialNetwork.tpl
Eileen McNaughton [Wed, 29 Nov 2023 09:58:26 +0000 (22:58 +1300)]
Move the pre-assign of pcpBlock further up
This is assigned false, & then assigned again if there is a value to prevent notices (already)
but the first assign isn't always done so we still have notices
Eileen McNaughton [Wed, 29 Nov 2023 09:38:29 +0000 (22:38 +1300)]
Thank you page notice - ensure friendText & linkText is assigned
Eileen McNaughton [Wed, 29 Nov 2023 09:33:52 +0000 (22:33 +1300)]
Merge pull request #28357 from eileenmcnaughton/price_get
Fix fatal adding price set on contribution page
Eileen McNaughton [Wed, 29 Nov 2023 09:30:27 +0000 (22:30 +1300)]
Fix fatal adding price set on contribution page
Eileen McNaughton [Wed, 29 Nov 2023 08:12:18 +0000 (21:12 +1300)]
Fixe notice, caching, showing inactive fields on membership config
Eileen McNaughton [Wed, 29 Nov 2023 03:24:42 +0000 (16:24 +1300)]
Fix incoming bounce processing
We switched to a less misleading method of calculating the hash here
https://github.com/civicrm/civicrm-core/pull/27533/files#diff-942a60901c838eb11bfd85cd3e84672748d9f1d49f8cbe62684bc898b02c7a90R58
but did not spot that the regex was expecting only letters a-f whereas
the new method is a-z
Eileen McNaughton [Wed, 29 Nov 2023 02:16:43 +0000 (15:16 +1300)]
Merge pull request #28353 from civicrm/5.68
Merge 5.68 to master
colemanw [Wed, 29 Nov 2023 02:01:31 +0000 (21:01 -0500)]
Merge pull request #28343 from artfulrobot/issue-core-4697
Update path for user profile page to avoid conflict #4697
colemanw [Wed, 29 Nov 2023 01:16:56 +0000 (20:16 -0500)]
Merge pull request #28352 from bsilvern/core-4761-5.68
dev/core#4761 - CRM\Core\DAO - Generate unique name, case-insensitive
Eileen McNaughton [Tue, 28 Nov 2023 23:27:11 +0000 (12:27 +1300)]
Merge pull request #28350 from eileenmcnaughton/currency
Get currency from the event for backoffice participant form
Matthew Wire [Tue, 28 Nov 2023 22:49:38 +0000 (22:49 +0000)]
Merge pull request #28346 from eileenmcnaughton/remove_deprecated
Remove unused functions noisily deprecated in 2021
Matthew Wire [Tue, 28 Nov 2023 22:45:31 +0000 (22:45 +0000)]
Merge pull request #28347 from eileenmcnaughton/main_form
PHP 8.x add getFromEmails() function, remove use of undeclared property
Matthew Wire [Tue, 28 Nov 2023 22:44:06 +0000 (22:44 +0000)]
Merge pull request #28345 from eileenmcnaughton/undefined
Make undefined property local variable
Bob Silvern [Tue, 28 Nov 2023 22:39:06 +0000 (14:39 -0800)]
dev/core#4761 - CRM\Core\DAO - Generate unique name, case-insensitve
This duplicates on the 5.68 branch changes made in PR-28168 to master.
Eileen McNaughton [Tue, 28 Nov 2023 22:03:02 +0000 (11:03 +1300)]
Get currency from the event
Matthew Wire [Tue, 28 Nov 2023 21:52:01 +0000 (21:52 +0000)]
Merge pull request #28276 from eileenmcnaughton/isset
dev/core#4798 Stop setting unused, undefined property `_lineItem` in contribution forms
Eileen McNaughton [Tue, 28 Nov 2023 21:42:15 +0000 (10:42 +1300)]
Consolidate fee preProcess into feeBuildForm
Eileen McNaughton [Tue, 28 Nov 2023 21:28:40 +0000 (10:28 +1300)]
Merge pull request #28289 from eileenmcnaughton/part_send
Use getCurrency() function for currency retrieval
Eileen McNaughton [Tue, 28 Nov 2023 21:17:49 +0000 (10:17 +1300)]
PHP 8.x add getFromEmails() function, remove use of undeclared property
Eileen McNaughton [Tue, 28 Nov 2023 20:47:25 +0000 (09:47 +1300)]
Remove unused functions noisily deprecated in 2021
Matthew Wire [Tue, 28 Nov 2023 20:45:19 +0000 (20:45 +0000)]
Merge pull request #28342 from braders/remove-tempclause
Remove unused _tempClause
Eileen McNaughton [Tue, 28 Nov 2023 20:36:54 +0000 (09:36 +1300)]
Add deprecation notices
Eileen McNaughton [Tue, 28 Nov 2023 20:30:19 +0000 (09:30 +1300)]
Make undefined property local variable
Eileen McNaughton [Tue, 28 Nov 2023 20:29:37 +0000 (09:29 +1300)]
Merge pull request #28341 from braders/contact-selector-unused-param
[REF][PHP8.2] Remove unused property from CRM_Contact_Selector
Eileen McNaughton [Thu, 23 Nov 2023 22:00:43 +0000 (11:00 +1300)]
Consolidate getCurrency()
Eileen McNaughton [Thu, 23 Nov 2023 21:46:53 +0000 (10:46 +1300)]
Use getCurrency() function for currency retrieval
Matthew Wire [Tue, 28 Nov 2023 19:45:33 +0000 (19:45 +0000)]
Merge pull request #28308 from eileenmcnaughton/discounts
Simplify handling of discount_id in participant form postProcess
Matthew Wire [Tue, 28 Nov 2023 19:44:27 +0000 (19:44 +0000)]
Merge pull request #28310 from eileenmcnaughton/billing
Deprecate passing `billingID`to `mapParams`