demeritcowboy [Mon, 10 Jul 2023 11:21:11 +0000 (07:21 -0400)]
Merge pull request #26777 from eileenmcnaughton/mem_block
Fix recent breakage on membershipBlock.tpl
Eileen McNaughton [Mon, 10 Jul 2023 01:17:09 +0000 (13:17 +1200)]
Fix recent breakage on membershipBlock.tpl
This was a recent commit of mine that I was working on at the airport.
I meant to come back to it landside but it got merged before I did,
with the result that we merged it in a broken state.
This fixes
demeritcowboy [Fri, 7 Jul 2023 12:45:34 +0000 (08:45 -0400)]
Merge pull request #26763 from larssandergreen/More-fixes-for-counting-to-ten-in-arrays
Fix PHP errors on profiles and custom fields when using options per line
CiviCRM [Fri, 7 Jul 2023 04:35:55 +0000 (04:35 +0000)]
Set version to 5.64.beta1
Tim Otten [Fri, 7 Jul 2023 04:23:19 +0000 (21:23 -0700)]
Merge pull request #26232 from eileenmcnaughton/trans_locale
dev/core#4409 Use translation for default language, if exists
larssandergreen [Fri, 7 Jul 2023 03:54:48 +0000 (21:54 -0600)]
Fix PHP errors on profiles and custom fields when using options per line
Seamus Lee [Fri, 7 Jul 2023 02:33:31 +0000 (22:33 -0400)]
Merge pull request #26760 from seamuslee001/payment_processor_upgrade
dev/core#4418 Add in Upgrade script to fix double json encoding
colemanw [Fri, 7 Jul 2023 01:33:37 +0000 (18:33 -0700)]
Merge pull request #26758 from seamuslee001/paymentprocessor_unit_test
[REF] dev/core#4418 Add in Unit test of submitting the form to ensure…
Seamus Lee [Fri, 7 Jul 2023 01:26:52 +0000 (11:26 +1000)]
Shift to using executeQuery rather than API to perform upgrade
Seamus Lee [Thu, 6 Jul 2023 23:05:55 +0000 (09:05 +1000)]
[REF] dev/core#4418 Add in Unit test of submitting the form to ensure no double handling escaping
Remove deprecation notice as per coleman
Minor fixes to match the form better
Seamus Lee [Fri, 7 Jul 2023 00:21:48 +0000 (10:21 +1000)]
[REF] Ensure that test payment processors are captured by the test and in the upgrade script and fix upgrade scripts as per dave's comments
Seamus Lee [Thu, 6 Jul 2023 23:50:43 +0000 (19:50 -0400)]
Merge pull request #26755 from larssandergreen/Fix-Payment-Processor-accepted_credit_cards-regression
dev/core#4418 Fix Payment Processor accepted_credit_cards regression
Seamus Lee [Thu, 6 Jul 2023 23:32:53 +0000 (09:32 +1000)]
[REF] dev/core#4418 Add in Upgrade script to fix double json encoding
demeritcowboy [Thu, 6 Jul 2023 23:37:53 +0000 (19:37 -0400)]
Merge pull request #26757 from demeritcowboy/index-10
dev/core#4419 - Crash on membership tab of contribution page config (should go into 5.64)
demeritcowboy [Thu, 6 Jul 2023 23:18:16 +0000 (19:18 -0400)]
Merge pull request #26749 from mlutfy/caseTypeNewLink
crmCaseType: fix New Case Type link visiblity in obscure circumstances
demeritcowboy [Thu, 6 Jul 2023 22:52:03 +0000 (18:52 -0400)]
there are no longer 10 non-numeric elements
larssandergreen [Thu, 6 Jul 2023 21:54:55 +0000 (15:54 -0600)]
Fix Payment Processor accepted_credit_cards regression
Tim Otten [Thu, 6 Jul 2023 21:43:51 +0000 (14:43 -0700)]
Merge pull request #26753 from seamuslee001/master
5.63 late / after release changes
Seamus Lee [Thu, 6 Jul 2023 21:39:20 +0000 (17:39 -0400)]
Merge pull request #26754 from seamuslee001/revert_message_template_write_record
[REF] Use writeRecord in the revert function of MessageTemplate to en…
Justin Freeman [Thu, 6 Jul 2023 07:08:56 +0000 (17:08 +1000)]
CIVICRM-2150 CiviCRM 5.63.0 regression, Mailing click tracking now returns: Error 500 malformed header from script 'url.php': Bad header for all tracked URLs
Tim Otten [Wed, 5 Jul 2023 19:42:47 +0000 (12:42 -0700)]
(dev/core#4391) Prohibit uninstallation of core components
Tim Otten [Wed, 5 Jul 2023 19:51:11 +0000 (12:51 -0700)]
ext/civi_*/info.xml - Tag as "component"
Seamus Lee [Thu, 6 Jul 2023 20:59:50 +0000 (06:59 +1000)]
[REF] Use writeRecord in the revert function of MessageTemplate to ensure that pre and post hooks are called
demeritcowboy [Thu, 6 Jul 2023 18:20:32 +0000 (14:20 -0400)]
Merge pull request #26751 from larssandergreen/Remove-weird-profile-field-save-confirm-message
Remove unneeded and strange profile field save success alert
larssandergreen [Thu, 6 Jul 2023 17:40:49 +0000 (11:40 -0600)]
Remove unneeded and strange profile field save confirm alert
Mathieu Lutfy [Thu, 6 Jul 2023 15:03:44 +0000 (11:03 -0400)]
crmCaseType: fix New Case Type link visiblity in obscure circumstances
Yashodha Chaku [Thu, 6 Jul 2023 14:50:33 +0000 (20:20 +0530)]
Merge pull request #26690 from eileenmcnaughton/block
Split MembershipBlock.tpl into 2
colemanw [Thu, 6 Jul 2023 13:54:50 +0000 (06:54 -0700)]
Merge pull request #26745 from aydun/recur_metadata
Make the `recur_id` field of Contributions available to FormBuilder
Aidan Saunders [Thu, 6 Jul 2023 06:36:44 +0000 (07:36 +0100)]
Make the `recur_id` field of Contributions available to FormBuilder
Tim Otten [Thu, 6 Jul 2023 04:16:32 +0000 (21:16 -0700)]
Merge pull request #26744 from larssandergreen/Don't-remove-core-component-permissions-on-flush
dev/core#4413 Don't remove core component permissions when disabled
larssandergreen [Wed, 5 Jul 2023 23:52:40 +0000 (17:52 -0600)]
Don't remove core component permissions when disabled
Eileen McNaughton [Tue, 16 May 2023 04:07:14 +0000 (16:07 +1200)]
Use translation for default language, if exists
There is an assumption in the code that for the default language a translation is not used.
However, the features around draft versions are all set up around
translations, so it becomes necessary to create translations
even for the default language. This change ensures they are
used if they exist.
Although we have a lot of complexity in the translation framework
on the rendering side I think assuming that where stuff is configured
people configured it to be used is a good underlying principle.
Eileen McNaughton [Wed, 5 Jul 2023 19:23:50 +0000 (07:23 +1200)]
Merge pull request #26741 from artfulrobot/help-debug-afform-submissions
NFC: Add debug level log message when afform submissions catch exceptions
Eileen McNaughton [Wed, 5 Jul 2023 19:08:13 +0000 (07:08 +1200)]
Merge pull request #26659 from mattwire/paymenttrxnid
Fix regression caused by 26620
Rich Lott [Wed, 5 Jul 2023 16:41:49 +0000 (17:41 +0100)]
Use afform log channel
Rich Lott / Artful Robot [Wed, 5 Jul 2023 15:57:47 +0000 (16:57 +0100)]
Add debug level log message when afform submissions catch exceptions
The code comments suggest we don't really know what to do here,
previously we did nothing, which was not helpful to a developer
trying to figure out why their code did nothing.
Now we emit the exception's message to the log file.
colemanw [Wed, 5 Jul 2023 13:01:22 +0000 (06:01 -0700)]
Merge pull request #26190 from eileenmcnaughton/lang_fallback
Fix Translation to load related language more reliably
colemanw [Wed, 5 Jul 2023 12:59:39 +0000 (05:59 -0700)]
Merge pull request #26740 from eileenmcnaughton/api_fix
Fix apiv4 bug on custom fields with spaces in name
colemanw [Wed, 5 Jul 2023 12:57:27 +0000 (05:57 -0700)]
Merge pull request #26733 from aydun/adminui_mailsettings
AdminUI: Convert Mail Accounts page civicrm/admin/mailSettings
Matthew Wire [Wed, 5 Jul 2023 09:11:59 +0000 (10:11 +0100)]
Merge pull request #26737 from eileenmcnaughton/trxn
Update related contribution trxn_id before sending email [must go into 5.64]
Aidan Saunders [Tue, 4 Jul 2023 23:10:46 +0000 (00:10 +0100)]
AdminUI: Convert Mail Accounts page civicrm/admin/mailSettings
Make MailSettings available to SearchKit
Eileen McNaughton [Sat, 1 Jul 2023 04:21:01 +0000 (21:21 -0700)]
Fix apiv4 bug on custom fields with spaces in name
Eileen McNaughton [Wed, 5 Jul 2023 05:16:09 +0000 (17:16 +1200)]
Merge pull request #26738 from civicrm/5.63
5.63
demeritcowboy [Wed, 5 Jul 2023 03:57:08 +0000 (23:57 -0400)]
Merge pull request #26735 from eileenmcnaughton/merge_perms
Fix recent regression - Use consistent value for checkPermissions in merger
Tim Otten [Wed, 5 Jul 2023 03:46:57 +0000 (20:46 -0700)]
Merge pull request #26684 from artfulrobot/standalone-login-ux
Standalone login ux
demeritcowboy [Wed, 5 Jul 2023 03:38:40 +0000 (23:38 -0400)]
Merge pull request #26736 from eileenmcnaughton/weight_3
Fix another place weight is not passed
colemanw [Wed, 5 Jul 2023 03:02:08 +0000 (20:02 -0700)]
Merge pull request #26734 from eileenmcnaughton/weight_2
Remove unused variables, fix a couple of ==
Eileen McNaughton [Wed, 5 Jul 2023 01:39:42 +0000 (13:39 +1200)]
Update related contribution trxn_id before sending email
This will allow https://github.com/civicrm/civicrm-core/pull/26659 to pass & merge
Eileen McNaughton [Wed, 5 Jul 2023 01:29:41 +0000 (13:29 +1200)]
Fix another place weight is not passed
Eileen McNaughton [Wed, 5 Jul 2023 01:10:35 +0000 (13:10 +1200)]
Use consistent value for checkPermissions in merger
We recently added a permission check when retrieving metadata here
https://github.com/civicrm/civicrm-core/commit/
0e88731ff38f4bcf5a4d53c7e2ced01f70533ff1#diff-fe60c89ebe94bbd40114d135459371cc53708db1f2952ade6c0ce9b3468c4dabR2306
However, when that function is called from getFieldValueAndLabel that is not being passed
and is defaulting to TRUE. This is causing issues in a cron context where
checkPermissions is being used (well actually in a unit test in our custom code
simulating that possiblility)
Eileen McNaughton [Wed, 5 Jul 2023 00:46:35 +0000 (12:46 +1200)]
Remove unused variables, fix a couple of ==
Eileen McNaughton [Wed, 5 Jul 2023 00:38:13 +0000 (12:38 +1200)]
Merge pull request #26732 from aydun/adminui_joblog
AdminUI: Convert Job Log page civicrm/admin/joblog
colemanw [Wed, 5 Jul 2023 00:37:23 +0000 (17:37 -0700)]
Merge pull request #26719 from eileenmcnaughton/weight_2
Add weights to contact search actions
Aidan Saunders [Tue, 4 Jul 2023 23:24:31 +0000 (00:24 +0100)]
AdminUI: Convert Job Log page civicrm/admin/joblog
Eileen McNaughton [Mon, 3 Jul 2023 20:21:07 +0000 (08:21 +1200)]
Add weights to contact search actions
Eileen McNaughton [Tue, 4 Jul 2023 22:28:52 +0000 (10:28 +1200)]
Merge pull request #26725 from demeritcowboy/acl
[NFC] Update test that's no longer doing what it was doing
demeritcowboy [Tue, 4 Jul 2023 22:25:41 +0000 (18:25 -0400)]
Merge pull request #26731 from colemanw/killCrmUtilsArrayValue
REF - Replace CRM_Utils_Array::value with ??
Aidan Saunders [Tue, 4 Jul 2023 21:42:22 +0000 (22:42 +0100)]
Merge pull request #26730 from colemanw/fixSmartyRewrite
SearchKit - Fix check for smarty syntax in rewrite output
colemanw [Tue, 4 Jul 2023 21:21:32 +0000 (17:21 -0400)]
REF - Replace CRM_Utils_Array::value with ??
colemanw [Tue, 4 Jul 2023 17:57:31 +0000 (13:57 -0400)]
SearchKit - Fix check for smarty syntax in rewrite output
Fixes dev/core#4405
Aidan Saunders [Tue, 4 Jul 2023 16:54:35 +0000 (17:54 +0100)]
Merge pull request #26728 from howardshand/patch-1
Merged #26726 into master.
howardshand [Tue, 4 Jul 2023 16:46:42 +0000 (11:46 -0500)]
Merged #26726 into master.
colemanw [Tue, 4 Jul 2023 16:39:20 +0000 (09:39 -0700)]
Merge pull request #26726 from howardshand/patch-1
Update Api.php to correct external_identifier to type STRING
howardshand [Tue, 4 Jul 2023 16:22:17 +0000 (11:22 -0500)]
Update Api.php to correct external_identifier to type STRING
demeritcowboy [Tue, 4 Jul 2023 15:59:52 +0000 (11:59 -0400)]
Merge pull request #26724 from colemanw/shortArray
[REF] Autoformat php short array syntax
demeritcowboy [Tue, 4 Jul 2023 14:11:43 +0000 (10:11 -0400)]
update test
colemanw [Tue, 4 Jul 2023 13:40:56 +0000 (09:40 -0400)]
Autoformat php short array syntax
Monish Deb [Tue, 4 Jul 2023 04:17:06 +0000 (09:47 +0530)]
Merge pull request #26723 from colemanw/utilsArrayCleanup
[REF] Remove unnecessary CRM_Utils_Array::value and use short array syntax
Monish Deb [Tue, 4 Jul 2023 03:32:47 +0000 (09:02 +0530)]
Merge pull request #26699 from larssandergreen/Joomla-Permissions-warning
dev/joomla#51 Fix Joomla permissions warning
colemanw [Tue, 4 Jul 2023 03:12:12 +0000 (23:12 -0400)]
CRM - Remove unnecessary CRM_Utils_Array::value and use short array syntax
demeritcowboy [Tue, 4 Jul 2023 01:27:52 +0000 (21:27 -0400)]
Merge pull request #26669 from samuelsov/refAdminUI
#4360 #4384 fixing multiple regressions with path civicrm/contact/search
colemanw [Tue, 4 Jul 2023 00:46:32 +0000 (20:46 -0400)]
Add todo comment
Co-authored-by: demeritcowboy <demeritcowboy@hotmail.com>
Eileen McNaughton [Tue, 4 Jul 2023 00:09:48 +0000 (12:09 +1200)]
Merge pull request #26717 from eileenmcnaughton/event_test_data
Remove now unsed createEvent test function from test baseClass
demeritcowboy [Mon, 3 Jul 2023 23:07:54 +0000 (19:07 -0400)]
Merge pull request #23724 from mattwire/eventtest
Towards consistency for displaying test entities. Stop hiding test entities on some dashboards
Eileen McNaughton [Mon, 3 Jul 2023 19:38:44 +0000 (07:38 +1200)]
Remove now unsed createEvent test function
colemanw [Mon, 3 Jul 2023 21:52:53 +0000 (14:52 -0700)]
Merge pull request #26705 from colemanw/email
Render Email input as type="email"
Eileen McNaughton [Mon, 3 Jul 2023 21:29:47 +0000 (14:29 -0700)]
Merge pull request #26721 from eileenmcnaughton/group_bits
Add frontend_title to various data set up places
Eileen McNaughton [Mon, 3 Jul 2023 21:20:31 +0000 (14:20 -0700)]
Merge pull request #26715 from eileenmcnaughton/contact_trait
Include `entityTrait` in `ContactTestTrait`
Eileen McNaughton [Mon, 3 Jul 2023 21:18:57 +0000 (14:18 -0700)]
Merge pull request #26720 from eileenmcnaughton/unused
Remove some unused test functions
Eileen McNaughton [Mon, 3 Jul 2023 21:12:08 +0000 (14:12 -0700)]
Merge pull request #26646 from colemanw/actionMapping
Drop unused table civicrm_action_mapping
Eileen McNaughton [Mon, 3 Jul 2023 20:52:44 +0000 (13:52 -0700)]
Merge pull request #26718 from eileenmcnaughton/weight_1
Add weight to Group Links
Eileen McNaughton [Mon, 3 Jul 2023 20:49:46 +0000 (08:49 +1200)]
Add frontend_title to various data set up places
Eileen McNaughton [Mon, 3 Jul 2023 20:46:19 +0000 (08:46 +1200)]
Fix test set up to declare frontend_title
Eileen McNaughton [Mon, 3 Jul 2023 20:42:13 +0000 (13:42 -0700)]
Merge pull request #26716 from colemanw/searchContext
SearchKit - Provide context information to subscribers
Eileen McNaughton [Mon, 3 Jul 2023 19:18:54 +0000 (07:18 +1200)]
Include entityTrait in ContactTestTrait
Eileen McNaughton [Mon, 3 Jul 2023 20:31:57 +0000 (08:31 +1200)]
Remove some unused test functions
If I'm wrong jenkins will tell us
Eileen McNaughton [Mon, 3 Jul 2023 19:52:16 +0000 (07:52 +1200)]
Add weight to Group Links
colemanw [Mon, 3 Jul 2023 19:46:30 +0000 (12:46 -0700)]
Merge pull request #26505 from larssandergreen/PHP-warning-on-Contribution
Reduce PHP warnings with paymentBlock
colemanw [Sat, 24 Jun 2023 19:42:40 +0000 (12:42 -0700)]
Drop unused table civicrm_action_mapping
In 2015 this table was made obsolete by the new MappingInterface
and has not been used for anything since then.
colemanw [Mon, 3 Jul 2023 19:31:58 +0000 (12:31 -0700)]
Merge pull request #26709 from eileenmcnaughton/price_fee
Fix ChangeFeeSelectionTest to use eventCreatePaid
Eileen McNaughton [Mon, 3 Jul 2023 19:31:25 +0000 (12:31 -0700)]
Merge pull request #26710 from colemanw/customType
APIv4 - Add more metadata to CustomValue entities; use AutoService
Eileen McNaughton [Mon, 3 Jul 2023 19:30:21 +0000 (12:30 -0700)]
Merge pull request #26714 from colemanw/codeFixes
[REF] Code cleanup; remove unused vars and remove CRM_Utils_Array::value
Eileen McNaughton [Mon, 3 Jul 2023 19:25:03 +0000 (12:25 -0700)]
Merge pull request #26712 from larssandergreen/Install-SK-on-headless-tests
Install SK as part of headless test baseline
colemanw [Mon, 3 Jul 2023 19:22:09 +0000 (15:22 -0400)]
SearchKit - Provide context information to subscribers
colemanw [Mon, 3 Jul 2023 18:34:29 +0000 (14:34 -0400)]
Code cleanup; remove unused vars and remove CRM_Utils_Array::value
larssandergreen [Mon, 3 Jul 2023 18:14:54 +0000 (12:14 -0600)]
Install SK as part of headless test baseline
demeritcowboy [Mon, 3 Jul 2023 17:43:27 +0000 (13:43 -0400)]
Merge pull request #26696 from mlutfy/cleanupTmpTables
clearTempTables: fix condition for user_job check
colemanw [Mon, 3 Jul 2023 17:10:44 +0000 (10:10 -0700)]
Merge pull request #26713 from reflexive-communications/unsubscribe-properties
CRM_Mailing_Form_Optout, CRM_Mailing_Form_Unsubscribe: change properties to protected from private
colemanw [Mon, 3 Jul 2023 15:38:36 +0000 (08:38 -0700)]
Merge pull request #26711 from larssandergreen/Don't-show-SQL-text-in-SK-if-the-user-doesn't-have-permission
Don't show SQL text in SK if user does not have view debug permission
colemanw [Mon, 3 Jul 2023 02:05:56 +0000 (22:05 -0400)]
Render Email input as type="email"
Fixes dev/core#4300