civicrm-core.git
2 years agoMerge pull request #24594 from eileenmcnaughton/group_notice
demeritcowboy [Fri, 30 Sep 2022 13:54:20 +0000 (09:54 -0400)]
Merge pull request #24594 from eileenmcnaughton/group_notice

Fix smarty e-notices on group settings form

2 years agoMerge pull request #24644 from yashodha/report_fix
demeritcowboy [Thu, 29 Sep 2022 13:02:46 +0000 (09:02 -0400)]
Merge pull request #24644 from yashodha/report_fix

event report template clean up

2 years agoMerge pull request #24631 from braders/report-groupby-array-key-exists
demeritcowboy [Thu, 29 Sep 2022 13:02:23 +0000 (09:02 -0400)]
Merge pull request #24631 from braders/report-groupby-array-key-exists

Use array_key_exists to avoid warning on report GroupBy.tpl template

2 years agoevent report template clean up
yashodha [Thu, 29 Sep 2022 06:30:35 +0000 (12:00 +0530)]
event report template clean up

2 years agoMerge pull request #24640 from yashodha/dev-3876
Eileen McNaughton [Thu, 29 Sep 2022 03:53:56 +0000 (16:53 +1300)]
Merge pull request #24640 from yashodha/dev-3876

(dev/core#3876) Fix custom data view for case of type Money

2 years agoMerge pull request #24643 from tschuettler/SubscriptionHistoryDateAndTime
Eileen McNaughton [Thu, 29 Sep 2022 03:52:44 +0000 (16:52 +1300)]
Merge pull request #24643 from tschuettler/SubscriptionHistoryDateAndTime

dev/core#3877 - APIv4 - Save time part to subsciption history date

2 years agoMerge pull request #24641 from civicrm/5.54
Eileen McNaughton [Wed, 28 Sep 2022 22:10:56 +0000 (11:10 +1300)]
Merge pull request #24641 from civicrm/5.54

5.54

2 years agoUse array_key_exists to avoid warning on report GroupBy.tpl template
Bradley Taylor [Tue, 27 Sep 2022 18:57:04 +0000 (19:57 +0100)]
Use array_key_exists to avoid warning on report GroupBy.tpl template

2 years agoMerge pull request #24642 from yashodha/report_fix
demeritcowboy [Wed, 28 Sep 2022 16:44:25 +0000 (12:44 -0400)]
Merge pull request #24642 from yashodha/report_fix

clean up more report templates

2 years agoMerge pull request #24635 from eileenmcnaughton/rc
colemanw [Wed, 28 Sep 2022 12:22:41 +0000 (08:22 -0400)]
Merge pull request #24635 from eileenmcnaughton/rc

Require search kit & form builder for `civiimport`

2 years agoAPIv4 - Save time part to subsciption history date
Thomas Schüttler [Wed, 28 Sep 2022 11:25:50 +0000 (13:25 +0200)]
APIv4 - Save time part to subsciption history date

2 years agoclean up report templated
yashodha [Wed, 28 Sep 2022 11:25:20 +0000 (16:55 +0530)]
clean up report templated

2 years agoMerge pull request #24632 from colemanw/fixRecentItemsOptionGroup
Seamus Lee [Wed, 28 Sep 2022 08:30:40 +0000 (18:30 +1000)]
Merge pull request #24632 from colemanw/fixRecentItemsOptionGroup

RecentItems - Fix inconsistent option values between upgrader & insta…

2 years ago(dev/core#3876) Fix custom data view for case of type Money
yashodha [Wed, 28 Sep 2022 06:48:35 +0000 (12:18 +0530)]
(dev/core#3876) Fix custom data view for case of type Money

2 years agoRecentItems - Fix inconsistent option values between upgrader & installer
Coleman Watts [Tue, 27 Sep 2022 19:52:16 +0000 (15:52 -0400)]
RecentItems - Fix inconsistent option values between upgrader & installer

Values for new option group were accidentally created with numeric values in the 5.53.alpha1 upgrade,
and in the installer their names did not match the names created in the upgrader.

2 years agoRequire search kit & form builder for civiimport
Eileen McNaughton [Tue, 27 Sep 2022 21:13:23 +0000 (10:13 +1300)]
Require search kit & form builder for civiimport

2 years agoMerge pull request #24630 from larssandergreen/price-set-help-text
demeritcowboy [Tue, 27 Sep 2022 17:28:03 +0000 (13:28 -0400)]
Merge pull request #24630 from larssandergreen/price-set-help-text

Simplify description text for Display amounts on price fields, add help text for Description on price options

2 years agoPrice sets clarify
larssandergreen@gmail.com [Tue, 27 Sep 2022 15:59:33 +0000 (09:59 -0600)]
Price sets clarify

2 years agoMerge pull request #24624 from larssandergreen/fix-price-sets-pre-and-post-help-display
demeritcowboy [Tue, 27 Sep 2022 15:06:11 +0000 (11:06 -0400)]
Merge pull request #24624 from larssandergreen/fix-price-sets-pre-and-post-help-display

dev/core#3870 - Fix price sets pre and post help display

2 years agoMerge pull request #24625 from demeritcowboy/uilang-availlang
Eileen McNaughton [Tue, 27 Sep 2022 08:04:44 +0000 (21:04 +1300)]
Merge pull request #24625 from demeritcowboy/uilang-availlang

[NFC] Add comment about uiLanguages vs languageLimit to avoid confusion

2 years agoMerge pull request #24626 from demeritcowboy/assert-something
Eileen McNaughton [Tue, 27 Sep 2022 08:04:05 +0000 (21:04 +1300)]
Merge pull request #24626 from demeritcowboy/assert-something

[NFC] Assert something in unit test

2 years agoassert something
demeritcowboy [Tue, 27 Sep 2022 03:58:30 +0000 (23:58 -0400)]
assert something

2 years agoadd comment to avoid confusion
demeritcowboy [Tue, 27 Sep 2022 03:44:37 +0000 (23:44 -0400)]
add comment to avoid confusion

2 years agobetter css targeting
larssandergreen@gmail.com [Tue, 27 Sep 2022 01:51:22 +0000 (19:51 -0600)]
better css targeting

2 years agoMerge pull request #24596 from eileenmcnaughton/local_notice
Eileen McNaughton [Tue, 27 Sep 2022 01:38:26 +0000 (14:38 +1300)]
Merge pull request #24596 from eileenmcnaughton/local_notice

Fix smarty notices on localization page

2 years agoMerge pull request #24623 from eileenmcnaughton/master
Eileen McNaughton [Tue, 27 Sep 2022 01:38:07 +0000 (14:38 +1300)]
Merge pull request #24623 from eileenmcnaughton/master

5.54 to master

2 years agoMerge branch '5.54' of github.com:civicrm/civicrm-core
Eileen McNaughton [Tue, 27 Sep 2022 01:02:06 +0000 (14:02 +1300)]
Merge branch '5.54' of github.com:civicrm/civicrm-core

2 years agoMerge pull request #24621 from eileenmcnaughton/import_class_loader
Eileen McNaughton [Tue, 27 Sep 2022 00:47:15 +0000 (13:47 +1300)]
Merge pull request #24621 from eileenmcnaughton/import_class_loader

Fix import class loading issue in entityTypes hook

2 years agoSmarty notice fix
Eileen McNaughton [Fri, 23 Sep 2022 01:57:47 +0000 (13:57 +1200)]
Smarty notice fix

2 years agocleanup
larssandergreen@gmail.com [Mon, 26 Sep 2022 23:52:23 +0000 (17:52 -0600)]
cleanup

2 years agoMerge pull request #24603 from eileenmcnaughton/import
colemanw [Mon, 26 Sep 2022 23:35:38 +0000 (19:35 -0400)]
Merge pull request #24603 from eileenmcnaughton/import

Fix civiimport crash on unmapped fields, remove overzealous cleanup, add api to help debug & test

2 years agoFix price set pre and post help display, remove bold from price options
larssandergreen@gmail.com [Mon, 26 Sep 2022 23:31:05 +0000 (17:31 -0600)]
Fix price set pre and post help display, remove bold from price options

2 years agoMerge pull request #24619 from eileenmcnaughton/job_log
demeritcowboy [Mon, 26 Sep 2022 23:24:53 +0000 (19:24 -0400)]
Merge pull request #24619 from eileenmcnaughton/job_log

Sync api & form layer permissions for jobLog

2 years agoFix import class loading issue in entityTypes hook
Eileen McNaughton [Mon, 26 Sep 2022 21:33:43 +0000 (10:33 +1300)]
Fix import class loading issue in entityTypes hook

2 years agoMerge pull request #24620 from eileenmcnaughton/dep_note
demeritcowboy [Mon, 26 Sep 2022 23:12:27 +0000 (19:12 -0400)]
Merge pull request #24620 from eileenmcnaughton/dep_note

Remove long-deprecated function

2 years agoMerge pull request #24617 from eileenmcnaughton/rc
Eileen McNaughton [Mon, 26 Sep 2022 21:35:53 +0000 (10:35 +1300)]
Merge pull request #24617 from eileenmcnaughton/rc

Fix is_override variable in MembershipView

2 years agoRemove long-deprecated function
Eileen McNaughton [Mon, 26 Sep 2022 21:25:00 +0000 (10:25 +1300)]
Remove long-deprecated function

2 years agoSync api & form layer permissions for jobLog
Eileen McNaughton [Mon, 26 Sep 2022 21:00:04 +0000 (10:00 +1300)]
Sync api & form layer permissions for jobLog

2 years agoMerge pull request #24606 from braders/joblog-api4
Eileen McNaughton [Mon, 26 Sep 2022 20:55:24 +0000 (09:55 +1300)]
Merge pull request #24606 from braders/joblog-api4

Migrate JobLog page to API4

2 years agoMerge pull request #24600 from colemanw/fixInputValues
Eileen McNaughton [Mon, 26 Sep 2022 20:21:35 +0000 (09:21 +1300)]
Merge pull request #24600 from colemanw/fixInputValues

APIv4 - Fix Get operation to load options that depend on other options

2 years agoMerge pull request #24605 from braders/handle-unexpected-job-return-jobmanager
Eileen McNaughton [Mon, 26 Sep 2022 20:12:55 +0000 (09:12 +1300)]
Merge pull request #24605 from braders/handle-unexpected-job-return-jobmanager

Handle unexpected API result in JobManager (Avoid PHP warning)

2 years agoFix is_override variable in MembershipView
Bradley Taylor [Sat, 24 Sep 2022 15:49:43 +0000 (16:49 +0100)]
Fix is_override variable in MembershipView

2 years agoMerge pull request #24614 from mattwire/paypalfrequency
Eileen McNaughton [Mon, 26 Sep 2022 19:53:48 +0000 (08:53 +1300)]
Merge pull request #24614 from mattwire/paypalfrequency

Fix paypal subscription 'things don't seem to be working at the moment' if frequency_interval not specified

2 years agoMerge pull request #24616 from demeritcowboy/report-pager
Eileen McNaughton [Mon, 26 Sep 2022 19:49:05 +0000 (08:49 +1300)]
Merge pull request #24616 from demeritcowboy/report-pager

dev/core#3825 - CiviReport - number of rows to show parameter not working

2 years agoMerge pull request #24604 from braders/cleanup-job-return-success
Eileen McNaughton [Mon, 26 Sep 2022 19:45:40 +0000 (08:45 +1300)]
Merge pull request #24604 from braders/cleanup-job-return-success

Return success from cleanup job

2 years agoMerge pull request #24615 from demeritcowboy/null-v-null
Eileen McNaughton [Mon, 26 Sep 2022 19:44:24 +0000 (08:44 +1300)]
Merge pull request #24615 from demeritcowboy/null-v-null

dev/core#3862 - Crash when creating message template

2 years agonumber of rows parameter not working
demeritcowboy [Mon, 26 Sep 2022 17:03:27 +0000 (13:03 -0400)]
number of rows parameter not working

2 years agoMerge pull request #24009 from yashodha/dev-3732
demeritcowboy [Mon, 26 Sep 2022 16:40:08 +0000 (12:40 -0400)]
Merge pull request #24009 from yashodha/dev-3732

(dev/core#3732) Show billing address on Edit contribution screen as well

2 years agouse real null for primary keys
demeritcowboy [Mon, 26 Sep 2022 15:51:50 +0000 (11:51 -0400)]
use real null for primary keys

2 years agoextract composite key handling
demeritcowboy [Mon, 26 Sep 2022 15:51:32 +0000 (11:51 -0400)]
extract composite key handling

2 years agounit test
demeritcowboy [Mon, 26 Sep 2022 15:43:12 +0000 (11:43 -0400)]
unit test

2 years ago(dev/core#3732) Show billing address on Edit contribution screen as well
yashodha [Mon, 18 Jul 2022 09:13:13 +0000 (14:43 +0530)]
(dev/core#3732) Show billing address on Edit contribution screen as well

2 years agoFix paypal subscription 'things don't seem to be working at the moment' if frequency_...
Matthew Wire [Mon, 26 Sep 2022 10:03:04 +0000 (11:03 +0100)]
Fix paypal subscription 'things don't seem to be working at the moment' if frequency_unit not specified

2 years agoAdd import & validate actions
Eileen McNaughton [Mon, 26 Sep 2022 03:55:08 +0000 (16:55 +1300)]
Add import & validate actions

2 years ago[REF] Extract validateRow
Eileen McNaughton [Mon, 26 Sep 2022 02:26:38 +0000 (15:26 +1300)]
[REF] Extract validateRow

2 years agoRemove legacy table delete method
Eileen McNaughton [Mon, 26 Sep 2022 01:23:16 +0000 (14:23 +1300)]
Remove legacy table delete method

2 years agoFix civiimport crash on unmapped fields
Eileen McNaughton [Sat, 24 Sep 2022 07:41:18 +0000 (19:41 +1200)]
Fix civiimport crash on unmapped fields

2 years agoMerge pull request #24613 from braders/group-edit-smarty-variable
demeritcowboy [Sun, 25 Sep 2022 20:57:38 +0000 (16:57 -0400)]
Merge pull request #24613 from braders/group-edit-smarty-variable

Ensure smarty variable editSmartGroupURL is always defined on group edit

2 years agoEnsure smarty variable editSmartGroupURL is always defined on group edit
Bradley Taylor [Sun, 25 Sep 2022 16:26:56 +0000 (17:26 +0100)]
Ensure smarty variable editSmartGroupURL is always defined on group edit

2 years agoMerge pull request #24611 from civicrm/5.54
demeritcowboy [Sun, 25 Sep 2022 14:56:22 +0000 (10:56 -0400)]
Merge pull request #24611 from civicrm/5.54

5.54

2 years agoMerge pull request #24607 from braders/tagtree-children-always-set
demeritcowboy [Sat, 24 Sep 2022 19:44:00 +0000 (15:44 -0400)]
Merge pull request #24607 from braders/tagtree-children-always-set

Ensure children key is always set in tag buildTree

2 years agoAPIv4 - Fix Get operation to load options that depend on other options
Coleman Watts [Fri, 23 Sep 2022 16:01:01 +0000 (12:01 -0400)]
APIv4 - Fix Get operation to load options that depend on other options

Fixes dev/core#3866

2 years agoMerge pull request #24593 from eileenmcnaughton/regress
demeritcowboy [Sat, 24 Sep 2022 19:22:56 +0000 (15:22 -0400)]
Merge pull request #24593 from eileenmcnaughton/regress

dev/core#3826 Fix regression on contribution search tasks in search-kit

2 years agoMerge pull request #24608 from braders/notes-missing-th
demeritcowboy [Sat, 24 Sep 2022 16:00:27 +0000 (12:00 -0400)]
Merge pull request #24608 from braders/notes-missing-th

Add missing th element to note.tpl

2 years agoAdd missing th element to note.tpl
Bradley Taylor [Sat, 24 Sep 2022 12:35:26 +0000 (13:35 +0100)]
Add missing th element to note.tpl

2 years agoEnsure children key is always set in tag buildTree
Bradley Taylor [Sat, 24 Sep 2022 11:32:10 +0000 (12:32 +0100)]
Ensure children key is always set in tag buildTree

2 years agoMigrate JobLog page to API4
Bradley Taylor [Sat, 24 Sep 2022 10:56:57 +0000 (11:56 +0100)]
Migrate JobLog page to API4

2 years agoHandle unexpected API result in JobManager (Avoid PHP warning)
Bradley Taylor [Sat, 24 Sep 2022 10:32:08 +0000 (11:32 +0100)]
Handle unexpected API result in JobManager (Avoid PHP warning)

2 years agoReturn success from cleanup job
Bradley Taylor [Sat, 24 Sep 2022 10:13:16 +0000 (11:13 +0100)]
Return success from cleanup job

2 years agoMerge pull request #24602 from civicrm/5.54
Eileen McNaughton [Sat, 24 Sep 2022 02:17:06 +0000 (14:17 +1200)]
Merge pull request #24602 from civicrm/5.54

5.54 to master

2 years agoMerge pull request #24601 from demeritcowboy/err
Eileen McNaughton [Sat, 24 Sep 2022 02:12:50 +0000 (14:12 +1200)]
Merge pull request #24601 from demeritcowboy/err

Put back exception during class scanning

2 years agocan't call log this early
demeritcowboy [Fri, 23 Sep 2022 18:56:05 +0000 (14:56 -0400)]
can't call log this early

2 years agoMerge pull request #24599 from civicrm/5.54
demeritcowboy [Fri, 23 Sep 2022 19:01:35 +0000 (15:01 -0400)]
Merge pull request #24599 from civicrm/5.54

5.54

2 years agoMerge pull request #24584 from eileenmcnaughton/import_key
demeritcowboy [Fri, 23 Sep 2022 15:15:02 +0000 (11:15 -0400)]
Merge pull request #24584 from eileenmcnaughton/import_key

Undo breakage of multi-primary key entities

2 years agoMerge pull request #24591 from eileenmcnaughton/dep_gone
Yashodha Chaku [Fri, 23 Sep 2022 13:53:47 +0000 (19:23 +0530)]
Merge pull request #24591 from eileenmcnaughton/dep_gone

Remove `CRM_Core_Pseudoconstant::pcpStatus()` function after two-year noisy deprecation

2 years agoMerge pull request #24595 from eileenmcnaughton/group_notice_more
Seamus Lee [Fri, 23 Sep 2022 03:26:21 +0000 (13:26 +1000)]
Merge pull request #24595 from eileenmcnaughton/group_notice_more

[REF] Minor extraction

2 years ago[REF] Minor extraction
Eileen McNaughton [Fri, 23 Sep 2022 01:51:33 +0000 (13:51 +1200)]
[REF] Minor extraction

2 years agoFix smarty e-notices on group settings form
Eileen McNaughton [Fri, 23 Sep 2022 01:08:38 +0000 (13:08 +1200)]
Fix smarty e-notices on group settings form

2 years agodev/core#3826 Fix regression on contribution search tasks in search-kit
Eileen McNaughton [Fri, 23 Sep 2022 00:26:32 +0000 (12:26 +1200)]
dev/core#3826 Fix regression on contribution search tasks in search-kit

When switching from GET to POST calls (to support greater numbers of ids)
the fix required the qfKey to be set in search-kit. However, the
selected class name for the qfKey for contribution tasks
was wrong - leading to a validation error

2 years agoMerge pull request #24592 from civicrm/5.54
Eileen McNaughton [Thu, 22 Sep 2022 23:47:43 +0000 (11:47 +1200)]
Merge pull request #24592 from civicrm/5.54

5.54 to master

2 years agoMerge pull request #24580 from eileenmcnaughton/ss_scanner
Eileen McNaughton [Thu, 22 Sep 2022 23:11:56 +0000 (11:11 +1200)]
Merge pull request #24580 from eileenmcnaughton/ss_scanner

Class scanner - do not throw runTime Exception if class not loaded

2 years agoRemove phpStatus function after two-year noisy deprecation
Eileen McNaughton [Thu, 22 Sep 2022 23:10:24 +0000 (11:10 +1200)]
Remove phpStatus function after two-year noisy deprecation

2 years agoClass scanner - do not throw runTime Exception if class not loaded
Eileen McNaughton [Wed, 21 Sep 2022 02:01:03 +0000 (14:01 +1200)]
Class scanner - do not throw runTime Exception if class not loaded

2 years agoMerge pull request #24545 from eileenmcnaughton/import_angular
colemanw [Thu, 22 Sep 2022 21:42:51 +0000 (17:42 -0400)]
Merge pull request #24545 from eileenmcnaughton/import_angular

Add angular form to civiimport extension

2 years agoMerge pull request #24589 from civicrm/5.54
Eileen McNaughton [Thu, 22 Sep 2022 06:13:22 +0000 (18:13 +1200)]
Merge pull request #24589 from civicrm/5.54

5.54

2 years agoMerge pull request #24588 from eileenmcnaughton/rc
Eileen McNaughton [Thu, 22 Sep 2022 06:13:09 +0000 (18:13 +1200)]
Merge pull request #24588 from eileenmcnaughton/rc

Fix warnings on upgrade when non-core message templates exist

2 years agoFix warnings on upgrade when non-core message templates exist
Eileen McNaughton [Thu, 22 Sep 2022 02:37:09 +0000 (14:37 +1200)]
Fix warnings on upgrade when non-core message templates exist

2 years agoMerge pull request #24587 from demeritcowboy/home-billing
demeritcowboy [Thu, 22 Sep 2022 02:59:29 +0000 (22:59 -0400)]
Merge pull request #24587 from demeritcowboy/home-billing

dev/core#3863 - Default email location on contact is always Billing

2 years agomake default work again
demeritcowboy [Thu, 22 Sep 2022 01:11:39 +0000 (21:11 -0400)]
make default work again

2 years agoMerge pull request #24393 from briennekordis/Issue-#3745--rewriting-multi-select...
colemanw [Wed, 21 Sep 2022 23:15:42 +0000 (19:15 -0400)]
Merge pull request #24393 from briennekordis/Issue-#3745--rewriting-multi-select-tokens

closes #3745 Fixes Rewrite of Multi-Select Token in Search Kit

2 years agoUndo breakage of multi-primary key entities
Eileen McNaughton [Wed, 21 Sep 2022 22:14:43 +0000 (10:14 +1200)]
Undo breakage of multi-primary key entities

2 years agoMerge pull request #24530 from eileenmcnaughton/dep_anet
demeritcowboy [Wed, 21 Sep 2022 15:53:01 +0000 (11:53 -0400)]
Merge pull request #24530 from eileenmcnaughton/dep_anet

Code cleanup - remove unused fn call, prefer strict comparision

2 years agoMerge pull request #24579 from civicrm/5.54
demeritcowboy [Wed, 21 Sep 2022 13:33:44 +0000 (09:33 -0400)]
Merge pull request #24579 from civicrm/5.54

5.54

2 years agoMerge pull request #24578 from demeritcowboy/inarray-backwards
Seamus Lee [Wed, 21 Sep 2022 05:26:14 +0000 (15:26 +1000)]
Merge pull request #24578 from demeritcowboy/inarray-backwards

Regenerate civicrm_generated after #22686 and codegen params to in_array are backwards

2 years agoMerge pull request #24581 from colemanw/exportUiComponent
Eileen McNaughton [Wed, 21 Sep 2022 05:13:28 +0000 (17:13 +1200)]
Merge pull request #24581 from colemanw/exportUiComponent

[REF] ExportUI - Convert Angular controller to component

2 years agoAdd angular form to civiimport extension
Eileen McNaughton [Mon, 29 Aug 2022 21:40:38 +0000 (09:40 +1200)]
Add angular form to civiimport extension

2 years agoExportUI - Convert Angular controller to component
Coleman Watts [Wed, 21 Sep 2022 02:05:51 +0000 (22:05 -0400)]
ExportUI - Convert Angular controller to component

2 years agoMerge pull request #24477 from elisseck/issues/3839
demeritcowboy [Wed, 21 Sep 2022 00:49:54 +0000 (20:49 -0400)]
Merge pull request #24477 from elisseck/issues/3839

Add system check for clean URL configuration

2 years agoFix missing labels in preview screen
Eileen McNaughton [Tue, 20 Sep 2022 03:59:35 +0000 (15:59 +1200)]
Fix missing labels in preview screen

2 years agoregen
demeritcowboy [Tue, 20 Sep 2022 23:48:38 +0000 (19:48 -0400)]
regen