colemanw [Wed, 24 May 2023 14:05:29 +0000 (10:05 -0400)]
Merge pull request #26060 from aydun/adminui_sched_job
AdminUI - add Scheduled Jobs page
Aidan Saunders [Thu, 13 Apr 2023 16:09:28 +0000 (17:09 +0100)]
AdminUI: Scheduled Jobs page
colemanw [Wed, 24 May 2023 12:17:42 +0000 (08:17 -0400)]
Merge pull request #26317 from larssandergreen/Clean-up-Scheduled-Jobs-page
Clean up Scheduled Jobs admin page
demeritcowboy [Wed, 24 May 2023 10:41:18 +0000 (06:41 -0400)]
Merge pull request #26315 from stesi561/dev/core/#4305
Refs dev/core#4305 - Update href to ng-href
Eileen McNaughton [Wed, 24 May 2023 03:48:06 +0000 (15:48 +1200)]
Merge pull request #26322 from civicrm/5.62
5.62
Eileen McNaughton [Wed, 24 May 2023 03:47:42 +0000 (15:47 +1200)]
Merge pull request #26320 from agileware/CIVICRM-2137
dev/core#4310 Fix layout regression in MembershipBlock for Contribution pages
Francis Whittle [Wed, 24 May 2023 01:07:12 +0000 (11:07 +1000)]
CIVICRM-2137 Add closing div and force renewal javascript back to makeContribution context for Membership block on Contributions
Seamus Lee [Wed, 24 May 2023 02:42:15 +0000 (12:42 +1000)]
Merge pull request #26321 from seamuslee001/5.62
[REF] Bump socket.io-parser to 4.2.3
Eileen McNaughton [Wed, 24 May 2023 02:10:52 +0000 (14:10 +1200)]
Merge pull request #26319 from larssandergreen/Addt-Fix-PHP8-warnings-on-Participant.tpl
Addt Fix PHP8 warnings on Participant.tpl
Seamus Lee [Wed, 24 May 2023 01:55:47 +0000 (11:55 +1000)]
[REF] Bump socket.io-parser to 4.2.3
larssandergreen [Wed, 24 May 2023 01:15:33 +0000 (19:15 -0600)]
Fix PHP8 warnings on participant.tpl
Tim Otten [Wed, 24 May 2023 00:47:28 +0000 (17:47 -0700)]
Merge pull request #26276 from totten/master-dispatch-sig
(NFC) CiviEventDispatcher - Update type declaration. Add test demonstion
larssandergreen [Tue, 23 May 2023 23:59:04 +0000 (17:59 -0600)]
Clean up scheduled jobs
Luke Stewart [Tue, 23 May 2023 22:26:42 +0000 (10:26 +1200)]
refs: dev/core#4305 update href to ng-href
Luke Stewart [Tue, 23 May 2023 22:22:22 +0000 (10:22 +1200)]
Refs: dev/core#4305 Bulk update of href to ng-href where href value contains '{{'
This was performed using the following:
grep -n -R -o -E -e '<a[^>]*\shref="[^"]*\{\{[^"]*"' -e "<a[^>]*\shref='[^']*\{\{[^']*'" . | awk -F : '{print "sed -i #"$2"s/href/ng-href/g# "$1}' | tr '#' "'" > updates.sh
Then running the generated script.
This commit excludes a file in tests which I'll add as a separate
commit.
Eileen McNaughton [Tue, 23 May 2023 22:43:47 +0000 (10:43 +1200)]
Merge pull request #26313 from aydun/group_count
Api4: add calculated field `contact_count` to Group
Eileen McNaughton [Tue, 23 May 2023 22:43:31 +0000 (10:43 +1200)]
Merge pull request #26314 from civicrm/5.62
5.62 to master
colemanw [Tue, 23 May 2023 22:15:21 +0000 (18:15 -0400)]
APIv4 - Add basic test for Group.contact_count field
Eileen McNaughton [Tue, 23 May 2023 22:12:01 +0000 (10:12 +1200)]
Merge pull request #26308 from eileenmcnaughton/public
Fix show_public regression
Aidan Saunders [Tue, 23 May 2023 21:13:11 +0000 (22:13 +0100)]
Api4: add calculated field `contact_count` to Group
This provides the current count of 'added' group members and smart group
members.
Note this does not rebuild the group cache so smart group counts may be
out of date or zero.
See https://stackoverflow.com/questions/
47918929/coalesce-for-zero-instead-of-null/
47919047#
47919047
for the COALESCE(NULLIF()) construct.
Eileen McNaughton [Tue, 23 May 2023 20:57:18 +0000 (08:57 +1200)]
Merge pull request #26306 from colemanw/searchKitCleanup
REF - Cleanup unused variable and comment in SearchKit
Eileen McNaughton [Tue, 23 May 2023 20:44:43 +0000 (08:44 +1200)]
Merge pull request #26310 from yashodha/nfc-1
[NFC] typo fixes
Eileen McNaughton [Tue, 23 May 2023 20:02:21 +0000 (08:02 +1200)]
Merge pull request #26298 from totten/5.62-htxt-dynamic
(dev/core#4303) Allow {htxt} guard to accommodate variable ID
Eileen McNaughton [Tue, 23 May 2023 20:00:51 +0000 (08:00 +1200)]
Merge pull request #26247 from mattwire/receiptinvoicetpl
Fix invoice being sent instead of receipt if contribution 'is_pay_later' is true
colemanw [Tue, 23 May 2023 18:49:47 +0000 (14:49 -0400)]
Merge pull request #26071 from aydun/ang_copy
FormBuilder: add 'Copy' button
Matthew Wire [Wed, 17 May 2023 14:16:28 +0000 (15:16 +0100)]
Fix invoice being sent instead of receipt if contribution 'is_pay_later' is true
yashodha [Tue, 23 May 2023 13:55:24 +0000 (19:25 +0530)]
[NFC] typo fixes
Eileen McNaughton [Tue, 23 May 2023 07:59:27 +0000 (19:59 +1200)]
Fix show_public regression
This shows up as an e-notice but
would probably result in the is_public filter being broken.
The variable is no longer set since https://github.com/civicrm/civicrm-core/commit/
16c5faa5db26149e5f1b7d3f45e3d5f2c24bf422#diff-d20bbdac5d9d1d3ec28be6f1972f8cb747ead74dea90c9076daa2de2a627873cL110
Eileen McNaughton [Tue, 23 May 2023 07:38:06 +0000 (19:38 +1200)]
Merge pull request #26307 from colemanw/deprecationWarning
dev/core#4302 Add deprecation warning to functions in renamed classes
Tim Otten [Tue, 23 May 2023 06:28:32 +0000 (23:28 -0700)]
Define {htxt} filter to allow some extra parameters.
Also: tighten the handling of ' and " to ensure that they are matched properly.
colemanw [Sun, 21 May 2023 01:33:50 +0000 (21:33 -0400)]
Add deprecation warning to functions in renamed classes
Targeting these particular functions because a universe search shows they are used outside of core.
colemanw [Tue, 23 May 2023 02:08:46 +0000 (22:08 -0400)]
REF - Cleanup unused variable and comment in SearchKit
colemanw [Tue, 23 May 2023 01:25:15 +0000 (21:25 -0400)]
Merge pull request #26304 from lemniscus/api4-sql-function-ifnull
Make sql function IFNULL available in APIv4 and SearchKit
colemanw [Tue, 23 May 2023 01:22:12 +0000 (21:22 -0400)]
Merge pull request #26300 from JMAConsulting/dev_core_2486
dev/core#2486: Add BounceType and BouncePattern APIv4 entities
Noah Miller [Mon, 22 May 2023 23:57:01 +0000 (16:57 -0700)]
api4: add sql function IFNULL
Seamus Lee [Mon, 22 May 2023 21:44:44 +0000 (07:44 +1000)]
Merge pull request #26283 from eileenmcnaughton/is_primary
Clarify isPrimary, isPaidEvent variables
Eileen McNaughton [Thu, 18 May 2023 06:36:03 +0000 (18:36 +1200)]
Clarify isPrimary, isPaidEvent
Matthew Wire [Mon, 22 May 2023 18:50:37 +0000 (19:50 +0100)]
Merge pull request #26228 from eileenmcnaughton/add_pay
Only call transitionComponents when transitioning pending/pay later to completed
Yashodha Chaku [Mon, 22 May 2023 14:10:52 +0000 (19:40 +0530)]
Merge pull request #26299 from eileenmcnaughton/isset
Replace isset with token for pay_later_receipt
Monish Deb [Mon, 22 May 2023 12:37:53 +0000 (18:07 +0530)]
Add BounceType and BouncePattern APIv4 entities
Eileen McNaughton [Mon, 22 May 2023 11:55:24 +0000 (23:55 +1200)]
Replace isset with token for pay_later_receipt
As tested in https://github.com/civicrm/civicrm-core/pull/26294/files#diff-a5d237ba4e392d0e8ad764a535315f0b1101cc5ca61c39b4e572de42f5c6b4bcR676
this token works & removes one of the breaky issets
Tim Otten [Mon, 22 May 2023 04:48:57 +0000 (21:48 -0700)]
(dev/core#4303) Allow {htxt} guard to accommodate variable ID
Before
------
`{htxt}` guard works with static IDs (`{htxt id="abc"}`)
After
-----
`{htxt}` guard with with variable ID (`{htxt id=$abc}`)
Comments
--------
As discussed in dev/core#4303, one relevant use-case comes from `CustomField.hlp`.
In my copy of universe, there's a similar construction in
`nz.co.fuzion.entitysetting` (`entitysettingscommon.hlp`).
Tim Otten [Mon, 22 May 2023 05:26:10 +0000 (22:26 -0700)]
(dev/core#4303) Add test for {htxt}
Seamus Lee [Mon, 22 May 2023 02:25:31 +0000 (12:25 +1000)]
Merge pull request #26295 from civicrm/5.62
5.62
demeritcowboy [Mon, 22 May 2023 01:33:17 +0000 (21:33 -0400)]
Merge pull request #26149 from stesi561/activityupgradewarning
dev/core/#1532 - Adds warning similar to 5.57 if Activity Revisions are present.
Luke Stewart [Mon, 22 May 2023 00:54:21 +0000 (12:54 +1200)]
Add empty upgrade step to force preUpgrade to run
Eileen McNaughton [Sun, 21 May 2023 22:29:17 +0000 (10:29 +1200)]
Merge pull request #26289 from braders/php82-cache-test
[REF][PHP8.2] Only clear cache values if property exists
Eileen McNaughton [Sun, 21 May 2023 22:27:06 +0000 (10:27 +1200)]
Merge pull request #26293 from braders/report-campaign-property
[REF][PHP8.2] Declare campaigns property
Bradley Taylor [Sun, 21 May 2023 19:34:46 +0000 (20:34 +0100)]
[REF][PHP8.2] Declare campaigns property
demeritcowboy [Sun, 21 May 2023 15:52:29 +0000 (11:52 -0400)]
Merge pull request #26287 from braders/basetest-entity-param
[REF][PHP8.2] Remove unused entity dynamic property
demeritcowboy [Sun, 21 May 2023 15:49:00 +0000 (11:49 -0400)]
Merge pull request #26288 from braders/unused-property-membershipStatusTest
[REF][PHP8.2] Remove seemingly unused write to dynamic property
Bradley Taylor [Sun, 21 May 2023 10:59:45 +0000 (11:59 +0100)]
[REF][PHP8.2] Only clear cache values if property exists
Bradley Taylor [Sun, 21 May 2023 10:46:58 +0000 (11:46 +0100)]
[REF][PHP8.2] Remove seemingly unused write to dynamic property
Bradley Taylor [Sun, 21 May 2023 10:22:44 +0000 (11:22 +0100)]
[REF][PHP8.2] Remove unused entity dynamic property
colemanw [Sun, 21 May 2023 00:55:48 +0000 (20:55 -0400)]
Merge pull request #26286 from demeritcowboy/nghref
dev/core#4305 - Fix pluses being turned into spaces in hook_alterAngular
demeritcowboy [Sun, 21 May 2023 00:15:39 +0000 (20:15 -0400)]
Merge pull request #26285 from demeritcowboy/windows-test
[NFC] Belatedly add test for #26164
demeritcowboy [Sun, 21 May 2023 00:05:23 +0000 (20:05 -0400)]
fix pluses being turned into spaces in hook_alterAngular
Seamus Lee [Sat, 20 May 2023 23:50:03 +0000 (09:50 +1000)]
Merge pull request #26284 from demeritcowboy/dao
GenCode on Contribution DAO
demeritcowboy [Sat, 20 May 2023 23:47:35 +0000 (19:47 -0400)]
test for #26164
demeritcowboy [Sat, 20 May 2023 23:41:52 +0000 (19:41 -0400)]
Merge pull request #26185 from rubofvil/patch-1
Drupal 7, refuse the possibility to execute the REST API with blocked users
demeritcowboy [Sat, 20 May 2023 23:41:08 +0000 (19:41 -0400)]
Merge pull request #26280 from eileenmcnaughton/weight_pledge
Add weight to pledges links
demeritcowboy [Sat, 20 May 2023 13:03:56 +0000 (09:03 -0400)]
regen dao
colemanw [Sat, 20 May 2023 12:19:52 +0000 (08:19 -0400)]
Merge pull request #26281 from eileenmcnaughton/better_props
Standardise casing on ids in WorkflowMessages
Tim Otten [Sat, 20 May 2023 04:03:20 +0000 (21:03 -0700)]
(NFC) CiviEventDispatcher - Another try
Eileen McNaughton [Sat, 20 May 2023 01:10:28 +0000 (13:10 +1200)]
Standardise casing on ids in WorkflowMessages
This resolves the inconsistencies in id fields in the workFlowMessages
My general feeling is this hasn't really been adopted outside of core as
yet as it has been so immature so I'm fixing the core uses - these are
all heavily tested
Tim Otten [Sat, 20 May 2023 01:19:51 +0000 (18:19 -0700)]
Merge pull request #26270 from totten/master-more-data
(REF) civicrm_data - Move more baseline data to PHP files
Seamus Lee [Sat, 20 May 2023 01:04:17 +0000 (11:04 +1000)]
Merge pull request #26215 from eileenmcnaughton/event_mail_tested
Use balanceAmount token to remove isset in offline_event_receipt
Eileen McNaughton [Sat, 20 May 2023 00:57:49 +0000 (12:57 +1200)]
Add weight to pledges links
colemanw [Sat, 20 May 2023 00:55:26 +0000 (20:55 -0400)]
Merge pull request #24937 from aydun/adminui_contribution_pages
AdminUI: add Manage Contribution Pages
Eileen McNaughton [Sat, 20 May 2023 00:38:59 +0000 (12:38 +1200)]
Merge pull request #26278 from civicrm/5.62
5.62 to master
Eileen McNaughton [Sat, 20 May 2023 00:38:26 +0000 (12:38 +1200)]
Merge pull request #26261 from samuelsov/adminui2
Alternate Manage groups in Admin UI extension
Eileen McNaughton [Sat, 20 May 2023 00:06:31 +0000 (12:06 +1200)]
Merge pull request #26271 from colemanw/revertFileDeletions
dev/core#4302 Revert "Remove old deprecated class aliases"
Tim Otten [Fri, 19 May 2023 23:03:04 +0000 (16:03 -0700)]
(NFC) CiviEventDispatcher - Update type declaration. Add test demonstration.
Tim Otten [Fri, 19 May 2023 22:28:23 +0000 (15:28 -0700)]
Merge pull request #26275 from colemanw/fixSchemaHandler
SchemaHandler - Cleanup string handling and fix syntax error
Aidan Saunders [Thu, 13 Apr 2023 15:58:21 +0000 (16:58 +0100)]
Fix Job edit path
Aidan Saunders [Tue, 8 Nov 2022 22:40:58 +0000 (22:40 +0000)]
AdminUI: add Manage Contribution Pages
colemanw [Fri, 19 May 2023 18:19:40 +0000 (14:19 -0400)]
SchemaHandler - Cleanup string handling and fix syntax error
Samuel Vanhove [Thu, 18 May 2023 15:17:31 +0000 (11:17 -0400)]
Alternate Manage groups in Admin UI extension
colemanw [Fri, 19 May 2023 17:50:16 +0000 (13:50 -0400)]
Merge pull request #26198 from larssandergreen/allow-deletion-of-primary-emails
dev/core#4284 Allow deletion of primary email inline on contact
colemanw [Fri, 19 May 2023 17:17:04 +0000 (13:17 -0400)]
Merge pull request #26273 from larssandergreen/Resize-mailing-preview
Resize mailing preview modal
colemanw [Fri, 19 May 2023 17:08:46 +0000 (13:08 -0400)]
Merge pull request #26268 from eileenmcnaughton/562_member
dev/core#4282 Fix isShowMembershipBlock Regression
colemanw [Fri, 19 May 2023 17:07:10 +0000 (13:07 -0400)]
Merge pull request #26267 from eileenmcnaughton/562
Enotice fix on frontend_title
larssandergreen [Fri, 19 May 2023 14:36:22 +0000 (08:36 -0600)]
Resize mailing preview modal
colemanw [Fri, 19 May 2023 13:25:25 +0000 (09:25 -0400)]
dev/core#4302 Revert "Remove old deprecated class aliases"
This reverts the file deletions from
f687b5a4eed2b67411a873c3346487bd5599497
as the files were still in use by some extensions.
Aidan Saunders [Sat, 15 Apr 2023 12:31:09 +0000 (13:31 +0100)]
FormBuilder, add a 'Copy' button
colemanw [Fri, 19 May 2023 12:35:21 +0000 (08:35 -0400)]
Merge pull request #26269 from eileenmcnaughton/event_form
More tests fixed to use fullFormFlow
colemanw [Fri, 19 May 2023 12:33:02 +0000 (08:33 -0400)]
Merge pull request #26264 from eileenmcnaughton/unshared
Remove unused variables from previously-shared function
Tim Otten [Fri, 19 May 2023 10:39:07 +0000 (03:39 -0700)]
(REF) civicrm_data - More homogenous notation
Tim Otten [Fri, 19 May 2023 10:20:10 +0000 (03:20 -0700)]
(REF) civicrm_data - Put financial stuff close together.
Tim Otten [Fri, 19 May 2023 10:16:03 +0000 (03:16 -0700)]
(REF) civicrm_data - Extract civicrm_dedupe_rule_group and civicrm_dedupe_rule
Tim Otten [Fri, 19 May 2023 09:29:16 +0000 (02:29 -0700)]
(REF) civicrm_data - Extract civicrm_mailing_bounce_type and civicrm_mailing_bounce_pattern
Tim Otten [Fri, 19 May 2023 07:53:59 +0000 (00:53 -0700)]
(REF) civicrm_data - Extract civicrm_financial_account
Tim Otten [Fri, 19 May 2023 07:11:22 +0000 (00:11 -0700)]
(REF) civicrm_data - Extract civicrm_extension, civicrm_job
Tim Otten [Fri, 19 May 2023 06:41:30 +0000 (23:41 -0700)]
(REF) civicrm_data - Extract civicrm_action_mapping, civicrm_contact_type, etal
Also: civicrm_county, civicrm_participant_status_type, civicrm_uf_field,
civicrm_uf_group, civicrm_uf_join
Tim Otten [Fri, 19 May 2023 04:58:51 +0000 (21:58 -0700)]
(REF) civicrm_data - Extract civicrm_financial_type, civicrm_location_type, etal
And also: civicrm_mailing_component, civicrm_membership_status,
civicrm_payment_processor_type, civicrm_preferences_date,
civicrm_relationship_type, civicrm_tag
Tim Otten [Fri, 19 May 2023 00:50:34 +0000 (17:50 -0700)]
(REF) civicrm_data - Move some selects closer to where they're used
Tim Otten [Fri, 19 May 2023 00:45:32 +0000 (17:45 -0700)]
(REF) civicrm_data - Remove unused variables. Move the 1 that is used.
Tim Otten [Fri, 19 May 2023 07:10:09 +0000 (00:10 -0700)]
SqlData - Allow INSERT IGNORE
Tim Otten [Fri, 19 May 2023 06:57:39 +0000 (23:57 -0700)]
CRM_Utils_SQL_Insert - Allow "IGNORE" flag
Tim Otten [Fri, 19 May 2023 00:44:51 +0000 (17:44 -0700)]
(REF) CodeGen - Split "OptionGroup" and "SqlData"