civicrm-core.git
17 months agoremove unneeded file not deleted in git rebase
Andrew Engelbrecht [Wed, 19 Jul 2017 21:28:47 +0000 (17:28 -0400)]
remove unneeded file not deleted in git rebase

17 months agoremove unneeded file (latex.patch)
Andrew Engelbrecht [Wed, 19 Jul 2017 20:31:29 +0000 (16:31 -0400)]
remove unneeded file (latex.patch)

this was apparently not removed in the git rebase.

17 months agoComment cleanup
Ruben Rodriguez [Thu, 1 Dec 2016 21:59:27 +0000 (16:59 -0500)]
Comment cleanup

17 months agoUpdated the LaTeX header for letters
Ruben Rodriguez [Thu, 1 Dec 2016 21:28:53 +0000 (16:28 -0500)]
Updated the LaTeX header for letters

17 months agoAdded hack for scaping curly brackets on smarty LaTeX templates
Ruben Rodriguez [Fri, 10 Jun 2016 19:06:07 +0000 (15:06 -0400)]
Added hack for scaping curly brackets on smarty LaTeX templates

17 months agoTuned up PdfLatex font settings
Ruben Rodriguez [Fri, 10 Jun 2016 19:05:21 +0000 (15:05 -0400)]
Tuned up PdfLatex font settings

17 months agoredisabling mail tracking
k [Tue, 15 Mar 2016 17:41:14 +0000 (13:41 -0400)]
redisabling mail tracking

17 months agoSolving RT ticket #1092988
k [Tue, 15 Mar 2016 17:13:26 +0000 (13:13 -0400)]
Solving RT ticket #1092988
adding civicrm ID to contributin record

17 months agoipn receiver for external api
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:33:03 +0000 (13:33 -0400)]
ipn receiver for external api

17 months agoPriceset 2nd half
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:28:53 +0000 (13:28 -0400)]
Priceset 2nd half

17 months agoPriceset/debugwatchdog
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:28:43 +0000 (13:28 -0400)]
Priceset/debugwatchdog

17 months agoRemoved cache rebuild from the GroupContact
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:18:43 +0000 (13:18 -0400)]
Removed cache rebuild from the GroupContact

17 months agoRT#765026, patch for null values in civicrm_acl_cache
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:15:03 +0000 (13:15 -0400)]
RT#765026, patch for null values in civicrm_acl_cache

17 months agoAdded the current uncommited changes to production code, and rebased to 4.6.8
Ruben Rodriguez [Thu, 10 Sep 2015 22:24:23 +0000 (18:24 -0400)]
Added the current uncommited changes to production code, and rebased to 4.6.8

17 months agoAdditional files for PDF/Latex
Lisa Marie Maginnis [Thu, 1 May 2014 21:29:27 +0000 (17:29 -0400)]
Additional files for PDF/Latex

17 months agoOur changes
Lisa Marie Maginnis [Thu, 1 May 2014 21:04:18 +0000 (17:04 -0400)]
Our changes

18 months agoMerge pull request #26327 from totten/5.61-bump4
Tim Otten [Wed, 24 May 2023 06:53:00 +0000 (23:53 -0700)]
Merge pull request #26327 from totten/5.61-bump4

5.61.4 - Add notes. Bump version.

18 months agoAdd release-notes/5.61.4.md
Tim Otten [Wed, 24 May 2023 06:38:56 +0000 (23:38 -0700)]
Add release-notes/5.61.4.md

18 months agoSet version to 5.61.4
Tim Otten [Wed, 24 May 2023 06:38:53 +0000 (23:38 -0700)]
Set version to 5.61.4

18 months agoMerge pull request #26325 from agileware/CIVICRM-2137-5.61
Eileen McNaughton [Wed, 24 May 2023 04:45:16 +0000 (16:45 +1200)]
Merge pull request #26325 from agileware/CIVICRM-2137-5.61

dev/core#4310 (5.61) Fix layout regression in MembershipBlock for Contribution pages

18 months agoCIVICRM-2137 Add closing div and force renewal javascript back to makeContribution...
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

18 months agoMerge pull request #26312 from totten/5.61-htxt
Eileen McNaughton [Tue, 23 May 2023 22:42:56 +0000 (10:42 +1200)]
Merge pull request #26312 from totten/5.61-htxt

Port {htxt} fixes to 5.61

18 months ago[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

18 months agoHtxt undetected opening tag
Samuel Vanhove [Wed, 19 Apr 2023 14:10:41 +0000 (10:10 -0400)]
Htxt undetected opening tag

18 months agoDefine {htxt} filter to allow some extra parameters.
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.

18 months ago(dev/core#4303) Allow {htxt} guard to accommodate variable ID
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`).

18 months ago(dev/core#4303) Add test for {htxt}
Tim Otten [Mon, 22 May 2023 05:26:10 +0000 (22:26 -0700)]
(dev/core#4303) Add test for {htxt}

18 months agoMerge pull request #26279 from totten/5.61-bump3
Tim Otten [Sat, 20 May 2023 00:58:10 +0000 (17:58 -0700)]
Merge pull request #26279 from totten/5.61-bump3

5.61.3 - Add notes. Bump version.

18 months agoAdd release-notes/5.61.3.md
Tim Otten [Sat, 20 May 2023 00:44:11 +0000 (17:44 -0700)]
Add release-notes/5.61.3.md

18 months agoSet version to 5.61.3
Tim Otten [Sat, 20 May 2023 00:44:09 +0000 (17:44 -0700)]
Set version to 5.61.3

18 months agoMerge pull request #26277 from eileenmcnaughton/5.61
Tim Otten [Sat, 20 May 2023 00:38:06 +0000 (17:38 -0700)]
Merge pull request #26277 from eileenmcnaughton/5.61

dev/core#4282 Fix isShowMembershipBlock & notice fix

18 months agoEnotice fix on frontend_title
Eileen McNaughton [Fri, 19 May 2023 02:28:23 +0000 (14:28 +1200)]
Enotice fix on frontend_title

18 months agodev/core#4282 Fix isShowMembershipBlock
Eileen McNaughton [Fri, 19 May 2023 02:47:39 +0000 (14:47 +1200)]
dev/core#4282 Fix isShowMembershipBlock

As determined by Konadave & myself this
isShowMembershipBlock was always true when memberships were in
play in 5.60 - despite various code comments. I have renamed
& assigned it regardless of QuickConfig. Since it is
a condition of including the tpl & within it it already checks
the context I made the context check the top level check & removed the
isShowMembershipBlock check

18 months agoMerge pull request #26176 from totten/5.61-bump2
Tim Otten [Mon, 8 May 2023 23:13:58 +0000 (16:13 -0700)]
Merge pull request #26176 from totten/5.61-bump2

5.61.2 - Add notes. Bump version.

18 months agoAdd release-notes/5.61.2.md
Tim Otten [Mon, 8 May 2023 23:10:10 +0000 (16:10 -0700)]
Add release-notes/5.61.2.md

18 months agoSet version to 5.61.2
Tim Otten [Mon, 8 May 2023 23:10:08 +0000 (16:10 -0700)]
Set version to 5.61.2

18 months agoMerge pull request #26175 from totten/5.61-memberships
Eileen McNaughton [Mon, 8 May 2023 21:25:19 +0000 (09:25 +1200)]
Merge pull request #26175 from totten/5.61-memberships

CiviMember - Fix regression whereby membership does not submit

18 months agoCiviDiscount fix - pass correct component
Eileen McNaughton [Mon, 8 May 2023 08:03:50 +0000 (20:03 +1200)]
CiviDiscount fix - pass correct component

18 months agoRe-instate the renewal message
Eileen McNaughton [Mon, 8 May 2023 04:27:08 +0000 (16:27 +1200)]
Re-instate the renewal message

18 months agoFix regression whereby membership does not submit
Eileen McNaughton [Mon, 8 May 2023 03:45:13 +0000 (15:45 +1200)]
Fix regression whereby membership does not submit

18 months agoMerge pull request #26161 from totten/5.61-rn1
Tim Otten [Fri, 5 May 2023 21:16:46 +0000 (14:16 -0700)]
Merge pull request #26161 from totten/5.61-rn1

Add release-notes/5.61.1.md

18 months agoMerge pull request #26160 from totten/5.61-upgrade-d9-msg
demeritcowboy [Fri, 5 May 2023 21:14:33 +0000 (17:14 -0400)]
Merge pull request #26160 from totten/5.61-upgrade-d9-msg

Upgrade message for drupal9 sites to advise to clear drupal cache

18 months agoAdd release-notes/5.61.1.md
Tim Otten [Fri, 5 May 2023 20:49:51 +0000 (13:49 -0700)]
Add release-notes/5.61.1.md

18 months agoSet version to 5.61.1
Tim Otten [Fri, 5 May 2023 20:34:25 +0000 (13:34 -0700)]
Set version to 5.61.1

18 months agoupgrade message
demeritcowboy [Fri, 5 May 2023 20:15:48 +0000 (16:15 -0400)]
upgrade message

18 months agoSet version to 5.61.0
Tim Otten [Thu, 4 May 2023 03:37:01 +0000 (20:37 -0700)]
Set version to 5.61.0

18 months agoMerge pull request #26155 from seamuslee001/5.61
Seamus Lee [Thu, 4 May 2023 01:36:56 +0000 (11:36 +1000)]
Merge pull request #26155 from seamuslee001/5.61

Bump engine.io and socket.io versions

18 months agoMerge pull request #26153 from totten/5.61-rn0
Tim Otten [Thu, 4 May 2023 01:27:23 +0000 (18:27 -0700)]
Merge pull request #26153 from totten/5.61-rn0

release-notes/5.61.0.md - Last minute additions

18 months agoMerge pull request #26108 from eileenmcnaughton/import_template
Seamus Lee [Thu, 4 May 2023 01:26:46 +0000 (11:26 +1000)]
Merge pull request #26108 from eileenmcnaughton/import_template

Importer - Ensure mapping ID is set in all places using import templates

18 months agoBump engine.io and socket.io versions
Seamus Lee [Thu, 4 May 2023 01:20:09 +0000 (11:20 +1000)]
Bump engine.io and socket.io versions

18 months agorelease-notes/5.61.0.md - Last minute additions
Tim Otten [Thu, 4 May 2023 00:42:57 +0000 (17:42 -0700)]
release-notes/5.61.0.md - Last minute additions

18 months agoMerge pull request #26140 from eileenmcnaughton/561
Seamus Lee [Wed, 3 May 2023 23:27:21 +0000 (09:27 +1000)]
Merge pull request #26140 from eileenmcnaughton/561

dev/core#4225 Add test & fix for new regression - contact update fails when relationship exists & CiviMember disabled

18 months agoMerge pull request #26146 from MegaphoneJon/import-fill-fix
Eileen McNaughton [Wed, 3 May 2023 22:20:17 +0000 (10:20 +1200)]
Merge pull request #26146 from MegaphoneJon/import-fill-fix

fixes core#4269 - Import "fill" doesn't fill phone/email

18 months agoMerge pull request #26141 from eileenmcnaughton/561_member
demeritcowboy [Wed, 3 May 2023 18:55:42 +0000 (14:55 -0400)]
Merge pull request #26141 from eileenmcnaughton/561_member

dev/core#4272 Fix unreleased regression on Membership form validation

18 months agoFixes core#4269 - import 'fill' doesn't work on phone/email
Jon Goldberg [Wed, 3 May 2023 18:09:53 +0000 (14:09 -0400)]
Fixes core#4269 - import 'fill' doesn't work on phone/email

18 months agodev/core#4272 Fix unreleased regression on Membership form validation
Eileen McNaughton [Wed, 3 May 2023 01:17:28 +0000 (13:17 +1200)]
dev/core#4272 Fix unreleased regression on Membership form validation

18 months agoAdd Civi-Member is enabled check
Eileen McNaughton [Wed, 3 May 2023 00:39:14 +0000 (12:39 +1200)]
Add Civi-Member is enabled check

18 months agodev/core#4225 Add test for new regression
Eileen McNaughton [Wed, 3 May 2023 00:31:33 +0000 (12:31 +1200)]
dev/core#4225 Add test for new regression

18 months agoMerge pull request #26127 from alifrumin/rn5.61
Eileen McNaughton [Sat, 29 Apr 2023 23:53:47 +0000 (11:53 +1200)]
Merge pull request #26127 from alifrumin/rn5.61

[NFC] 5.61 release notes

18 months ago[NFC] 5.61 release notes
Alice Frumin [Fri, 28 Apr 2023 03:21:40 +0000 (23:21 -0400)]
[NFC] 5.61 release notes

19 months agoMerge pull request #26117 from agh1/5.61.0-releasenotes-initial
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

19 months ago5.61.0 release notes: added boilerplate
Andie Hunt [Thu, 27 Apr 2023 20:48:16 +0000 (16:48 -0400)]
5.61.0 release notes: added boilerplate

19 months ago5.61.0 release notes: raw from script
Andie Hunt [Thu, 27 Apr 2023 20:43:30 +0000 (16:43 -0400)]
5.61.0 release notes: raw from script

19 months agoMerge pull request #26015 from eileenmcnaughton/dedupe_employer
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

19 months agoEnsure mapping id is set in all places using import templates
Eileen McNaughton [Tue, 25 Apr 2023 00:05:29 +0000 (12:05 +1200)]
Ensure mapping id is set in all places using import templates

This fixes the missing update saved mapping option when using a template

I think I changed the way the metadata was a few times & so it is
a bit confusing - but this ensures it is set in the
place MapField is expecting it to be

19 months agoMerge pull request #26099 from seamuslee001/5.61
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…

19 months agodev/core#4249 Ensure that no deprecation logging occurs from groupPermission having...
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

19 months agoMerge pull request #26085 from seamuslee001/dev_core_4247
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 â€¦

19 months agodev/core#4247 Ensure that Membership values are populated to prevent fatal error...
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

19 months agoMerge pull request #26082 from seamuslee001/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

19 months agoUpdate Guzzle PSR7 package
Seamus Lee [Wed, 19 Apr 2023 22:45:34 +0000 (08:45 +1000)]
Update Guzzle PSR7 package

19 months agoThis has been closed in favour of pear/pear-core#124
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.

19 months agoMerge pull request #26067 from colemanw/fixEntityRefSave
colemanw [Mon, 17 Apr 2023 21:07:33 +0000 (17:07 -0400)]
Merge pull request #26067 from colemanw/fixEntityRefSave

Fix dev/core#4240 - Saving entityReference field value via API

19 months agoCustomValue - Fix saving entityReference field as NULL and add test
Coleman Watts [Mon, 17 Apr 2023 19:32:02 +0000 (15:32 -0400)]
CustomValue - Fix saving entityReference field as NULL and add test

19 months agoFix dev/core#4240 - Saving entityReference field value via API
Coleman Watts [Sat, 15 Apr 2023 19:57:43 +0000 (15:57 -0400)]
Fix dev/core#4240 - Saving entityReference field value via API

19 months agoCleanup relationships
Eileen McNaughton [Thu, 13 Apr 2023 19:02:26 +0000 (07:02 +1200)]
Cleanup relationships

19 months agoRemove obsolete code
Eileen McNaughton [Thu, 13 Apr 2023 00:17:27 +0000 (12:17 +1200)]
Remove obsolete code

This was actually obsolete before the apiv4 switch I think - but it DEFINITELY is now

19 months agoMore better fix on population on cached organization name
Eileen McNaughton [Thu, 13 Apr 2023 00:16:51 +0000 (12:16 +1200)]
More better fix on population on cached organization name

19 months agoFix for handling of FALSE now we are getting apiv4 results
Eileen McNaughton [Fri, 7 Apr 2023 01:15:05 +0000 (13:15 +1200)]
Fix for handling of FALSE now we are getting apiv4 results

As exposed in api_v3_JobTest.testBatchMergeWorks

19 months agoAdjust to APiv4 returning label as a field
Eileen McNaughton [Thu, 6 Apr 2023 23:39:38 +0000 (11:39 +1200)]
Adjust to APiv4 returning label as a field

As tested by CRM_Dedupe_MergerTest::testGetRowsElementsAndInfoSpecialInfo

19 months agoDo not consider greeting display names in merges
Eileen McNaughton [Thu, 6 Apr 2023 23:34:59 +0000 (11:34 +1200)]
Do not consider greeting display names in merges

As surfaced by api_v3_ContactTest::testMergeGetConflicts
these are basically caches of calculated fields

19 months agoFix employer not carrying over correctly in merge
Eileen McNaughton [Thu, 6 Apr 2023 06:12:24 +0000 (18:12 +1200)]
Fix employer not carrying over correctly in merge

This addresses a deduper bug where selecting the employer_id to
carry over in the form does NOT result in the newly
merged contact having that organization's name
in it's organization_name field

19 months agoMerge pull request #26008 from colemanw/fixEntityRefDefaults
colemanw [Fri, 7 Apr 2023 18:43:50 +0000 (14:43 -0400)]
Merge pull request #26008 from colemanw/fixEntityRefDefaults

Afform - Fix showing default values for EntityRef fields

19 months agoSet version to 5.61.beta1
CiviCRM [Thu, 6 Apr 2023 05:18:51 +0000 (05:18 +0000)]
Set version to 5.61.beta1

19 months agoMerge pull request #26013 from eileenmcnaughton/test_strict
Seamus Lee [Thu, 6 Apr 2023 05:15:52 +0000 (15:15 +1000)]
Merge pull request #26013 from eileenmcnaughton/test_strict

Type hints & strictness fixes within tests

19 months agoType hints & strictness fixes within tests
Eileen McNaughton [Thu, 6 Apr 2023 03:08:25 +0000 (15:08 +1200)]
Type hints & strictness fixes within tests

19 months agoMerge pull request #26012 from eileenmcnaughton/old
Eileen McNaughton [Thu, 6 Apr 2023 01:57:14 +0000 (13:57 +1200)]
Merge pull request #26012 from eileenmcnaughton/old

Remove an attention-span's worth of cvs info

19 months agoMerge pull request #26011 from eileenmcnaughton/strict_test
Eileen McNaughton [Thu, 6 Apr 2023 01:56:59 +0000 (13:56 +1200)]
Merge pull request #26011 from eileenmcnaughton/strict_test

[Test] Strictness fixes - `CiviUntTestBaseClass`

19 months agoRemove an attention-span's worth of cvs info
Eileen McNaughton [Thu, 6 Apr 2023 00:57:27 +0000 (12:57 +1200)]
Remove an attention-span's worth of cvs info

19 months ago[Test] Strictness fixes
Eileen McNaughton [Wed, 5 Apr 2023 23:18:04 +0000 (11:18 +1200)]
[Test] Strictness fixes

19 months agoMerge pull request #26005 from eileenmcnaughton/strict_test
colemanw [Wed, 5 Apr 2023 21:11:58 +0000 (17:11 -0400)]
Merge pull request #26005 from eileenmcnaughton/strict_test

Strictness cleanups in test class

19 months agoAfform - Fix showing default values for EntityRef fields
Coleman Watts [Wed, 5 Apr 2023 16:37:31 +0000 (12:37 -0400)]
Afform - Fix showing default values for EntityRef fields

There was some back-and-forth with this. #25374 removed the change() trigger, which fixed
the recursion bug described in https://lab.civicrm.org/dev/core/-/issues/4083 but broke
setting defaults, prompting #25465 which proposed to change it back.

This fix walks the line by triggering the change event but only when the value has actually changed.
Fixes dev/core#4110

19 months agoStrictness cleanups in test class
Eileen McNaughton [Tue, 4 Apr 2023 23:17:40 +0000 (11:17 +1200)]
Strictness cleanups in test class

19 months agoMerge pull request #25175 from colemanw/afformRepeatRelationships
colemanw [Wed, 5 Apr 2023 01:26:25 +0000 (21:26 -0400)]
Merge pull request #25175 from colemanw/afformRepeatRelationships

Afform - Support repeatable relationships

19 months agoMerge pull request #26004 from eileenmcnaughton/dedupe_old
Eileen McNaughton [Wed, 5 Apr 2023 01:04:26 +0000 (13:04 +1200)]
Merge pull request #26004 from eileenmcnaughton/dedupe_old

Remove upgrade custom field handling from Dedupe code - previously shared function

19 months agoMerge pull request #26003 from eileenmcnaughton/dedupe_strict
Eileen McNaughton [Wed, 5 Apr 2023 01:04:12 +0000 (13:04 +1200)]
Merge pull request #26003 from eileenmcnaughton/dedupe_strict

Clarify `entityID` types in Merger class

19 months agoClarify entityID types in Merger class
Eileen McNaughton [Tue, 4 Apr 2023 22:18:07 +0000 (10:18 +1200)]
Clarify entityID types in Merger class

19 months agoMerge pull request #26001 from demeritcowboy/undef
demeritcowboy [Tue, 4 Apr 2023 22:32:23 +0000 (18:32 -0400)]
Merge pull request #26001 from demeritcowboy/undef

Avoid potentially undefined var

19 months agoRemove upgrade custom field handling from Dedupe code
Eileen McNaughton [Tue, 4 Apr 2023 22:29:34 +0000 (10:29 +1200)]
Remove upgrade custom field handling from Dedupe code

19 months agoMerge pull request #25988 from eileenmcnaughton/import_campaign
colemanw [Tue, 4 Apr 2023 21:48:59 +0000 (17:48 -0400)]
Merge pull request #25988 from eileenmcnaughton/import_campaign

When importing invalid campaigns they pass validation (only to fail on import)