Eileen McNaughton [Sun, 30 Apr 2023 22:33:43 +0000 (10:33 +1200)]
Merge pull request #26128 from demeritcowboy/membership-offline
Offline membership receipt - custom message text is wrong
demeritcowboy [Sun, 30 Apr 2023 16:24:28 +0000 (12:24 -0400)]
regen
demeritcowboy [Sun, 30 Apr 2023 16:06:27 +0000 (12:06 -0400)]
the else went missing
demeritcowboy [Sun, 30 Apr 2023 15:59:46 +0000 (11:59 -0400)]
Merge pull request #25930 from eileenmcnaughton/mem_receipt_offline
Update membership offline receipt to run off WorkflowTemplate & tokens
Eileen McNaughton [Sat, 29 Apr 2023 23:54:17 +0000 (11:54 +1200)]
Merge pull request #26126 from seamuslee001/upgrade_league_csv
[REF] Update league/csv package to 9.7.4 to remove need for patching
Seamus Lee [Sat, 29 Apr 2023 03:54:45 +0000 (13:54 +1000)]
[REF] Update league/csv package to 9.7.4 to remove need for patching
demeritcowboy [Fri, 28 Apr 2023 17:41:04 +0000 (13:41 -0400)]
Merge pull request #26122 from colemanw/geocodeMethod
Remove unused broken $config->geocodeMethod
Coleman Watts [Fri, 28 Apr 2023 14:52:57 +0000 (10:52 -0400)]
Remove unused broken $config->geocodeMethod
This deprecated item in the $config object couldn't possibly work because
the class and function it refers to don't exist!
colemanw [Fri, 28 Apr 2023 16:29:29 +0000 (12:29 -0400)]
Merge pull request #25535 from mattwire/afformreqselect2
Afform: Add required flag to select2
Eileen McNaughton [Fri, 28 Apr 2023 06:00:44 +0000 (18:00 +1200)]
Merge pull request #26118 from colemanw/civiGrantUpgrade
CiviGrant - Fix upgrade to work on multiple domains
Eileen McNaughton [Fri, 28 Apr 2023 03:18:44 +0000 (15:18 +1200)]
Merge pull request #26119 from civicrm/5.61
5.61
Coleman Watts [Fri, 28 Apr 2023 00:46:59 +0000 (20:46 -0400)]
CiviGrant - Fix upgrade to work on multiple domains
Eileen McNaughton [Thu, 27 Apr 2023 22:58:31 +0000 (10:58 +1200)]
Merge pull request #24765 from colemanw/priceSet
PriceSet - Fix metadata for extends column, for SearchKit compatibility
Eileen McNaughton [Thu, 27 Apr 2023 22:53:58 +0000 (10:53 +1200)]
Fix : to be withing ts
Eileen McNaughton [Mon, 27 Mar 2023 06:34:34 +0000 (19:34 +1300)]
Update membership offline receipt away from form dependence
Eileen McNaughton [Thu, 27 Apr 2023 22:46:33 +0000 (10:46 +1200)]
Merge pull request #26117 from agh1/5.61.0-releasenotes-initial
5.61.0 release notes initial run
Andie Hunt [Thu, 27 Apr 2023 20:48:16 +0000 (16:48 -0400)]
5.61.0 release notes: added boilerplate
Andie Hunt [Thu, 27 Apr 2023 20:43:30 +0000 (16:43 -0400)]
5.61.0 release notes: raw from script
demeritcowboy [Thu, 27 Apr 2023 14:06:24 +0000 (10:06 -0400)]
Merge pull request #26115 from civicrm/5.61
5.61
demeritcowboy [Thu, 27 Apr 2023 13:31:12 +0000 (09:31 -0400)]
Merge pull request #26015 from eileenmcnaughton/dedupe_employer
dev/core#4156 Fix employer not carrying over correctly in merge
Coleman Watts [Sat, 8 Apr 2023 19:40:19 +0000 (15:40 -0400)]
Fix APIv3 test to better handle serialized fields
Coleman Watts [Wed, 19 Oct 2022 14:18:51 +0000 (10:18 -0400)]
Ensure value for PriceSet.extends is correctly serialized
Coleman Watts [Tue, 18 Oct 2022 00:57:21 +0000 (20:57 -0400)]
PriceSet - Fix metadata for extends column, for SearchKit compatibility
Yashodha Chaku [Thu, 27 Apr 2023 08:32:39 +0000 (14:02 +0530)]
Merge pull request #26109 from colemanw/ufJoinNotABridge
APIv4 - Remove incorrect EntityBridge from UFMatch entity
Eileen McNaughton [Wed, 26 Apr 2023 22:44:35 +0000 (10:44 +1200)]
Merge pull request #25920 from colemanw/customGroupPerms
APIv4 - Enforce custom group permissions when loading metadata
demeritcowboy [Wed, 26 Apr 2023 22:31:10 +0000 (18:31 -0400)]
Merge pull request #24900 from larssandergreen/Don't-add-newlines-to-HTML-emails-in-activities
Don't add newlines into HTML emails when viewing activities
larssandergreen [Wed, 26 Apr 2023 21:35:59 +0000 (15:35 -0600)]
Fix emails
larssandergreen [Wed, 26 Apr 2023 20:33:15 +0000 (14:33 -0600)]
Dave's tests
larssandergreen [Wed, 26 Apr 2023 20:32:53 +0000 (14:32 -0600)]
Merge remote-tracking branch 'upstream/master' into Don't-add-newlines-to-HTML-emails-in-activities
larssandergreen [Wed, 26 Apr 2023 19:17:12 +0000 (13:17 -0600)]
Don't add newlines to html activities
Yashodha Chaku [Wed, 26 Apr 2023 05:25:00 +0000 (10:55 +0530)]
Merge pull request #26100 from Damilare1/master
Add regions to the Contribute Dashboard Page
Monish Deb [Wed, 26 Apr 2023 05:05:22 +0000 (10:35 +0530)]
Merge pull request #26110 from lcdservices/dev-core-1821
dev/core#1821 fix custom field option list radio clear link
Brian Shaughnessy [Tue, 25 Apr 2023 16:57:37 +0000 (12:57 -0400)]
dev/core#1821 fix custom field option list radio clear link
Coleman Watts [Tue, 25 Apr 2023 15:13:07 +0000 (11:13 -0400)]
APIv4 - Remove incorrect EntityBridge from UFMatch entity
UFJoin cannot work as a bridge because it does not connect two CiviCRM entities with each other.
So the trait wasn't doing anything except getting in the way of SearchKit being able to perform joins.
colemanw [Tue, 25 Apr 2023 13:21:57 +0000 (09:21 -0400)]
Merge pull request #26106 from reflexive-communications/crm-mailing-selector-browse-undef-variable
CRM_Mailing_Selector_Browse: fix typo in local variable name
demeritcowboy [Mon, 24 Apr 2023 23:09:44 +0000 (19:09 -0400)]
Merge pull request #26107 from reflexive-communications/contributors-key-semseysandor-change-org
Contributors: semseysandor - change of organization
Sandor Semsey [Mon, 24 Apr 2023 21:50:19 +0000 (23:50 +0200)]
semseysandor: change of organization
Sandor Semsey [Mon, 24 Apr 2023 20:55:32 +0000 (22:55 +0200)]
fix typo in local variable name
Yashodha Chaku [Mon, 24 Apr 2023 16:42:37 +0000 (22:12 +0530)]
Merge pull request #26096 from pradpnayak/subCUstomgroup
Include subtypes if passed to avoid 61 join limit for Mysql on Custom group
Yashodha Chaku [Mon, 24 Apr 2023 05:52:53 +0000 (11:22 +0530)]
Merge pull request #26097 from colemanw/imageUrlLabel
Add user-friendly label to contact.image_URL field
Seamus Lee [Sun, 23 Apr 2023 22:18:08 +0000 (08:18 +1000)]
Merge pull request #26105 from larssandergreen/add-labels-from-schema-to-selects-on-quickforms
Use label from schema instead of title for selects on QuickForms
larssandergreen [Sun, 23 Apr 2023 19:34:22 +0000 (13:34 -0600)]
use labels from schema for selects
Matthew Wire [Sun, 23 Apr 2023 19:19:45 +0000 (20:19 +0100)]
Merge pull request #26104 from larssandergreen/Participant-labels-cleanup
Remove "and Time" from registration date label on view Participant
larssandergreen [Sun, 23 Apr 2023 18:22:08 +0000 (12:22 -0600)]
remove time from date label for participant view
Seamus Lee [Sun, 23 Apr 2023 00:24:48 +0000 (10:24 +1000)]
Merge pull request #26102 from pradpnayak/codeCleanUp
Code cleanup
Pradeep Nayak [Sat, 22 Apr 2023 18:24:48 +0000 (19:24 +0100)]
Code cleanup
demeritcowboy [Sat, 22 Apr 2023 16:35:39 +0000 (12:35 -0400)]
Merge pull request #25403 from larssandergreen/do-not-send-on-hold-emails-for-contribution-receipts-contact-from-select2
Don't show email receipt option for on hold emails when adding contribution and selecting contact
larssandergreen [Sat, 22 Apr 2023 16:00:10 +0000 (10:00 -0600)]
Change API call to join
demeritcowboy [Sat, 22 Apr 2023 15:08:26 +0000 (11:08 -0400)]
Merge pull request #26101 from pradpnayak/codeCleanUp
Referening not needed
Pradeep Nayak [Sat, 22 Apr 2023 12:31:31 +0000 (13:31 +0100)]
Referening not needed
Damilare Adedoyin [Sat, 22 Apr 2023 09:41:39 +0000 (10:41 +0100)]
Add regions to the Contribute Dashboard Page
colemanw [Sat, 22 Apr 2023 01:08:39 +0000 (21:08 -0400)]
Merge pull request #26055 from colemanw/mappingIndex
Make civicrm_mapping.name required and fix index to be unique
Seamus Lee [Sat, 22 Apr 2023 00:56:51 +0000 (10:56 +1000)]
Merge pull request #26099 from seamuslee001/5.61
dev/core#4249 Ensure that no deprecation logging occurs from groupPer…
larssandergreen [Sat, 22 Apr 2023 00:12:09 +0000 (18:12 -0600)]
do not send emails to on hold or do not email contacts
colemanw [Sat, 22 Apr 2023 00:06:49 +0000 (20:06 -0400)]
Merge pull request #26098 from MegaphoneJon/blank-pc-create
empty pseudoconstant string on create causes an error
Seamus Lee [Thu, 20 Apr 2023 03:26:15 +0000 (13:26 +1000)]
dev/core#4249 Ensure that no deprecation logging occurs from groupPermission having includeGroups as NULL rather than an empty array
Coleman Watts [Wed, 12 Apr 2023 02:14:36 +0000 (22:14 -0400)]
Make civicrm_mapping.name required and fix index to be unique
Seamus Lee [Fri, 21 Apr 2023 21:28:30 +0000 (07:28 +1000)]
Merge pull request #26094 from mattwire/paymentagreementtext
Fix missing change from #25918
Jon Goldberg [Fri, 21 Apr 2023 21:23:29 +0000 (17:23 -0400)]
empty pseudoconstant string on create causes an error
Coleman Watts [Fri, 21 Apr 2023 18:51:06 +0000 (14:51 -0400)]
Add user-friendly label to contact.image_URL field
demeritcowboy [Fri, 21 Apr 2023 18:13:59 +0000 (14:13 -0400)]
Merge pull request #26066 from colemanw/afformSearchOperators
Afform - Allow selecting search operator for filter fields
colemanw [Fri, 21 Apr 2023 13:15:03 +0000 (09:15 -0400)]
Merge pull request #26095 from aydun/custom_metadata
Enhance metadata for CustomField/Group
Pradeep Nayak [Fri, 21 Apr 2023 11:59:31 +0000 (12:59 +0100)]
Include subtypes if passed to avoid 61 join limit for Mysql on Custom groups
Aidan Saunders [Fri, 21 Apr 2023 11:13:23 +0000 (12:13 +0100)]
Enhance metadata for CustomField/Group
Matthew Wire [Fri, 21 Apr 2023 08:39:55 +0000 (09:39 +0100)]
Fix missing change from #25918
Matthew Wire [Thu, 20 Apr 2023 19:51:27 +0000 (20:51 +0100)]
Merge pull request #26057 from mattwire/financialtrxclean
Replace deprecated functions in financialtrxn BAO
colemanw [Thu, 20 Apr 2023 19:22:23 +0000 (15:22 -0400)]
Merge pull request #26092 from demeritcowboy/wrong-original-id
dev/core#4220 - Make activity original_id consistent
demeritcowboy [Thu, 20 Apr 2023 18:44:10 +0000 (14:44 -0400)]
make consistent
demeritcowboy [Thu, 20 Apr 2023 12:54:31 +0000 (08:54 -0400)]
Merge pull request #26087 from civicrm/5.61
5.61
Seamus Lee [Thu, 20 Apr 2023 07:02:41 +0000 (17:02 +1000)]
Merge pull request #26086 from seamuslee001/dev_core_4249
dev/core#4249 Ensure that no deprecation logging occurs from groupPer…
Yashodha Chaku [Thu, 20 Apr 2023 06:30:00 +0000 (12:00 +0530)]
Merge pull request #26085 from seamuslee001/dev_core_4247
dev/core#4247 Ensure that Membership values are populated to prevent …
Seamus Lee [Thu, 20 Apr 2023 03:26:15 +0000 (13:26 +1000)]
dev/core#4249 Ensure that no deprecation logging occurs from groupPermission having includeGroups as NULL rather than an empty array
Seamus Lee [Thu, 20 Apr 2023 03:21:33 +0000 (13:21 +1000)]
dev/core#4247 Ensure that Membership values are populated to prevent fatal error on formatting start date
Seamus Lee [Thu, 20 Apr 2023 03:10:15 +0000 (13:10 +1000)]
Merge pull request #26063 from aydun/dayofweek
API4: add SQL Function DAYOFWEEK
demeritcowboy [Thu, 20 Apr 2023 00:10:00 +0000 (20:10 -0400)]
Merge pull request #26084 from seamuslee001/master
[REF] Fix an additional htxt id issue similar to #26079
Seamus Lee [Wed, 19 Apr 2023 23:31:45 +0000 (09:31 +1000)]
[REF] Fix an additional htxt id issue similar to #26079
Seamus Lee [Wed, 19 Apr 2023 23:30:24 +0000 (09:30 +1000)]
Merge pull request #26079 from samuelsov/htxt
htxt undetected opening tag
Seamus Lee [Wed, 19 Apr 2023 23:11:09 +0000 (09:11 +1000)]
Merge pull request #26083 from civicrm/5.61
5.61
Seamus Lee [Wed, 19 Apr 2023 23:09:55 +0000 (09:09 +1000)]
Merge pull request #26082 from seamuslee001/5.61
Updates pear/pear-core-minimal and guzzlehttp/psr7
Seamus Lee [Wed, 19 Apr 2023 22:45:34 +0000 (08:45 +1000)]
Update Guzzle PSR7 package
Luke Stewart [Wed, 19 Apr 2023 20:55:40 +0000 (08:55 +1200)]
This has been closed in favour of pear/pear-core#124
Updates lock file to pull in latest version of pear/pear-core-minimal.
Seamus Lee [Wed, 19 Apr 2023 22:44:24 +0000 (08:44 +1000)]
Merge pull request #26080 from stesi561/master
Removes failing patch
Luke Stewart [Wed, 19 Apr 2023 21:59:21 +0000 (09:59 +1200)]
Updates lock file to pull in latest version of pear/pear-core-minimal.
Luke Stewart [Wed, 19 Apr 2023 20:55:40 +0000 (08:55 +1200)]
This has been closed in favour of pear/pear-core#124
Samuel Vanhove [Wed, 19 Apr 2023 14:10:41 +0000 (10:10 -0400)]
Htxt undetected opening tag
Matthew Wire [Wed, 19 Apr 2023 13:35:46 +0000 (14:35 +0100)]
Merge pull request #25545 from eileenmcnaughton/smarty_tpl2
Fix e-notice & php8.2 issue on user dashboard
Matthew Wire [Wed, 19 Apr 2023 13:31:27 +0000 (14:31 +0100)]
Merge pull request #26050 from MegaphoneJon/noindex
tell search engines not to index click-through URLs
Matthew Wire [Wed, 19 Apr 2023 13:29:59 +0000 (14:29 +0100)]
Merge pull request #26074 from colemanw/groupBaoCleanup
[REF] Clarify not-so-great code in the Group BAO
Matthew Wire [Wed, 19 Apr 2023 08:59:37 +0000 (09:59 +0100)]
Merge pull request #26076 from colemanw/nullLayout
Afform - Consistently save 'contact_summary' = null
demeritcowboy [Wed, 19 Apr 2023 03:55:45 +0000 (23:55 -0400)]
Merge pull request #26077 from demeritcowboy/valid-contact
[NFC] Add comment about secondary todo when deprecated function is removed
demeritcowboy [Wed, 19 Apr 2023 02:57:31 +0000 (22:57 -0400)]
add comment
demeritcowboy [Wed, 19 Apr 2023 02:52:26 +0000 (22:52 -0400)]
Merge pull request #26075 from colemanw/deprecateValidContact
Deprecate unused 'validContact' function
Seamus Lee [Tue, 18 Apr 2023 21:46:17 +0000 (07:46 +1000)]
Merge pull request #26073 from herbdool/issue-4243
dev/core#4243: support apcu_* functions
Coleman Watts [Tue, 18 Apr 2023 20:19:19 +0000 (16:19 -0400)]
Afform - Consistently save 'contact_summary' = null
Fixes dev/core#4206
demeritcowboy [Tue, 18 Apr 2023 16:13:45 +0000 (12:13 -0400)]
Merge pull request #25961 from mlutfy/upgSuccessCSS
Update success.tpl CSS (pre/post upgrade messages)
Herb v/d Dool [Mon, 17 Apr 2023 21:35:51 +0000 (17:35 -0400)]
dev/core#4243: new APCucache class that supports apcu_* functions
colemanw [Tue, 18 Apr 2023 14:38:23 +0000 (10:38 -0400)]
Merge pull request #25904 from dontub/file-type-option-group
Add option group file_type
Coleman Watts [Tue, 18 Apr 2023 12:01:00 +0000 (08:01 -0400)]
Deprecate unused 'validContact' function
Coleman Watts [Tue, 18 Apr 2023 11:15:59 +0000 (07:15 -0400)]
Clarify not-so-great code in the Group BAO
colemanw [Mon, 17 Apr 2023 21:39:42 +0000 (17:39 -0400)]
Merge pull request #26072 from civicrm/5.61
Merge 5.61 to master
projects / civicrm-core.git / log