Eileen McNaughton [Tue, 19 Dec 2023 05:21:42 +0000 (18:21 +1300)]
Merge branch '5.69' of github.com:civicrm/civicrm-core
Tim Otten [Tue, 19 Dec 2023 05:19:00 +0000 (21:19 -0800)]
Merge pull request #28694 from eileenmcnaughton/fix_frequency_2_months
Fix Recur frequency on auto-renew memberships
Tim Otten [Tue, 19 Dec 2023 04:34:30 +0000 (20:34 -0800)]
Merge pull request #28695 from eileenmcnaughton/notice_thank
Fix some notices on the Contribution ThankYou page
Eileen McNaughton [Mon, 18 Dec 2023 11:01:40 +0000 (00:01 +1300)]
Fix error on recurring membership in the rc
Extend recur membership frequency test + fix to bi-monthly payments
Eileen McNaughton [Tue, 19 Dec 2023 03:57:17 +0000 (16:57 +1300)]
Merge pull request #28715 from demeritcowboy/regen
regen after 28705
Tim Otten [Tue, 19 Dec 2023 03:39:11 +0000 (19:39 -0800)]
Merge pull request #28709 from totten/5.69-ical
CiviEvent - Fix iCalendar regression (RC)
Tim Otten [Tue, 19 Dec 2023 03:23:12 +0000 (19:23 -0800)]
Merge pull request #28713 from eileenmcnaughton/dummy
Add test cover for Dummy warnings
demeritcowboy [Tue, 19 Dec 2023 02:53:38 +0000 (21:53 -0500)]
regen
demeritcowboy [Tue, 19 Dec 2023 02:48:18 +0000 (21:48 -0500)]
Merge pull request #28705 from eileenmcnaughton/template_cancel
Fix notice in participant_cancelled email
Eileen McNaughton [Tue, 19 Dec 2023 01:47:55 +0000 (14:47 +1300)]
Add test cover for Dummy deprecations
Eileen McNaughton [Sun, 17 Dec 2023 21:38:00 +0000 (10:38 +1300)]
Fix regression on frequency unit handling in 5.69
Eileen McNaughton [Tue, 19 Dec 2023 00:57:35 +0000 (13:57 +1300)]
Merge pull request #28710 from mattwire/deprecatedinvoicesettings
Replace deprecated invoice settings
Eileen McNaughton [Mon, 18 Dec 2023 21:08:59 +0000 (10:08 +1300)]
Fix notice in participant_cancelled email
Tim Otten [Tue, 19 Dec 2023 00:44:16 +0000 (16:44 -0800)]
CiviEvent - Re-fix iCal. Preserve compatibility.
The recently merged commit for `CRM_Utils_ICalendar` fixed one bug and did
some code-cleanup... but it changed a contract in a way that breaks
`eventics` extension.
This restores the original contract and a more conservative fix.
Eileen McNaughton [Tue, 19 Dec 2023 00:12:10 +0000 (13:12 +1300)]
Merge pull request #28707 from colemanw/reportInstanceCleanup
ReportInstance - Cleanup BAO::add function and DAO metadata
Matthew Wire [Tue, 19 Dec 2023 00:03:35 +0000 (00:03 +0000)]
Replace deprecated invoice settings
Jon Goldberg [Mon, 18 Dec 2023 16:16:04 +0000 (11:16 -0500)]
Fix Event iCalendar regression
Seamus Lee [Mon, 18 Dec 2023 22:51:28 +0000 (09:51 +1100)]
Merge pull request #28701 from eileenmcnaughton/get
[php8.x] Remove unused undeclared property `_params`, provide __get for transitional support
colemanw [Mon, 18 Dec 2023 21:59:27 +0000 (16:59 -0500)]
ReportInstance - Cleanup BAO::add function and DAO metadata
Eileen McNaughton [Mon, 18 Dec 2023 21:16:22 +0000 (10:16 +1300)]
Merge pull request #28706 from civicrm/revert-28703-declarations
Revert "Remove parent-declared properties"
Eileen McNaughton [Mon, 18 Dec 2023 21:15:48 +0000 (10:15 +1300)]
Revert "Remove parent-declared properties"
Tim Otten [Mon, 18 Dec 2023 20:35:57 +0000 (12:35 -0800)]
Merge pull request #28653 from colemanw/deletedFiles
dev/core#2607 - Maintain list of deleted files
Eileen McNaughton [Mon, 18 Dec 2023 20:29:08 +0000 (09:29 +1300)]
Pass value as variable, not property
Eileen McNaughton [Mon, 18 Dec 2023 20:28:24 +0000 (09:28 +1300)]
Merge pull request #28703 from eileenmcnaughton/declarations
Remove parent-declared properties
Eileen McNaughton [Mon, 18 Dec 2023 19:37:23 +0000 (08:37 +1300)]
Remove parent-declared properties
Eileen McNaughton [Mon, 18 Dec 2023 19:32:11 +0000 (08:32 +1300)]
Merge pull request #28697 from eileenmcnaughton/ignore
Stop ignoring tests when apiv4 function does not exist
Eileen McNaughton [Mon, 18 Dec 2023 19:06:49 +0000 (08:06 +1300)]
Remove unused undeclared property _params, provide __get for transitional support
Eileen McNaughton [Mon, 18 Dec 2023 19:03:10 +0000 (08:03 +1300)]
Merge pull request #28666 from colemanw/daoCleanup
DAO - Remove fieldKeys(), getLog() and getTableName()
Eileen McNaughton [Mon, 18 Dec 2023 12:50:08 +0000 (01:50 +1300)]
Stop ignoring tests when apiv4 function does not exist
demeritcowboy [Mon, 18 Dec 2023 16:01:25 +0000 (11:01 -0500)]
Merge pull request #28698 from civicrm/5.69
5.69
demeritcowboy [Mon, 18 Dec 2023 14:52:53 +0000 (09:52 -0500)]
Merge pull request #28696 from eileenmcnaughton/notice_processor
Address payment processor notice in thankyou.tpl
Eileen McNaughton [Mon, 18 Dec 2023 12:22:56 +0000 (01:22 +1300)]
Address payment processor notice in thankyou .tpl
Eileen McNaughton [Mon, 18 Dec 2023 12:19:41 +0000 (01:19 +1300)]
Fix some notices on the Contribution ThankYou page
Matthew Wire [Mon, 18 Dec 2023 11:48:25 +0000 (11:48 +0000)]
Merge pull request #28676 from eileenmcnaughton/init
Remove deprecated function `initSet`
Matthew Wire [Mon, 18 Dec 2023 11:42:51 +0000 (11:42 +0000)]
Merge pull request #28678 from eileenmcnaughton/init_less
Stop setting front-end values in back office form
Matthew Wire [Mon, 18 Dec 2023 11:41:22 +0000 (11:41 +0000)]
Merge pull request #28652 from eileenmcnaughton/update_2
Standardise fetching of variables on recur management screens
Matthew Wire [Mon, 18 Dec 2023 11:39:24 +0000 (11:39 +0000)]
Merge pull request #28692 from eileenmcnaughton/frequent_test_2
Move ContributionPage test to ConfirmTest class
Eileen McNaughton [Mon, 18 Dec 2023 06:25:40 +0000 (19:25 +1300)]
Move ContributionPage test to ConfirmTest class
Eileen McNaughton [Mon, 18 Dec 2023 06:29:11 +0000 (19:29 +1300)]
Merge pull request #28687 from eileenmcnaughton/status
Stop comparing status_id with membership type in test
Eileen McNaughton [Mon, 18 Dec 2023 06:02:56 +0000 (19:02 +1300)]
Minor params cleanup in test
Eileen McNaughton [Mon, 18 Dec 2023 01:10:40 +0000 (14:10 +1300)]
Stop comparing status_id with membership type in test
Seamus Lee [Mon, 18 Dec 2023 04:19:38 +0000 (15:19 +1100)]
Merge pull request #28691 from seamuslee001/package_lock
Update package lock for newer npm versions
Seamus Lee [Mon, 18 Dec 2023 03:12:11 +0000 (14:12 +1100)]
Merge pull request #28690 from seamuslee001/master
5.69
Seamus Lee [Mon, 18 Dec 2023 03:11:40 +0000 (14:11 +1100)]
Update package lock for newer npm versions
Seamus Lee [Mon, 18 Dec 2023 03:10:09 +0000 (14:10 +1100)]
Merge branch '5.69'
colemanw [Mon, 18 Dec 2023 03:03:07 +0000 (22:03 -0500)]
Merge pull request #28674 from eileenmcnaughton/test_up
Test update - use apiv4 to set up for test
Seamus Lee [Mon, 18 Dec 2023 03:02:12 +0000 (14:02 +1100)]
Merge pull request #28677 from demeritcowboy/extcrash
dev/core#4867 - Crash if you try to enable civicase or civicampaign from the extensions screen
demeritcowboy [Mon, 18 Dec 2023 02:32:52 +0000 (21:32 -0500)]
Merge pull request #28681 from eileenmcnaughton/explode
dev/core#4866 tag search fix
demeritcowboy [Sun, 17 Dec 2023 20:12:47 +0000 (15:12 -0500)]
regen
demeritcowboy [Sun, 17 Dec 2023 20:07:08 +0000 (15:07 -0500)]
missing extensions
Eileen McNaughton [Sun, 17 Dec 2023 22:20:33 +0000 (11:20 +1300)]
Fix tests to more standard setup method
Eileen McNaughton [Sun, 17 Dec 2023 23:25:02 +0000 (12:25 +1300)]
Merge pull request #28685 from civicrm/5.69
5.69
Eileen McNaughton [Sun, 17 Dec 2023 20:20:43 +0000 (09:20 +1300)]
Stop setting front-end values in back office form
These values are only used in the front end validatePriceSet which is not called from the back office form
Eileen McNaughton [Sun, 17 Dec 2023 22:02:49 +0000 (11:02 +1300)]
Minor test simplification
Seamus Lee [Sun, 17 Dec 2023 22:30:25 +0000 (09:30 +1100)]
Merge pull request #28294 from eileenmcnaughton/currency_notice
Fix tax on other_amount, treat as inclusive of tax
Eileen McNaughton [Sun, 17 Dec 2023 22:14:54 +0000 (11:14 +1300)]
Merge pull request #28682 from eileenmcnaughton/build_form
Set formBuilt to TRUE when, erm, it is built
Eileen McNaughton [Sun, 17 Dec 2023 21:40:24 +0000 (10:40 +1300)]
Merge pull request #28679 from eileenmcnaughton/no_fee_block
Replace undeclared property with local variable
Eileen McNaughton [Sun, 17 Dec 2023 21:02:13 +0000 (10:02 +1300)]
Merge pull request #28683 from civicrm/5.69
5.69
colemanw [Sun, 17 Dec 2023 20:56:40 +0000 (15:56 -0500)]
Merge pull request #28658 from eileenmcnaughton/payment
Fix amount not getting passed through in simple contribution flow
Seamus Lee [Sun, 17 Dec 2023 20:50:47 +0000 (07:50 +1100)]
Merge pull request #28675 from eileenmcnaughton/tests-
Minor variable standardisation in test
Eileen McNaughton [Sun, 17 Dec 2023 20:45:11 +0000 (09:45 +1300)]
Set formBuilt to TRUE when, erm, it is built
Eileen McNaughton [Sun, 17 Dec 2023 20:35:09 +0000 (09:35 +1300)]
dev/core#4866 tag search fix
Eileen McNaughton [Sun, 17 Dec 2023 20:28:15 +0000 (09:28 +1300)]
Replace undeclared property with local variable
Eileen McNaughton [Sun, 17 Dec 2023 20:14:51 +0000 (09:14 +1300)]
Remove deprecated function initSet
Eileen McNaughton [Sun, 17 Dec 2023 20:05:54 +0000 (09:05 +1300)]
Minor variable standardisation in test
Eileen McNaughton [Sun, 17 Dec 2023 06:17:15 +0000 (19:17 +1300)]
Test update - use apiv4 to set up for test
Eileen McNaughton [Sun, 17 Dec 2023 05:28:56 +0000 (18:28 +1300)]
Merge pull request #28464 from seamuslee001/line_item_crm_type
[REF] Change LineItem.qty to be CRM type of FLOAT rather than Money a…
Seamus Lee [Sat, 16 Dec 2023 23:56:49 +0000 (10:56 +1100)]
Merge pull request #28671 from eileenmcnaughton/test_cleanup_fix
Cleanup membership Types in test
Eileen McNaughton [Sat, 16 Dec 2023 22:22:36 +0000 (11:22 +1300)]
Cleanup membership Types
Eileen McNaughton [Sat, 16 Dec 2023 21:33:47 +0000 (10:33 +1300)]
Fix tests to test-template-data-update
Eileen McNaughton [Sat, 16 Dec 2023 21:34:44 +0000 (10:34 +1300)]
Merge pull request #28669 from demeritcowboy/context-php8
[PHP8] Remove unneeded $this->_context in Case_Page_Tab
Eileen McNaughton [Thu, 14 Dec 2023 10:53:31 +0000 (23:53 +1300)]
Standardise fetching of entity variables on recur management forms
demeritcowboy [Sat, 16 Dec 2023 20:01:08 +0000 (15:01 -0500)]
does nothing
demeritcowboy [Sat, 16 Dec 2023 13:46:10 +0000 (08:46 -0500)]
Merge pull request #28667 from civicrm/5.69
5.69
demeritcowboy [Sat, 16 Dec 2023 01:38:46 +0000 (20:38 -0500)]
Merge pull request #28665 from vingle/patch-19
Fixes two advanced search accordions UX regressions
colemanw [Sat, 16 Dec 2023 00:27:16 +0000 (19:27 -0500)]
Ext- Regenerate DAO files without fieldKeys(), getLog() and getTableName().
Per
9d89b14 these functions are redundant with the parent class.
colemanw [Sat, 16 Dec 2023 00:17:02 +0000 (19:17 -0500)]
Core - Regenerate DAO files without fieldKeys(), getLog() and getTableName().
Per
9d89b14 these functions are redundant with the parent class.
colemanw [Sat, 16 Dec 2023 00:06:12 +0000 (19:06 -0500)]
DAO - Remove fieldKeys(), getLog() and getTableName() from template
In 2020,
9d89b14 added these functions to the base class, effectively making them redundant in the generated DAO files.
But out of an abundance of caution, they were not immediatetly removed from the DAO template.
This was so that extensions that generate DAOs with civix (which uses the same template from core) would
not immediately lose backward-compat with prior versions of Civi.
At this point enough time has gone by. The functions were added to 5.31 which is quite a few ESR-releases old now.
Any extension wishing to generate DAO files compatible with versions < 5.31 can do so by using an older version of core
when running civix:generate.
Nicol [Sat, 16 Dec 2023 00:18:49 +0000 (00:18 +0000)]
Fixes two UX regressions
https://lab.civicrm.org/dev/core/-/issues/4856
Seamus Lee [Fri, 15 Dec 2023 23:44:09 +0000 (10:44 +1100)]
Merge pull request #28664 from demeritcowboy/regen
regen after 28633
demeritcowboy [Fri, 15 Dec 2023 23:09:40 +0000 (18:09 -0500)]
Merge pull request #28663 from civicrm/5.69
5.69
demeritcowboy [Fri, 15 Dec 2023 23:03:02 +0000 (18:03 -0500)]
regen
demeritcowboy [Fri, 15 Dec 2023 22:57:44 +0000 (17:57 -0500)]
Merge pull request #28633 from eileenmcnaughton/no_text_
Remove the text versions of a few more template
demeritcowboy [Fri, 15 Dec 2023 22:36:48 +0000 (17:36 -0500)]
Merge pull request #28661 from vingle/patch-15
Advanced search UX regression - collapses search criteria when there's results
colemanw [Fri, 15 Dec 2023 21:50:55 +0000 (16:50 -0500)]
Merge pull request #28442 from colemanw/metadataFlush
Metadata - Refresh clientside resources when clearing cache
colemanw [Sun, 3 Dec 2023 16:20:07 +0000 (16:20 +0000)]
Cache - Use service name
Nicol [Fri, 15 Dec 2023 17:21:01 +0000 (17:21 +0000)]
Update templates/CRM/Contact/Form/Search/Advanced.tpl
Simpler syntax
Co-authored-by: colemanw <coleman@civicrm.org>
Nicol [Fri, 15 Dec 2023 16:26:33 +0000 (16:26 +0000)]
Advanced search UX regression - collapses search criteria when there's results
Old UX of collapsing search criteria when there's results was lost during recent markup changes. This restores that.
colemanw [Fri, 15 Dec 2023 15:09:07 +0000 (10:09 -0500)]
dev/core#2607 - Switch checkOrphans to use generated list
colemanw [Thu, 14 Dec 2023 16:09:52 +0000 (11:09 -0500)]
dev/core#2607 - Update deleted-files-list when running set-version script
colemanw [Thu, 14 Dec 2023 14:41:07 +0000 (09:41 -0500)]
dev/core#2607 - Add deleted-files-list
Towards addressing the problem that some upgraders leave old files in the tree, which
can cause php fatal errors when they continue to autoload, or security issues if the
files were deleted for security reasons.
This generates a list of files which no longer exist. We could use that list to attempt
to auto-remove them during upgrades, or at the very least show an alert if they are present.
Rich Lott [Fri, 15 Dec 2023 11:31:33 +0000 (11:31 +0000)]
Merge pull request #28523 from jaapjansma/role_permission_ui
dev/core#4835 Standalone Permissions user interface
Matthew Wire [Fri, 15 Dec 2023 10:08:59 +0000 (10:08 +0000)]
Merge pull request #28654 from eileenmcnaughton/build_back
Remove front-end-only optionFullIds handling from back office form
Matthew Wire [Fri, 15 Dec 2023 10:08:03 +0000 (10:08 +0000)]
Merge pull request #28651 from eileenmcnaughton/update
Update updateSubscriptionTest to use`FormTestTrait`
Seamus Lee [Fri, 15 Dec 2023 06:16:58 +0000 (17:16 +1100)]
Merge pull request #28476 from AlainBenbassat/searchkit_manage_events
adds Manage Events
Seamus Lee [Fri, 15 Dec 2023 06:16:21 +0000 (17:16 +1100)]
Merge pull request #28466 from artfulrobot/artfulrobot-ang-href-attr
Fix missing blank href attr on <a> links in searchkit angular
Seamus Lee [Fri, 15 Dec 2023 06:15:46 +0000 (17:15 +1100)]
Merge pull request #28660 from colemanw/relationshipCacheStatusCheck
RelationshipCache - Add status check to ensure cache table is up-to-date
Seamus Lee [Mon, 4 Dec 2023 05:04:31 +0000 (16:04 +1100)]
[REF] Change LineItem.qty to be CRM type of FLOAT rather than Money as this field needs decimals but not to have $ added
colemanw [Fri, 15 Dec 2023 01:47:58 +0000 (20:47 -0500)]
RelationshipCache - Add status check to ensure cache table is up-to-date
Seamus Lee [Thu, 14 Dec 2023 23:03:33 +0000 (10:03 +1100)]
Merge pull request #28656 from eileenmcnaughton/update_3
Add standardised form get traits