civicrm-core.git
23 months agoEnable Smarty3, smarty notices by default for all localhost or demo builds
Eileen McNaughton [Wed, 20 Dec 2023 00:17:17 +0000 (13:17 +1300)]
Enable Smarty3, smarty notices  by default for all localhost or demo builds

23 months agoMerge pull request #28715 from demeritcowboy/regen
Eileen McNaughton [Tue, 19 Dec 2023 03:57:17 +0000 (16:57 +1300)]
Merge pull request #28715 from demeritcowboy/regen

regen after 28705

23 months agoMerge pull request #28713 from eileenmcnaughton/dummy
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

23 months agoregen
demeritcowboy [Tue, 19 Dec 2023 02:53:38 +0000 (21:53 -0500)]
regen

23 months agoMerge pull request #28705 from eileenmcnaughton/template_cancel
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

2 years agoAdd test cover for Dummy deprecations
Eileen McNaughton [Tue, 19 Dec 2023 01:47:55 +0000 (14:47 +1300)]
Add test cover for Dummy deprecations

2 years agoFix regression on frequency unit handling in 5.69
Eileen McNaughton [Sun, 17 Dec 2023 21:38:00 +0000 (10:38 +1300)]
Fix regression on frequency unit handling in 5.69

2 years agoMerge pull request #28710 from mattwire/deprecatedinvoicesettings
Eileen McNaughton [Tue, 19 Dec 2023 00:57:35 +0000 (13:57 +1300)]
Merge pull request #28710 from mattwire/deprecatedinvoicesettings

Replace deprecated invoice settings

2 years agoFix notice in participant_cancelled email
Eileen McNaughton [Mon, 18 Dec 2023 21:08:59 +0000 (10:08 +1300)]
Fix notice in participant_cancelled email

2 years agoMerge pull request #28707 from colemanw/reportInstanceCleanup
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

2 years agoReplace deprecated invoice settings
Matthew Wire [Tue, 19 Dec 2023 00:03:35 +0000 (00:03 +0000)]
Replace deprecated invoice settings

2 years agoMerge pull request #28701 from eileenmcnaughton/get
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

2 years agoReportInstance - Cleanup BAO::add function and DAO metadata
colemanw [Mon, 18 Dec 2023 21:59:27 +0000 (16:59 -0500)]
ReportInstance - Cleanup BAO::add function and DAO metadata

2 years agoMerge pull request #28706 from civicrm/revert-28703-declarations
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"

2 years agoRevert "Remove parent-declared properties"
Eileen McNaughton [Mon, 18 Dec 2023 21:15:48 +0000 (10:15 +1300)]
Revert "Remove parent-declared properties"

2 years agoMerge pull request #28653 from colemanw/deletedFiles
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

2 years agoPass value as variable, not property
Eileen McNaughton [Mon, 18 Dec 2023 20:29:08 +0000 (09:29 +1300)]
Pass value as variable, not property

2 years agoMerge pull request #28703 from eileenmcnaughton/declarations
Eileen McNaughton [Mon, 18 Dec 2023 20:28:24 +0000 (09:28 +1300)]
Merge pull request #28703 from eileenmcnaughton/declarations

Remove parent-declared properties

2 years agoRemove parent-declared properties
Eileen McNaughton [Mon, 18 Dec 2023 19:37:23 +0000 (08:37 +1300)]
Remove parent-declared properties

2 years agoMerge pull request #28697 from eileenmcnaughton/ignore
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

2 years agoRemove unused undeclared property _params, provide __get for transitional support
Eileen McNaughton [Mon, 18 Dec 2023 19:06:49 +0000 (08:06 +1300)]
Remove unused undeclared property _params, provide __get for transitional support

2 years agoMerge pull request #28666 from colemanw/daoCleanup
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()

2 years agoStop ignoring tests when apiv4 function does not exist
Eileen McNaughton [Mon, 18 Dec 2023 12:50:08 +0000 (01:50 +1300)]
Stop ignoring tests when apiv4 function does not exist

2 years agoMerge pull request #28698 from civicrm/5.69
demeritcowboy [Mon, 18 Dec 2023 16:01:25 +0000 (11:01 -0500)]
Merge pull request #28698 from civicrm/5.69

5.69

2 years agoMerge pull request #28696 from eileenmcnaughton/notice_processor
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

2 years agoAddress 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

2 years agoMerge pull request #28676 from eileenmcnaughton/init
Matthew Wire [Mon, 18 Dec 2023 11:48:25 +0000 (11:48 +0000)]
Merge pull request #28676 from eileenmcnaughton/init

Remove deprecated function `initSet`

2 years agoMerge pull request #28678 from eileenmcnaughton/init_less
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

2 years agoMerge pull request #28652 from eileenmcnaughton/update_2
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

2 years agoMerge pull request #28692 from eileenmcnaughton/frequent_test_2
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

2 years agoMove ContributionPage test to ConfirmTest class
Eileen McNaughton [Mon, 18 Dec 2023 06:25:40 +0000 (19:25 +1300)]
Move ContributionPage test to ConfirmTest class

2 years agoMerge pull request #28687 from eileenmcnaughton/status
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

2 years agoMinor params cleanup in test
Eileen McNaughton [Mon, 18 Dec 2023 06:02:56 +0000 (19:02 +1300)]
Minor params cleanup in test

2 years agoStop comparing status_id with membership type in test
Eileen McNaughton [Mon, 18 Dec 2023 01:10:40 +0000 (14:10 +1300)]
Stop comparing status_id with membership type in test

2 years agoMerge pull request #28691 from seamuslee001/package_lock
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

2 years agoMerge pull request #28690 from seamuslee001/master
Seamus Lee [Mon, 18 Dec 2023 03:12:11 +0000 (14:12 +1100)]
Merge pull request #28690 from seamuslee001/master

5.69

2 years agoUpdate package lock for newer npm versions
Seamus Lee [Mon, 18 Dec 2023 03:11:40 +0000 (14:11 +1100)]
Update package lock for newer npm versions

2 years agoMerge branch '5.69'
Seamus Lee [Mon, 18 Dec 2023 03:10:09 +0000 (14:10 +1100)]
Merge branch '5.69'

2 years agoMerge pull request #28674 from eileenmcnaughton/test_up
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

2 years agoMerge pull request #28677 from demeritcowboy/extcrash
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

2 years agoMerge pull request #28681 from eileenmcnaughton/explode
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

2 years agoregen
demeritcowboy [Sun, 17 Dec 2023 20:12:47 +0000 (15:12 -0500)]
regen

2 years agomissing extensions
demeritcowboy [Sun, 17 Dec 2023 20:07:08 +0000 (15:07 -0500)]
missing extensions

2 years agoFix tests to more standard setup method
Eileen McNaughton [Sun, 17 Dec 2023 22:20:33 +0000 (11:20 +1300)]
Fix tests to more standard setup method

2 years agoMerge pull request #28685 from civicrm/5.69
Eileen McNaughton [Sun, 17 Dec 2023 23:25:02 +0000 (12:25 +1300)]
Merge pull request #28685 from civicrm/5.69

5.69

2 years agoStop setting front-end values in back office form
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

2 years agoMinor test simplification
Eileen McNaughton [Sun, 17 Dec 2023 22:02:49 +0000 (11:02 +1300)]
Minor test simplification

2 years agoMerge pull request #28294 from eileenmcnaughton/currency_notice
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

2 years agoMerge pull request #28682 from eileenmcnaughton/build_form
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

2 years agoMerge pull request #28679 from eileenmcnaughton/no_fee_block
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

2 years agoMerge pull request #28683 from civicrm/5.69
Eileen McNaughton [Sun, 17 Dec 2023 21:02:13 +0000 (10:02 +1300)]
Merge pull request #28683 from civicrm/5.69

5.69

2 years agoMerge pull request #28658 from eileenmcnaughton/payment
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

2 years agoMerge pull request #28675 from eileenmcnaughton/tests-
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

2 years agoSet formBuilt to TRUE when, erm, it is built
Eileen McNaughton [Sun, 17 Dec 2023 20:45:11 +0000 (09:45 +1300)]
Set formBuilt to TRUE when, erm, it is built

2 years agodev/core#4866 tag search fix
Eileen McNaughton [Sun, 17 Dec 2023 20:35:09 +0000 (09:35 +1300)]
dev/core#4866 tag search fix

2 years agoReplace undeclared property with local variable
Eileen McNaughton [Sun, 17 Dec 2023 20:28:15 +0000 (09:28 +1300)]
Replace undeclared property with local variable

2 years agoRemove deprecated function initSet
Eileen McNaughton [Sun, 17 Dec 2023 20:14:51 +0000 (09:14 +1300)]
Remove deprecated function initSet

2 years agoMinor variable standardisation in test
Eileen McNaughton [Sun, 17 Dec 2023 20:05:54 +0000 (09:05 +1300)]
Minor variable standardisation in test

2 years agoTest update - use apiv4 to set up for test
Eileen McNaughton [Sun, 17 Dec 2023 06:17:15 +0000 (19:17 +1300)]
Test update - use apiv4 to set up for test

2 years agoMerge pull request #28464 from seamuslee001/line_item_crm_type
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…

2 years agoMerge pull request #28671 from eileenmcnaughton/test_cleanup_fix
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

2 years agoCleanup membership Types
Eileen McNaughton [Sat, 16 Dec 2023 22:22:36 +0000 (11:22 +1300)]
Cleanup membership Types

2 years agoFix tests to test-template-data-update
Eileen McNaughton [Sat, 16 Dec 2023 21:33:47 +0000 (10:33 +1300)]
Fix tests to test-template-data-update

2 years agoMerge pull request #28669 from demeritcowboy/context-php8
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

2 years agoStandardise fetching of entity variables on recur management forms
Eileen McNaughton [Thu, 14 Dec 2023 10:53:31 +0000 (23:53 +1300)]
Standardise fetching of entity variables on recur management forms

2 years agodoes nothing
demeritcowboy [Sat, 16 Dec 2023 20:01:08 +0000 (15:01 -0500)]
does nothing

2 years agoMerge pull request #28667 from civicrm/5.69
demeritcowboy [Sat, 16 Dec 2023 13:46:10 +0000 (08:46 -0500)]
Merge pull request #28667 from civicrm/5.69

5.69

2 years agoMerge pull request #28665 from vingle/patch-19
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

2 years agoExt- Regenerate DAO files without fieldKeys(), getLog() and getTableName().
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.

2 years agoCore - Regenerate DAO files without fieldKeys(), getLog() and getTableName().
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.

2 years agoDAO - Remove fieldKeys(), getLog() and getTableName() from template
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.

2 years agoFixes two UX regressions
Nicol [Sat, 16 Dec 2023 00:18:49 +0000 (00:18 +0000)]
Fixes two UX regressions

https://lab.civicrm.org/dev/core/-/issues/4856

2 years agoMerge pull request #28664 from demeritcowboy/regen
Seamus Lee [Fri, 15 Dec 2023 23:44:09 +0000 (10:44 +1100)]
Merge pull request #28664 from demeritcowboy/regen

regen after 28633

2 years agoMerge pull request #28663 from civicrm/5.69
demeritcowboy [Fri, 15 Dec 2023 23:09:40 +0000 (18:09 -0500)]
Merge pull request #28663 from civicrm/5.69

5.69

2 years agoregen
demeritcowboy [Fri, 15 Dec 2023 23:03:02 +0000 (18:03 -0500)]
regen

2 years agoMerge pull request #28633 from eileenmcnaughton/no_text_
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

2 years agoMerge pull request #28661 from vingle/patch-15
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

2 years agoMerge pull request #28442 from colemanw/metadataFlush
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

2 years agoCache - Use service name
colemanw [Sun, 3 Dec 2023 16:20:07 +0000 (16:20 +0000)]
Cache - Use service name

2 years agoUpdate templates/CRM/Contact/Form/Search/Advanced.tpl
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>
2 years agoAdvanced search UX regression - collapses search criteria when there's results
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.

2 years agodev/core#2607 - Switch checkOrphans to use generated list
colemanw [Fri, 15 Dec 2023 15:09:07 +0000 (10:09 -0500)]
dev/core#2607 - Switch checkOrphans to use generated list

2 years agodev/core#2607 - Update deleted-files-list when running set-version script
colemanw [Thu, 14 Dec 2023 16:09:52 +0000 (11:09 -0500)]
dev/core#2607 - Update deleted-files-list when running set-version script

2 years agodev/core#2607 - Add deleted-files-list
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.

2 years agoMerge pull request #28523 from jaapjansma/role_permission_ui
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

2 years agoMerge pull request #28654 from eileenmcnaughton/build_back
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

2 years agoMerge pull request #28651 from eileenmcnaughton/update
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`

2 years agoMerge pull request #28476 from AlainBenbassat/searchkit_manage_events
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

2 years agoMerge pull request #28466 from artfulrobot/artfulrobot-ang-href-attr
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

2 years agoMerge pull request #28660 from colemanw/relationshipCacheStatusCheck
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

2 years ago[REF] Change LineItem.qty to be CRM type of FLOAT rather than Money as this field...
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

2 years agoRelationshipCache - Add status check to ensure cache table is up-to-date
colemanw [Fri, 15 Dec 2023 01:47:58 +0000 (20:47 -0500)]
RelationshipCache - Add status check to ensure cache table is up-to-date

2 years agoMerge pull request #28656 from eileenmcnaughton/update_3
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

2 years agoMerge pull request #28657 from eileenmcnaughton/part_formy
colemanw [Thu, 14 Dec 2023 22:20:21 +0000 (17:20 -0500)]
Merge pull request #28657 from eileenmcnaughton/part_formy

Unshare init event fee

2 years agoAdd check for mis-formatted amount
Eileen McNaughton [Thu, 14 Dec 2023 20:56:04 +0000 (09:56 +1300)]
Add check for mis-formatted amount

2 years agofix comment
Eileen McNaughton [Thu, 14 Dec 2023 21:55:09 +0000 (10:55 +1300)]
fix comment

2 years agoFix amount not getting passed through in simple contribution flow
Eileen McNaughton [Thu, 14 Dec 2023 20:34:04 +0000 (09:34 +1300)]
Fix amount not getting passed through in simple contribution flow

2 years agoUnshare init event fee
Eileen McNaughton [Thu, 14 Dec 2023 19:59:07 +0000 (08:59 +1300)]
Unshare init event fee

2 years agoMerge pull request #28649 from eileenmcnaughton/remove
colemanw [Thu, 14 Dec 2023 19:40:08 +0000 (14:40 -0500)]
Merge pull request #28649 from eileenmcnaughton/remove

Remove extraneous call to check financial acl

2 years agoAdd standardised for get traits
Eileen McNaughton [Thu, 14 Dec 2023 19:28:33 +0000 (08:28 +1300)]
Add standardised for get traits