civicrm-core.git
2 years agoprovince abbreviation patch - issue 724 5.48.2-fsf-michael-attempt-0
Ian Kelling [Thu, 11 Nov 2021 02:05:07 +0000 (21:05 -0500)]
province abbreviation patch - issue 724

2 years agoImproved arabic and hebrew scripts
Ruben Rodriguez [Tue, 8 Jun 2021 21:35:34 +0000 (23:35 +0200)]
Improved arabic and hebrew scripts

2 years agoHack to generate individual latex files, to compile manually into PDF
Ruben Rodriguez [Tue, 8 Jun 2021 21:26:44 +0000 (23:26 +0200)]
Hack to generate individual latex files, to compile manually into PDF

2 years agoThe old pdf test system doesn't work anymore, defaulting to production method
Ruben Rodriguez [Tue, 8 Jun 2021 21:15:02 +0000 (23:15 +0200)]
The old pdf test system doesn't work anymore, defaulting to production method

2 years agoAdding LibreJS back after bundles refactor upstream
Michael McMahon [Wed, 16 Dec 2020 21:57:12 +0000 (16:57 -0500)]
Adding LibreJS back after bundles refactor upstream

2 years agoForce membership auto-renew on by default
Ruben Rodriguez [Wed, 12 Feb 2020 23:06:58 +0000 (18:06 -0500)]
Force membership auto-renew on by default

2 years agocorrected class name in old FSF code
Andrew Engelbrecht [Thu, 18 Oct 2018 16:49:55 +0000 (12:49 -0400)]
corrected class name in old FSF code

https://rt.gnu.org/Ticket/Display.html?id=1330057

2 years agoUse proxy to look for civicrm updates, fixes RT#1314844
Ruben Rodriguez [Thu, 23 Aug 2018 22:17:57 +0000 (18:17 -0400)]
Use proxy to look for civicrm updates, fixes RT#1314844

2 years agoCorrect path to john's signature
Ruben Rodriguez [Tue, 29 May 2018 16:42:57 +0000 (12:42 -0400)]
Correct path to john's signature

2 years agoCorrected call to commonCompose
Ruben Rodriguez [Tue, 29 May 2018 15:47:45 +0000 (11:47 -0400)]
Corrected call to commonCompose

We were using a deprecated wrapper for that function:
https://github.com/civicrm/civicrm-core/commit/187007a3dbd33bde08b0b4f54feff8c71ea2a065

2 years agoremoved an old stray sql file
Andrew Engelbrecht [Wed, 25 Apr 2018 14:34:38 +0000 (10:34 -0400)]
removed an old stray sql file

2 years agoCorrected thankyou template, see RT#1286518
Ruben Rodriguez [Thu, 12 Apr 2018 16:50:26 +0000 (12:50 -0400)]
Corrected thankyou template, see RT#1286518

2 years agoBIG HACK: Corrected frequency calculation for new members
Ruben Rodriguez [Mon, 12 Mar 2018 23:47:35 +0000 (19:47 -0400)]
BIG HACK: Corrected frequency calculation for new members

2 years agoupdated function documentation
Andrew Engelbrecht [Fri, 19 Jan 2018 05:46:30 +0000 (00:46 -0500)]
updated function documentation

2 years agorevert commit that modified getRecurDetails()
Andrew Engelbrecht [Fri, 19 Jan 2018 02:16:08 +0000 (21:16 -0500)]
revert commit that modified getRecurDetails()

we aren't quite sure what this was supposed to do, but this patch was
breaking our site, and it now works with these changes reverted.

2 years agoThis version of the TC code is no longer in use
Andrew Engelbrecht [Tue, 16 Jan 2018 18:31:27 +0000 (13:31 -0500)]
This version of the TC code is no longer in use

the code in org.fsf.payment.trustcommerce was used, and will continue to
be used for the time being.

2 years agoSort by country,second_name,first_name for pdf generation of international mailings
Ruben Rodriguez [Wed, 15 Nov 2017 17:29:39 +0000 (12:29 -0500)]
Sort by country,second_name,first_name for pdf generation of international mailings

(change currently disabled / commented out -- sudoman)

2 years agoDisable recipient estimation on mailings
Ruben Rodriguez [Wed, 15 Nov 2017 17:28:43 +0000 (12:28 -0500)]
Disable recipient estimation on mailings

2 years agoCorrected TeX ligatures for pdf letters
Ruben Rodriguez [Mon, 13 Nov 2017 22:53:57 +0000 (17:53 -0500)]
Corrected TeX ligatures for pdf letters

2 years agoFilter groups according to included profiles
Andrew Engelbrecht [Mon, 25 Sep 2017 22:34:51 +0000 (18:34 -0400)]
Filter groups according to included profiles

This is a continuation of the contact groups filtering feature, which
allows admins to filter the public listings of contact groups on various
Civi pages by setting a Drupal variable with drush.

It is now possible to set a rule for a profile and for that rule to
automatically apply to standalone profile pages, contribution pages that
include the profile, and event pages that include it as well.

See comments in CRM/Contact/Form/Edit/TagsAndGroups.php for instructions
on how to set the variable via drush.

2 years agoAllow admin to change the names of filtered groups
Andrew Engelbrecht [Mon, 18 Sep 2017 22:19:40 +0000 (18:19 -0400)]
Allow admin to change the names of filtered groups

This feature lets one mimic a custom field by allowing admins to change
the text that appears next to each group's check box, via drush.

The json format is a bit more nested, but indented json can be used. An
exmple is included in CRM/Contact/Form/Edit/TagsAndGroups.php.

2 years agoGroups filter hack for smaller groups listings
Andrew Engelbrecht [Fri, 15 Sep 2017 20:15:10 +0000 (16:15 -0400)]
Groups filter hack for smaller groups listings

This change is a dirty hack that lets site admins filter the "Contacts
Group(s)" field output in select profiles. This reduces overwhem for
users when they are making a donation or filling out a form with the
Groups signup field. This is preferable to using a custom field with
smart groups because the Groups field provides double opt-in, while
custom fields do not.

The filter is controlled via a json string stored in a drupal variable
that can be set with drush like so:

drush vset --format=string groups_field_filters "{...}"

See the documentation marked with "sudoman hack" in
CRM/Contact/Form/Edit/TagsAndGroups.php for an example.

2 years 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

2 years 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.

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

2 years 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

2 years 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

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

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

2 years 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

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

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

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

2 years 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

2 years 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

2 years 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

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

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

2 years agoMerge pull request #23259 from totten/5.48-bump2
Tim Otten [Wed, 20 Apr 2022 06:57:57 +0000 (23:57 -0700)]
Merge pull request #23259 from totten/5.48-bump2

5.48.2 - Add notes. Bump version.

2 years agoAdd release-notes/5.48.2.md
Tim Otten [Wed, 20 Apr 2022 02:07:56 +0000 (19:07 -0700)]
Add release-notes/5.48.2.md

2 years agoMerge pull request #23252 from eileenmcnaughton/548
Tim Otten [Wed, 20 Apr 2022 06:56:15 +0000 (23:56 -0700)]
Merge pull request #23252 from eileenmcnaughton/548

548 backports

2 years agoSet version to 5.48.2
Tim Otten [Wed, 20 Apr 2022 01:44:33 +0000 (18:44 -0700)]
Set version to 5.48.2

2 years agoFix button breakage on viewContribution
Eileen McNaughton [Thu, 14 Apr 2022 06:20:08 +0000 (18:20 +1200)]
Fix button breakage on viewContribution

2 years agoMerge pull request #23255 from colemanw/fixDownloadInvoiceButton
Eileen McNaughton [Wed, 20 Apr 2022 01:14:41 +0000 (13:14 +1200)]
Merge pull request #23255 from colemanw/fixDownloadInvoiceButton

Fix dev/core#3168 broken download contribution invoice button

2 years agoMerge pull request #23254 from colemanw/searchKitBackportAggFix
Eileen McNaughton [Wed, 20 Apr 2022 00:12:09 +0000 (12:12 +1200)]
Merge pull request #23254 from colemanw/searchKitBackportAggFix

SearchKit - Prevent errors trying to orderBy nonaggregated columns

2 years agoFix dev/core#3168 broken download contribution invoice button
Coleman Watts [Tue, 19 Apr 2022 22:43:52 +0000 (18:43 -0400)]
Fix dev/core#3168 broken download contribution invoice button

2 years agoSearchKit - Prevent errors trying to orderBy nonaggregated columns when using groupBy
Coleman Watts [Tue, 19 Apr 2022 14:07:13 +0000 (10:07 -0400)]
SearchKit - Prevent errors trying to orderBy nonaggregated columns when using groupBy

2 years agoallow non-organization employers
Jon Goldberg [Fri, 15 Apr 2022 14:24:11 +0000 (10:24 -0400)]
allow non-organization employers

2 years agoFix malformed query when user with no access to any financial acls accesses civimembe...
Eileen McNaughton [Fri, 15 Apr 2022 22:26:28 +0000 (10:26 +1200)]
Fix malformed query when user with no access to any financial acls accesses civimember search

2 years agoFix sql error on acl user
Eileen McNaughton [Sun, 17 Apr 2022 23:29:32 +0000 (11:29 +1200)]
Fix sql error on acl user

2 years agoMerge pull request #23182 from totten/5.48-bump1
Tim Otten [Wed, 13 Apr 2022 00:01:08 +0000 (17:01 -0700)]
Merge pull request #23182 from totten/5.48-bump1

5.48.1 - Add release-notes

2 years agoAdd release-notes/5.48.1.md
Tim Otten [Tue, 12 Apr 2022 23:34:14 +0000 (16:34 -0700)]
Add release-notes/5.48.1.md

2 years agoMerge pull request #23140 from colemanw/managedGrantEntities
Eileen McNaughton [Tue, 12 Apr 2022 23:13:34 +0000 (11:13 +1200)]
Merge pull request #23140 from colemanw/managedGrantEntities

CiviGrant - Cleanup managed entities - fixes dev/core#3161

2 years agoSet version to 5.48.1
Tim Otten [Tue, 12 Apr 2022 02:44:45 +0000 (19:44 -0700)]
Set version to 5.48.1

2 years agoCiviGrant - Remove unused managed entities during upgrade
Coleman Watts [Tue, 12 Apr 2022 15:31:02 +0000 (11:31 -0400)]
CiviGrant - Remove unused managed entities during upgrade

Removes managed entities which may have been added during the 5.47 upgrade,
to prevent the managed system from automatically deleting them.

2 years agoMerge pull request #23167 from totten/5.48-cache-backport
colemanw [Mon, 11 Apr 2022 23:26:47 +0000 (19:26 -0400)]
Merge pull request #23167 from totten/5.48-cache-backport

(dev/core#3166) "Metadata" cache - Strictly separate by version (5.48)

2 years agoMerge pull request #23142 from totten/5.48-mailing-verify
Tim Otten [Mon, 11 Apr 2022 21:29:47 +0000 (14:29 -0700)]
Merge pull request #23142 from totten/5.48-mailing-verify

(dev/mail#107) CiviMail - Fix validation error (5.48)

2 years ago(dev/core#3166) "Metadata" cache - Strictly separate by version
Tim Otten [Sat, 9 Apr 2022 20:23:56 +0000 (13:23 -0700)]
(dev/core#3166) "Metadata" cache - Strictly separate by version

This addresses some symptoms identified in the discussion of 3166.

Before
------

The "metadata" cache is always stored with the name `metadata`.

If you load a newer codebase, it still reads `metadata` from the older code base (until something explicitly clears the cache).

After
-----

The "metadata" cache is always stored with the name `metadata_{version}`, eg `metadata_5_48_0`.

If you load a newer codebase (eg `5.49.0`), it will ignore the older `metadata_5_48_0` and create a new `metadata_5_49_0`.

Comments
--------

The upgrade system also clears cache, but many users rely on navigating through the site to get to the upgrader.

The change could make sense with other caches, but I only applied the change to the `metadata` cache because there is _some_ risk;
eg if some caller bypasses the cache objects. (I was also slightly concerned about the possibility the some caller relies
on `$cache->getName()` or `$cache->getPrefix()` or similar... but I haven't been able to find any methods like that...). It seems
safer to put that sort of change into a monthly update rather than minor patch.

2 years agoCiviMail - Fix validation error
Tim Otten [Fri, 8 Apr 2022 22:01:31 +0000 (15:01 -0700)]
CiviMail - Fix validation error

Steps to reproduce:

- Disable Flexmailer
- Use web UI
- Create a new mailing
- Fill out fields
- Submit mailing
- Observe inaccurate error - Mailing cannot be sent. There are missing or invalid fields (subject,name,from_name,from_email,body).

See also: https://civicrm.stackexchange.com/questions/41654/after-upgrade-to-civicrm-5-48-0-all-submissions-say-mailing-cannot-be-sent-th

2 years agoCiviGrant - Cleanup managed entities - fixes dev/core#3161
Coleman Watts [Fri, 8 Apr 2022 13:47:51 +0000 (09:47 -0400)]
CiviGrant - Cleanup managed entities - fixes dev/core#3161

- Ensure labels are translated
- Set stricter cleanup policy for entities that should be removed on uninstall
- Make grant_status options unmanaged. They will not be updated by the system ever,
  but they will be deleted on uninstall because the option group is a managed entity.

2 years agoMerge pull request #23131 from colemanw/managedOptionValueBackport
colemanw [Fri, 8 Apr 2022 01:08:45 +0000 (21:08 -0400)]
Merge pull request #23131 from colemanw/managedOptionValueBackport

Fix OptionValue BAO to call pre/post hooks to prevent force-reset of …

2 years agoFix OptionValue BAO to call pre/post hooks to prevent force-reset of managed entities
Coleman Watts [Thu, 7 Apr 2022 19:40:30 +0000 (15:40 -0400)]
Fix OptionValue BAO to call pre/post hooks to prevent force-reset of managed entities

Managed entities rely on pre/post hooks being called in order to track whether an entity
has been modified. Without those hooks OptionValues were being force-reverted by the
managed system even when the 'update' mode was set to 'unmodified', which is supposed
to defer to user modifications.

2 years agoSet version to 5.48.0
Tim Otten [Thu, 7 Apr 2022 06:25:50 +0000 (23:25 -0700)]
Set version to 5.48.0

2 years agoMerge pull request #23125 from agh1/5.48.0-releasenotes-final
Tim Otten [Thu, 7 Apr 2022 05:08:22 +0000 (22:08 -0700)]
Merge pull request #23125 from agh1/5.48.0-releasenotes-final

5.48.0 release notes: added late changes

2 years ago5.48.0 release notes: added late changes
Andie Hunt [Thu, 7 Apr 2022 02:17:01 +0000 (22:17 -0400)]
5.48.0 release notes: added late changes

2 years agoMerge pull request #23120 from colemanw/contentBlock2
colemanw [Thu, 7 Apr 2022 00:24:28 +0000 (20:24 -0400)]
Merge pull request #23120 from colemanw/contentBlock2

Afform - Ensure upgrade fully converts content blocks

2 years agoMerge pull request #23116 from colemanw/removeContactViewOptions
Eileen McNaughton [Wed, 6 Apr 2022 23:15:34 +0000 (11:15 +1200)]
Merge pull request #23116 from colemanw/removeContactViewOptions

CiviGrant - Remove upgrade that adds removed option value

2 years agoMerge pull request #23118 from colemanw/grantTab
colemanw [Wed, 6 Apr 2022 22:55:58 +0000 (18:55 -0400)]
Merge pull request #23118 from colemanw/grantTab

CiviGrant - Fix missing column and translate headers in contact summary tab

2 years agoMerge pull request #23115 from eileenmcnaughton/548
Eileen McNaughton [Wed, 6 Apr 2022 22:30:10 +0000 (10:30 +1200)]
Merge pull request #23115 from eileenmcnaughton/548

Fix broken civgrant shortcut link

2 years agoAfform - Ensure upgrade fully converts content blocks
Coleman Watts [Wed, 6 Apr 2022 22:21:02 +0000 (18:21 -0400)]
Afform - Ensure upgrade fully converts content blocks

Ensures `{block: '*'}` doesn't get converted to `{entity_type: '*'}`
because that's not a real entity type.

2 years agoMerge pull request #23104 from colemanw/contentBlock
Eileen McNaughton [Wed, 6 Apr 2022 22:13:55 +0000 (10:13 +1200)]
Merge pull request #23104 from colemanw/contentBlock

Afform - Fix regression editing a content block with no entity type

2 years agoCiviGrant - Fix missing column and translated headers in contact summary tab
Coleman Watts [Wed, 6 Apr 2022 16:06:16 +0000 (12:06 -0400)]
CiviGrant - Fix missing column and translated headers in contact summary tab

2 years agoCiviGrant - Refresh grants tab after adding a grant from contact summary actions...
Coleman Watts [Wed, 6 Apr 2022 15:55:05 +0000 (11:55 -0400)]
CiviGrant - Refresh grants tab after adding a grant from contact summary actions menu

2 years agoFix contact summary actions for CiviGrant
Coleman Watts [Wed, 6 Apr 2022 15:27:46 +0000 (11:27 -0400)]
Fix contact summary actions for CiviGrant

2 years agoFix broken civgrant shortcut link
Eileen McNaughton [Wed, 6 Apr 2022 06:03:14 +0000 (18:03 +1200)]
Fix broken civgrant shortcut link

2 years agoCiviGrant - Remove upgrade that adds removed option value
Coleman Watts [Wed, 6 Apr 2022 11:48:49 +0000 (07:48 -0400)]
CiviGrant - Remove upgrade that adds removed option value

2 years agoMerge pull request #23102 from seamuslee001/dompdf_update
Seamus Lee [Wed, 6 Apr 2022 04:18:14 +0000 (14:18 +1000)]
Merge pull request #23102 from seamuslee001/dompdf_update

Update DOMPDF to 1.2.1 and update composer-compile-plugin as per master

2 years agoMerge pull request #23105 from colemanw/grantViewOptions
demeritcowboy [Wed, 6 Apr 2022 03:25:38 +0000 (23:25 -0400)]
Merge pull request #23105 from colemanw/grantViewOptions

CiviGrant - Remove non-functional setting for grants tab

2 years agoCiviGrant - Remove non-functional setting for grants tab in `contact_view_options`
Coleman Watts [Wed, 6 Apr 2022 01:02:09 +0000 (21:02 -0400)]
CiviGrant - Remove non-functional setting for grants tab in `contact_view_options`

Fixes dev/core#3159

The status of the tab can be controlled at a coarse level by disabling/enabling the CiviGrant extension,
and at a finer level with the Contact Layout Editor extension, making this option unnecessary.
Since it's broken, it seemed best to remove it.

2 years agoAfform - Fix regression editing a content block with no entity type
Coleman Watts [Wed, 6 Apr 2022 00:37:04 +0000 (20:37 -0400)]
Afform - Fix regression editing a content block with no entity type

2 years agoUpdate DOMPDF to 1.2.1 and update composer-compile-plugin as per master
Seamus Lee [Tue, 5 Apr 2022 22:06:18 +0000 (08:06 +1000)]
Update DOMPDF to 1.2.1 and update composer-compile-plugin as per master

2 years agoMerge pull request #22986 from colemanw/afformFixBlocksAgain
demeritcowboy [Tue, 5 Apr 2022 20:57:47 +0000 (16:57 -0400)]
Merge pull request #22986 from colemanw/afformFixBlocksAgain

Afform - repeat block metadata update to fix errors when saving blocks

2 years agoMerge pull request #23086 from demeritcowboy/report-filter
Eileen McNaughton [Fri, 1 Apr 2022 20:49:22 +0000 (09:49 +1300)]
Merge pull request #23086 from demeritcowboy/report-filter

dev/core#3153 - Fix missing filter summary on CiviReports

2 years agofix missing filter summary
demeritcowboy [Fri, 1 Apr 2022 17:55:22 +0000 (13:55 -0400)]
fix missing filter summary

2 years agoMerge pull request #23051 from adixon/3031-smart-subscribe-check-sql
demeritcowboy [Fri, 1 Apr 2022 16:46:26 +0000 (12:46 -0400)]
Merge pull request #23051 from adixon/3031-smart-subscribe-check-sql

split sql select into two selects for performance reasons

2 years agosplit sql select into two selects for performance reasons
Alan Dixon [Mon, 28 Mar 2022 20:23:52 +0000 (16:23 -0400)]
split sql select into two selects for performance reasons

2 years agoMerge pull request #23070 from colemanw/searchKitGroupByFix
demeritcowboy [Fri, 1 Apr 2022 00:03:45 +0000 (20:03 -0400)]
Merge pull request #23070 from colemanw/searchKitGroupByFix

SearchKit - Fix broken group-by caused by non-aggregated id column

2 years agoMerge pull request #23071 from demeritcowboy/token-time
demeritcowboy [Thu, 31 Mar 2022 22:30:52 +0000 (18:30 -0400)]
Merge pull request #23071 from demeritcowboy/token-time

dev/core#3072 - Put contribution dates in message template back to not including time

2 years agoput dates back to not including time
demeritcowboy [Thu, 31 Mar 2022 17:21:13 +0000 (13:21 -0400)]
put dates back to not including time

2 years agoSearchKit - Fix UI to allow aggregation of custom fields
Coleman Watts [Thu, 31 Mar 2022 13:49:55 +0000 (09:49 -0400)]
SearchKit - Fix UI to allow aggregation of custom fields

Fixes dev/core#3143

2 years agoSearchKit - Fix broken group-by caused by non-aggregated id column
Coleman Watts [Thu, 31 Mar 2022 13:42:42 +0000 (09:42 -0400)]
SearchKit - Fix broken group-by caused by non-aggregated id column

Before: The `id` column was being unconditionally added, breaking FULL_GROUP_BY sql
After: Let the Api4SelectQuery take care of it for DAO entities

2 years agoMerge pull request #23063 from demeritcowboy/timezone-multilingual
demeritcowboy [Wed, 30 Mar 2022 22:55:06 +0000 (18:55 -0400)]
Merge pull request #23063 from demeritcowboy/timezone-multilingual

dev/core#3151 - Don't localize event_tz field when backing up the field during upgrade

2 years agodon't localize event_tz field when backing up
demeritcowboy [Wed, 30 Mar 2022 19:41:50 +0000 (15:41 -0400)]
don't localize event_tz field when backing up

2 years agoMerge pull request #22940 from demeritcowboy/revert-timezone-upgrade
Tim Otten [Sun, 27 Mar 2022 21:36:42 +0000 (14:36 -0700)]
Merge pull request #22940 from demeritcowboy/revert-timezone-upgrade

dev/core#2122 - Upgrade scripts for revert event timezones

2 years agoMerge pull request #23035 from colemanw/mergeContactsRedirectFix
demeritcowboy [Sun, 27 Mar 2022 18:33:49 +0000 (14:33 -0400)]
Merge pull request #23035 from colemanw/mergeContactsRedirectFix

Dedupe - Fix redirecting to contact after merge

2 years agodev/core#2122 - TimezoneRevertTrait - Failsafe to opt-out of TZ converter
Tim Otten [Fri, 25 Mar 2022 09:39:36 +0000 (02:39 -0700)]
dev/core#2122 - TimezoneRevertTrait - Failsafe to opt-out of TZ converter

2 years agodev/core#2122 - TimezoneRevertTrait - Cleanup modified TZ-offsets and DST skews
Tim Otten [Fri, 25 Mar 2022 05:18:28 +0000 (22:18 -0700)]
dev/core#2122 - TimezoneRevertTrait - Cleanup modified TZ-offsets and DST skews

2 years agoDedupe - Fix redirecting to contact after merge
Coleman Watts [Fri, 25 Mar 2022 13:20:52 +0000 (09:20 -0400)]
Dedupe - Fix redirecting to contact after merge

The final redirect was accidentally changed by a6f2a80ffbddfc0788199ec824b8aff46ccd1542
Fixes dev/core#3135

2 years agoMerge pull request #23030 from alifrumin/releasenotes5.48
Seamus Lee [Fri, 25 Mar 2022 08:21:35 +0000 (19:21 +1100)]
Merge pull request #23030 from alifrumin/releasenotes5.48

[NFC] First Pass at 5.48 release notes

2 years ago[NFC] 5.48 Release Notes - First Pass
Alice Frumin [Wed, 23 Mar 2022 15:56:29 +0000 (11:56 -0400)]
[NFC]  5.48 Release Notes - First Pass