Eileen McNaughton [Wed, 8 Mar 2023 23:01:34 +0000 (12:01 +1300)]
Remove deprecated calls from contribute, financial, remove ManagePremiums deprecated BAO
colemanw [Wed, 8 Mar 2023 22:05:04 +0000 (17:05 -0500)]
Merge pull request #25764 from eileenmcnaughton/coleman2
Deprecations on del functions
colemanw [Wed, 8 Mar 2023 22:04:46 +0000 (17:04 -0500)]
Merge pull request #25765 from eileenmcnaughton/coleman_rel
Deprecate relationship::del
Eileen McNaughton [Wed, 8 Mar 2023 20:58:17 +0000 (09:58 +1300)]
Deprecate relationship::del
Eileen McNaughton [Wed, 8 Mar 2023 20:53:57 +0000 (09:53 +1300)]
Deprecations on del functions
Eileen McNaughton [Wed, 8 Mar 2023 19:48:57 +0000 (08:48 +1300)]
Merge pull request #25762 from colemanw/noisyDep
Noisily deprecate unused function
colemanw [Wed, 8 Mar 2023 16:26:46 +0000 (11:26 -0500)]
Merge pull request #25666 from kurund/file-validations-formbuilder
dev/core#4121 Afform: add validation for file fields in formbuilder
Coleman Watts [Wed, 8 Mar 2023 15:57:19 +0000 (10:57 -0500)]
Noisily deprecate unused function
Matthew Wire [Wed, 8 Mar 2023 15:53:30 +0000 (15:53 +0000)]
Merge pull request #25674 from colemanw/apiUpdateTest
APIv4 - Add 'Update' to conformanceTest
colemanw [Wed, 8 Mar 2023 15:45:13 +0000 (10:45 -0500)]
Merge pull request #25752 from eileenmcnaughton/cust_it
Remove remaining non-variable variables
demeritcowboy [Wed, 8 Mar 2023 15:24:26 +0000 (10:24 -0500)]
Merge pull request #25761 from seamuslee001/regen_561
Regen after civicrm-core#24735
Seamus Lee [Wed, 8 Mar 2023 06:52:43 +0000 (17:52 +1100)]
Regen after civicrm-core#24735
Eileen McNaughton [Wed, 8 Mar 2023 06:19:50 +0000 (19:19 +1300)]
Merge pull request #24735 from agileware/CIVICRM-2052
🪥 Fix inconsistent terminology used when referring to Member Since, Membership Start Date and Membership Expiration Date
Eileen McNaughton [Wed, 8 Mar 2023 03:39:10 +0000 (16:39 +1300)]
Merge pull request #25760 from civicrm/5.60
5.60 to master
Eileen McNaughton [Wed, 8 Mar 2023 03:38:41 +0000 (16:38 +1300)]
Merge pull request #25758 from eileenmcnaughton/560
Load submitted `fieldSeparator` on back on `Import Datasource` screen
demeritcowboy [Wed, 8 Mar 2023 02:58:58 +0000 (21:58 -0500)]
Merge pull request #25681 from agileware/CIVICRM-2103
dev/core/-/issues/4149 Change CKEditor 4 default to not encode HTML entities by default which breaks Smarty syntax and prevents use of crmDate function
demeritcowboy [Wed, 8 Mar 2023 02:51:19 +0000 (21:51 -0500)]
Merge pull request #25757 from eileenmcnaughton/import_table
Code cleanup: Use `parent::buildForm` in contact import dataSource screen
Eileen McNaughton [Wed, 8 Mar 2023 02:15:39 +0000 (15:15 +1300)]
Load submitted fieldSeparator on back on Import Datasource screen
colemanw [Wed, 8 Mar 2023 02:11:11 +0000 (21:11 -0500)]
Merge pull request #25751 from MegaphoneJon/relationship-cache-check
Relationship Cache check
Eileen McNaughton [Wed, 8 Mar 2023 01:04:48 +0000 (14:04 +1300)]
Use parent::buildForm in contact import dataSource screen
colemanw [Wed, 8 Mar 2023 00:45:47 +0000 (19:45 -0500)]
Merge pull request #25700 from eileenmcnaughton/address
Change title of is_primary fields consistent with Email
Eileen McNaughton [Wed, 8 Mar 2023 00:36:14 +0000 (13:36 +1300)]
Merge pull request #25750 from colemanw/ParticipantStatusType
APIv4 - Add ParticipantStatusType entity
Eileen McNaughton [Wed, 8 Mar 2023 00:11:09 +0000 (13:11 +1300)]
Merge pull request #25294 from colemanw/afformFileReupload
Afform - Show file field values for existing entities
demeritcowboy [Tue, 7 Mar 2023 23:53:17 +0000 (18:53 -0500)]
Merge pull request #25756 from demeritcowboy/separator
revert 25735
Eileen McNaughton [Tue, 7 Mar 2023 23:06:03 +0000 (12:06 +1300)]
Merge pull request #25755 from civicrm/5.60
5.60
demeritcowboy [Tue, 7 Mar 2023 22:37:36 +0000 (17:37 -0500)]
revert 25735
Eileen McNaughton [Tue, 7 Mar 2023 22:21:55 +0000 (11:21 +1300)]
Merge pull request #25753 from MegaphoneJon/two-field-separators-3
Remove the correct extraneous field separator field
colemanw [Tue, 7 Mar 2023 20:11:39 +0000 (15:11 -0500)]
Merge pull request #25719 from eileenmcnaughton/quick_config
Unconditionally assign `quickConfig`, add helper for `getPriceSetID`
Jon Goldberg [Mon, 6 Mar 2023 19:47:38 +0000 (14:47 -0500)]
Remove the correct extraneous field separator field
Jon Goldberg [Tue, 7 Mar 2023 19:22:05 +0000 (14:22 -0500)]
Relationship Cache check
Eileen McNaughton [Tue, 7 Mar 2023 19:43:28 +0000 (08:43 +1300)]
Remove remaining non-variable variables
Coleman Watts [Tue, 7 Mar 2023 18:46:31 +0000 (13:46 -0500)]
APIv4 - Add ParticipantStatusType entity
colemanw [Tue, 7 Mar 2023 18:34:35 +0000 (13:34 -0500)]
Merge pull request #25747 from eileenmcnaughton/c2
Stop using deprecated methods, `ufField::del`
colemanw [Tue, 7 Mar 2023 18:33:27 +0000 (13:33 -0500)]
Merge pull request #25746 from eileenmcnaughton/colemanw
Remove some deprecated del calls
colemanw [Tue, 7 Mar 2023 18:32:37 +0000 (13:32 -0500)]
Merge pull request #25745 from eileenmcnaughton/cust_it
Remove unvariable variables `toReturn` & `subName` from `Merger`
Eileen McNaughton [Tue, 7 Mar 2023 05:56:08 +0000 (18:56 +1300)]
Merge pull request #25748 from civicrm/5.60
5.60 to master
Eileen McNaughton [Tue, 7 Mar 2023 05:25:37 +0000 (18:25 +1300)]
Merge pull request #25739 from colemanw/monthOptions
SearchKit - Add select options for MONTH date filter
Eileen McNaughton [Tue, 7 Mar 2023 05:25:19 +0000 (18:25 +1300)]
Merge pull request #25743 from colemanw/fixFkEntity
APIv4 - Don't link to non-existent API entities
Tim Otten [Tue, 7 Mar 2023 04:18:39 +0000 (20:18 -0800)]
Merge pull request #25724 from eileenmcnaughton/crazy_complete
PayPal Prp IPN - Fix incorrect option_group update
Eileen McNaughton [Tue, 7 Mar 2023 03:01:21 +0000 (16:01 +1300)]
Stop using deprecated methods, ufField
Eileen McNaughton [Tue, 7 Mar 2023 02:51:55 +0000 (15:51 +1300)]
Remove some deprecated del calls
Eileen McNaughton [Tue, 7 Mar 2023 02:42:23 +0000 (15:42 +1300)]
Remove unvariable variables toReturn & subName
These were established as unchanging here
https://github.com/civicrm/civicrm-core/pull/25676
colemanw [Tue, 7 Mar 2023 01:38:48 +0000 (20:38 -0500)]
Merge pull request #25676 from eileenmcnaughton/cust_it
Stop passing invariable variables to private function
Coleman Watts [Mon, 6 Mar 2023 18:43:31 +0000 (13:43 -0500)]
SearchKit - Add select options for MONTH date filter
Coleman Watts [Mon, 6 Mar 2023 22:31:57 +0000 (17:31 -0500)]
APIv4 - Don't link to non-existent API entities
Eileen McNaughton [Mon, 6 Mar 2023 20:52:37 +0000 (09:52 +1300)]
Merge pull request #25740 from colemanw/nextBirthday
SearchKit - Add next_birthday calc field
colemanw [Mon, 6 Mar 2023 20:33:30 +0000 (15:33 -0500)]
Merge pull request #25711 from eileenmcnaughton/import_expires
Filter 'My imports' to only show non-expired
Coleman Watts [Mon, 6 Mar 2023 19:18:12 +0000 (14:18 -0500)]
SearchKit - Add next_birthday calc field
demeritcowboy [Mon, 6 Mar 2023 17:19:12 +0000 (12:19 -0500)]
Merge pull request #25735 from MegaphoneJon/two-field-separators
remove extra field separator field
Jon Goldberg [Mon, 6 Mar 2023 16:22:53 +0000 (11:22 -0500)]
remove extra field separator field
Eileen McNaughton [Fri, 3 Mar 2023 05:41:32 +0000 (18:41 +1300)]
dev/core#4158 Fix incorrect option_group update in paypal recurring
This line was pointed out as being problematic in the issue
https://lab.civicrm.org/dev/core/-/issues/4158 and in a test
I was able to verify it causes issues if the value for Completed
in the contribution status option group is not the same as the
contribution recur option group. However, it appears to
be more of a theoretical / test creatable regression than a real
world one & is not a credible fix for the bug.
I think an rc merge without a stable back port is OK
Seamus Lee [Sat, 4 Mar 2023 22:38:14 +0000 (09:38 +1100)]
Merge pull request #25725 from eileenmcnaughton/import_ex
Update Import fix to leverage the new exception
Tim Otten [Sat, 4 Mar 2023 03:31:04 +0000 (19:31 -0800)]
Merge pull request #25733 from totten/5.60-upg-ml
Fix for 5.59 upgrade on multilingual
Tim Otten [Sat, 4 Mar 2023 00:44:20 +0000 (16:44 -0800)]
Merge pull request #25730 from eileenmcnaughton/std
Fix typing, comments in new StandardFilters class
Jon Goldberg [Thu, 2 Mar 2023 15:37:09 +0000 (10:37 -0500)]
Fix for 5.59 upgrade on multilingual
Seamus Lee [Fri, 3 Mar 2023 21:11:58 +0000 (08:11 +1100)]
Merge pull request #25732 from civicrm/5.60
5.60
demeritcowboy [Fri, 3 Mar 2023 21:04:19 +0000 (16:04 -0500)]
Merge pull request #25728 from mlutfy/core3438
dev/core#3438 Drupal: Prevent cv fatal if logging before CMS bootstrap
Seamus Lee [Fri, 3 Mar 2023 21:02:53 +0000 (08:02 +1100)]
Merge pull request #25729 from MegaphoneJon/membership-lookup-fix
Contribution pages crash for logged-in users when CiviMember is disabled
Eileen McNaughton [Fri, 3 Mar 2023 20:04:10 +0000 (09:04 +1300)]
Fix typing, comments in new StandardFilters class
Eileen McNaughton [Fri, 3 Mar 2023 19:55:42 +0000 (08:55 +1300)]
Merge pull request #25727 from totten/master-token-case
(dev/core#4137) Tokens - Filters should be HTML-sensitive
Jon Goldberg [Fri, 3 Mar 2023 19:37:50 +0000 (14:37 -0500)]
Fix regression on contribution pages when CiviMember is not enabled
Mathieu Lu [Fri, 3 Mar 2023 14:06:55 +0000 (09:06 -0500)]
dev/core#3438 Drupal: Prevent cv fatal if logging before CMS bootstrap
Tim Otten [Fri, 3 Mar 2023 09:38:29 +0000 (01:38 -0800)]
Tokens - "|upper" and "|lower" should work differently in text+html
Tim Otten [Fri, 3 Mar 2023 09:15:27 +0000 (01:15 -0800)]
(REF) TokenProcessor - Extract class StandardFilters
Tim Otten [Fri, 3 Mar 2023 08:54:08 +0000 (00:54 -0800)]
CRM_Utils_XML - Add method filterMarkupText
Eileen McNaughton [Tue, 21 Feb 2023 04:28:32 +0000 (17:28 +1300)]
Update Import fix to leverage the exception
Eileen McNaughton [Fri, 3 Mar 2023 04:36:42 +0000 (17:36 +1300)]
Merge pull request #25722 from eileenmcnaughton/rec_test
Fix in ContributionTest class
colemanw [Fri, 3 Mar 2023 03:02:11 +0000 (22:02 -0500)]
Merge pull request #25718 from eileenmcnaughton/admin
dev/core#4153 Extend the fields available for PrimaryContact on search
Eileen McNaughton [Fri, 3 Mar 2023 02:59:44 +0000 (15:59 +1300)]
Merge pull request #25721 from demeritcowboy/history-report
Pager missing on Aggregate By Relationship civireport
Eileen McNaughton [Fri, 3 Mar 2023 02:52:40 +0000 (15:52 +1300)]
Fix in ContributionTest class
This fixes a set up bug. The test deals with a recurring contribution where the
tax is involved. The set up creates the recurring with an amount of 500
and the contribution with an amount of 100. This is invalid but because of
a code change that was outside of what is being tested it scrapes through.
This fixes the test to test a valid 100 for each, followed by the recurring
being changed to an override amount ot 200.
demeritcowboy [Fri, 3 Mar 2023 02:49:24 +0000 (21:49 -0500)]
Merge pull request #25574 from herbdool/core-4127-5
dev/core#4127 move standalone profile modification to userSystem
Herb v/d Dool [Wed, 15 Feb 2023 22:18:42 +0000 (17:18 -0500)]
dev/core#4127 move standalone profile modification to userSystem
Eileen McNaughton [Thu, 2 Mar 2023 23:06:07 +0000 (12:06 +1300)]
Unconditionally assign quickConfig, add helper for getPriceSetID
Eileen McNaughton [Thu, 2 Mar 2023 22:55:10 +0000 (11:55 +1300)]
Extend the fields available for PrimaryContact on search
Seamus Lee [Thu, 2 Mar 2023 22:53:01 +0000 (09:53 +1100)]
Merge pull request #25707 from eileenmcnaughton/tax_error
Fix bug in tax calculation when recurring overrides with a different value
Tim Otten [Thu, 2 Mar 2023 22:48:32 +0000 (14:48 -0800)]
Merge pull request #25634 from eileenmcnaughton/except
Add new `\Civi\Exception\DBQueryException` & throw that rather than a `PEAR_Exception`
Tim Otten [Thu, 2 Mar 2023 22:45:41 +0000 (14:45 -0800)]
Merge pull request #25704 from totten/5.59-token-mismatch
(dev/core#4147) Add test and fix for various flaky tokens
Seamus Lee [Thu, 2 Mar 2023 22:05:37 +0000 (09:05 +1100)]
Merge pull request #25689 from eileenmcnaughton/php82_quick_config
Php8.2 stop accessing undefined form Property isQuickConfig in `PriceField:addQuickFormElement`
demeritcowboy [Thu, 2 Mar 2023 22:02:39 +0000 (17:02 -0500)]
make pager work
Eileen McNaughton [Thu, 2 Mar 2023 19:53:58 +0000 (08:53 +1300)]
Merge pull request #25713 from totten/worldregion
Worldregion - For API-entity-naming, prefer "WorldRegion"
Tim Otten [Thu, 2 Mar 2023 08:22:40 +0000 (00:22 -0800)]
Api4 - Rename Worldregion to WorldRegion
Tim Otten [Thu, 2 Mar 2023 05:53:53 +0000 (21:53 -0800)]
Worldregion - For API-entity-naming, prefer "WorldRegion"
Tim Otten [Thu, 2 Mar 2023 05:53:53 +0000 (21:53 -0800)]
Worldregion - For API-entity-naming, prefer "WorldRegion"
Eileen McNaughton [Thu, 2 Mar 2023 04:10:16 +0000 (17:10 +1300)]
Filter 'My imports' to only show non-expired
Eileen McNaughton [Thu, 2 Mar 2023 04:03:02 +0000 (17:03 +1300)]
Merge pull request #25708 from eileenmcnaughton/nfc
[NFC] Superficial cleanup in test class
Eileen McNaughton [Thu, 2 Mar 2023 03:12:45 +0000 (16:12 +1300)]
Merge pull request #25710 from colemanw/deprecatedGone
Deprecated code removal
Eileen McNaughton [Thu, 2 Mar 2023 00:06:17 +0000 (13:06 +1300)]
[NFC] Superficial cleanup in test class
CiviCRM [Thu, 2 Mar 2023 01:32:24 +0000 (01:32 +0000)]
Set version to 5.61.alpha1
CiviCRM [Thu, 2 Mar 2023 01:32:11 +0000 (01:32 +0000)]
Set version to 5.60.beta1
Coleman Watts [Thu, 2 Mar 2023 01:19:54 +0000 (20:19 -0500)]
Deprecated code removal
Eileen McNaughton [Wed, 1 Mar 2023 22:48:36 +0000 (11:48 +1300)]
Fix bug in tax calculation when recurring overrides with a different value
Eileen McNaughton [Wed, 1 Mar 2023 22:56:05 +0000 (11:56 +1300)]
Style
Eileen McNaughton [Wed, 1 Mar 2023 22:46:58 +0000 (11:46 +1300)]
Merge pull request #25706 from eileenmcnaughton/strict
Stricter typing in Apiv4
Eileen McNaughton [Wed, 1 Mar 2023 22:21:37 +0000 (11:21 +1300)]
Sigh, and they have colons:
Eileen McNaughton [Wed, 1 Mar 2023 22:20:16 +0000 (11:20 +1300)]
Fix key mismatch
Eileen McNaughton [Wed, 1 Mar 2023 22:19:02 +0000 (11:19 +1300)]
Fix preferred_communication method
Also fix over-aggressive test assertion
Eileen McNaughton [Wed, 1 Mar 2023 21:56:43 +0000 (10:56 +1300)]
Fix region token
Eileen McNaughton [Wed, 1 Mar 2023 21:49:40 +0000 (10:49 +1300)]
Stricter typing in Apiv4
Eileen McNaughton [Wed, 1 Mar 2023 21:47:44 +0000 (10:47 +1300)]
Add Worldregion api for join
Eileen McNaughton [Wed, 1 Mar 2023 21:47:26 +0000 (10:47 +1300)]
Fix for unresolved state_province