civicrm-core.git
4 years agocorrected class name in old FSF code 5.17.3-fsf
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

4 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

4 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

4 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

4 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

4 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

4 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

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

4 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.

4 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.

4 years agocorrected variable name
Andrew Engelbrecht [Fri, 12 Jan 2018 22:19:17 +0000 (17:19 -0500)]
corrected variable name

this code was moved from another location during a git rebase, and the a
variable name needed to change.

4 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)

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

4 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

4 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.

4 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.

4 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.

4 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

4 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.

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

4 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

4 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

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

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

4 years agoredoing replacement of "Confirm Contribution" with "Review Contribution"
k [Tue, 15 Mar 2016 17:37:59 +0000 (13:37 -0400)]
redoing replacement of "Confirm Contribution" with "Review Contribution"

4 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

4 years agoreverted js changes back to upstream
Lisa Marie Maginnis [Thu, 15 Oct 2015 03:10:17 +0000 (23:10 -0400)]
reverted js changes back to upstream

4 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

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

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

4 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

4 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

4 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

4 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

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

4 years agoMerge pull request #15278 from totten/5.17-bump3
Tim Otten [Wed, 11 Sep 2019 04:49:33 +0000 (21:49 -0700)]
Merge pull request #15278 from totten/5.17-bump3

Bump to 5.17.3. Add release notes.

4 years agoSet version to 5.17.3
Tim Otten [Wed, 11 Sep 2019 04:47:26 +0000 (21:47 -0700)]
Set version to 5.17.3

4 years agoAdd release notes for 5.17.3
Tim Otten [Wed, 11 Sep 2019 04:47:13 +0000 (21:47 -0700)]
Add release notes for 5.17.3

4 years agoMerge pull request #15277 from eileenmcnaughton/517
Seamus Lee [Wed, 11 Sep 2019 04:25:46 +0000 (14:25 +1000)]
Merge pull request #15277 from eileenmcnaughton/517

Email search fixes

4 years agoTrim form values when adding LIKE operator
eileen [Wed, 11 Sep 2019 01:33:36 +0000 (13:33 +1200)]
Trim form values when adding LIKE operator

This is more consistent with previous behaviour - ie 'info@civicrm.org' AND 'info@civicrm.org ' should work.

4 years agoEnsure filtering on email via the api looks for an exact match
eileen [Wed, 11 Sep 2019 01:49:06 +0000 (13:49 +1200)]
Ensure filtering on email  via the api  looks for an exact match

4 years agoMerge pull request #15269 from seamuslee001/port_15261
Eileen McNaughton [Wed, 11 Sep 2019 01:55:17 +0000 (13:55 +1200)]
Merge pull request #15269 from seamuslee001/port_15261

Remove is_public flag from report paths

4 years agoMerge pull request #15271 from seamuslee001/dev_drupal_52
Eileen McNaughton [Wed, 11 Sep 2019 01:54:33 +0000 (13:54 +1200)]
Merge pull request #15271 from seamuslee001/dev_drupal_52

dev/drupal#52 Partial fix for Deprecated q variable

4 years agodev/drupal#52 Partial fix for Deprecated q variable
Mathieu Lutfy [Tue, 10 Sep 2019 13:24:48 +0000 (09:24 -0400)]
dev/drupal#52 Partial fix for Deprecated q variable

4 years agoRemove is_public flag from report paths
John Kingsnorth [Tue, 10 Sep 2019 09:44:01 +0000 (10:44 +0100)]
Remove is_public flag from report paths

Even though these paths are publicly accessible, they are not intended as 'public' paths

4 years agoMerge pull request #15258 from seamuslee001/5_17_2_version_bump
Tim Otten [Tue, 10 Sep 2019 05:46:49 +0000 (22:46 -0700)]
Merge pull request #15258 from seamuslee001/5_17_2_version_bump

Bump Version to 5.17.2 and add in release notes

4 years agoUpdate 5.17.2.md
Tim Otten [Tue, 10 Sep 2019 05:46:06 +0000 (22:46 -0700)]
Update 5.17.2.md

4 years agoUpdate 5.17.2.md
Tim Otten [Tue, 10 Sep 2019 05:44:49 +0000 (22:44 -0700)]
Update 5.17.2.md

4 years agoAdd in release notes and bump version to be 5.17.2
Seamus Lee [Tue, 10 Sep 2019 03:38:52 +0000 (13:38 +1000)]
Add in release notes and bump version to be 5.17.2

4 years agoSet version to 5.17.2
Seamus Lee [Tue, 10 Sep 2019 03:35:01 +0000 (13:35 +1000)]
Set version to 5.17.2

4 years agoMerge pull request #15257 from seamuslee001/dev_core_1244
Seamus Lee [Tue, 10 Sep 2019 05:18:53 +0000 (15:18 +1000)]
Merge pull request #15257 from seamuslee001/dev_core_1244

dev/core#1244 Fix regression on searching by contact in advanced search

4 years agodev/core#1244 Fix regression on searching by contact in advanced search
eileen [Mon, 9 Sep 2019 22:14:49 +0000 (10:14 +1200)]
dev/core#1244 Fix regression on searching by contact in advanced search

4 years agoUpdate 5.17.1.md
Tim Otten [Mon, 9 Sep 2019 21:50:12 +0000 (14:50 -0700)]
Update 5.17.1.md

4 years agoMerge pull request #15244 from seamuslee001/5.17
Seamus Lee [Mon, 9 Sep 2019 20:46:19 +0000 (06:46 +1000)]
Merge pull request #15244 from seamuslee001/5.17

dev/core#1233 Fix deleting of campaigns and saving of custom data for campaign and …

4 years agoMerge pull request #15246 from seamuslee001/5.17_bump_version_release_notes
Eileen McNaughton [Sun, 8 Sep 2019 23:32:31 +0000 (11:32 +1200)]
Merge pull request #15246 from seamuslee001/5.17_bump_version_release_notes

5.17 bump version and add in release notes

4 years agoAdd in release notes for 5.17.1 release
Seamus Lee [Sat, 7 Sep 2019 23:02:06 +0000 (09:02 +1000)]
Add in release notes for 5.17.1 release

4 years agoSet version to 5.17.1
Seamus Lee [Sat, 7 Sep 2019 22:55:31 +0000 (08:55 +1000)]
Set version to 5.17.1

4 years agoMerge pull request #15242 from eileenmcnaughton/5.17
Seamus Lee [Sat, 7 Sep 2019 22:54:47 +0000 (08:54 +1000)]
Merge pull request #15242 from eileenmcnaughton/5.17

5.17 port of https://github.com/civicrm/civicrm-core/pull/15239

4 years agoFix deleting of campaigns and saving of custom data for campaign and also ensure...
Seamus Lee [Fri, 6 Sep 2019 22:11:32 +0000 (08:11 +1000)]
Fix deleting of campaigns and saving of custom data for campaign and also ensure that goal_general is not html encoded as it is a wysiwyg field

4 years agotypo in original version of function
DemeritCowboy [Sat, 7 Sep 2019 12:14:50 +0000 (08:14 -0400)]
typo in original version of function

4 years agoSet version to 5.17.0
CiviCRM [Thu, 5 Sep 2019 07:24:59 +0000 (07:24 +0000)]
Set version to 5.17.0

4 years agoMerge pull request #15213 from agh1/5.17.0-releasenotes-final
Seamus Lee [Wed, 4 Sep 2019 20:38:49 +0000 (06:38 +1000)]
Merge pull request #15213 from agh1/5.17.0-releasenotes-final

5.17.0 release notes: late changes and tidy-up

4 years ago5.17.0 release notes: late changes and tidy-up
Andrew Hunt [Wed, 4 Sep 2019 14:50:41 +0000 (10:50 -0400)]
5.17.0 release notes: late changes and tidy-up

4 years agoMerge pull request #15207 from seamuslee001/5_16_4_5_17_release_notes
Eileen McNaughton [Wed, 4 Sep 2019 01:59:53 +0000 (13:59 +1200)]
Merge pull request #15207 from seamuslee001/5_16_4_5_17_release_notes

[NFC] Bring up 5.16.4 release notes into 5.17

4 years agoUpdate 5.16.4.md
Tim Otten [Tue, 3 Sep 2019 06:35:02 +0000 (23:35 -0700)]
Update 5.16.4.md

4 years agorelease-notes - Add 5.16.4
Tim Otten [Tue, 3 Sep 2019 06:31:19 +0000 (23:31 -0700)]
release-notes - Add 5.16.4

4 years agoMerge pull request #15197 from eileenmcnaughton/5.17
Eileen McNaughton [Tue, 3 Sep 2019 05:24:51 +0000 (17:24 +1200)]
Merge pull request #15197 from eileenmcnaughton/5.17

[NFC] comment fixes

4 years agoMerge pull request #15194 from eileenmcnaughton/517_dates
Eileen McNaughton [Tue, 3 Sep 2019 05:24:11 +0000 (17:24 +1200)]
Merge pull request #15194 from eileenmcnaughton/517_dates

Fix failure to save relative dates on legacy fields

4 years ago[NFC] comment fixes
eileen [Tue, 3 Sep 2019 01:47:36 +0000 (13:47 +1200)]
[NFC] comment fixes

4 years agoFix failure to save relative dates on legacy fields
eileen [Mon, 2 Sep 2019 22:50:37 +0000 (10:50 +1200)]
Fix failure to save relative dates on legacy fields

4 years agoMerge pull request #15169 from pradpnayak/relDateFixes
Seamus Lee [Sat, 31 Aug 2019 20:24:26 +0000 (06:24 +1000)]
Merge pull request #15169 from pradpnayak/relDateFixes

1226, fixed Change log relative date search for creating smart group

4 years ago1226, fixed Change log relative date search for creating smart group
Pradeep Nayak [Fri, 30 Aug 2019 20:31:01 +0000 (21:31 +0100)]
1226, fixed Change log relative date search for creating smart group

4 years agoMerge pull request #15111 from seamuslee001/5_16_3_release_notes
Eileen McNaughton [Fri, 23 Aug 2019 00:40:10 +0000 (12:40 +1200)]
Merge pull request #15111 from seamuslee001/5_16_3_release_notes

Add in release notes for 5.16.3 drop

4 years agoMerge pull request #15105 from greenpeace-cee/fix-id-additionalinfo
Tim Otten [Fri, 23 Aug 2019 00:39:10 +0000 (17:39 -0700)]
Merge pull request #15105 from greenpeace-cee/fix-id-additionalinfo

dev/financial#66 - Fix missing contribution ID for AdditionalInfo

4 years agoUpdate release-notes.md
Tim Otten [Thu, 22 Aug 2019 23:07:44 +0000 (16:07 -0700)]
Update release-notes.md

4 years agoUpdate 5.16.3.md
Tim Otten [Thu, 22 Aug 2019 23:05:09 +0000 (16:05 -0700)]
Update 5.16.3.md

4 years agoAdd in release notes for 5.16.3 drop
Seamus Lee [Thu, 22 Aug 2019 22:39:34 +0000 (08:39 +1000)]
Add in release notes for 5.16.3 drop

4 years agoMerge pull request #15106 from alifrumin/5.17.0-rn
Seamus Lee [Thu, 22 Aug 2019 22:18:59 +0000 (08:18 +1000)]
Merge pull request #15106 from alifrumin/5.17.0-rn

5.17.0 release notes: first pass at sorting and annotating

4 years agodev/financial#66 - Fix missing contribution ID for AdditionalInfo
Patrick Figel [Thu, 22 Aug 2019 20:27:52 +0000 (22:27 +0200)]
dev/financial#66 - Fix missing contribution ID for AdditionalInfo

This fixes an issues where the contribution ID is not being passed
when the AdditionalInfo form block is retrieved in the contribution
form. This causes existing values of fields in this block to not be
loaded, leading to data loss when the form is saved.

4 years ago5.17.0 release notes: first pass at sorting and annotating
Alice Frumin [Wed, 21 Aug 2019 15:16:21 +0000 (11:16 -0400)]
5.17.0 release notes: first pass at sorting and annotating

4 years agoMerge pull request #15089 from totten/5.17-install-msg
Eileen McNaughton [Thu, 22 Aug 2019 05:15:55 +0000 (17:15 +1200)]
Merge pull request #15089 from totten/5.17-install-msg

(dev/drupal#79) Fail more gracefully when attempting to install on PHP 5.x

4 years agocomposer.lock - Run: "composer update php"
Tim Otten [Wed, 21 Aug 2019 18:14:03 +0000 (11:14 -0700)]
composer.lock - Run: "composer update php"

4 years ago(dev/drupal#79) Fail more gracefully when attempting to install on PHP 5.x
Tim Otten [Wed, 21 Aug 2019 02:48:41 +0000 (19:48 -0700)]
(dev/drupal#79) Fail more gracefully when attempting to install on PHP 5.x

Before
------

If an admin stracts the code and navigates to `/sites/all/modules/civicrm/install/index.php`, it displays
a syntax error.

After
-----

If an admin stracts the code and navigates to `/sites/all/modules/civicrm/install/index.php`, it displays
the message:

> __PHP Version Requirement__
> CiviCRM requires PHP 7.0+. The web server is running PHP 5.6.38.

Comments
--------

This is similar to https://github.com/civicrm/civicrm-drupal/pull/583

The canonical representation of the minimum PHP version is in
`$civicrm_root/CRM/Upgrade/Form.php`.  However, setting up the classloader
triggers a syntax error, so we need to read this without having access to
the classloader.

The approach herein has a few effects:

* The minimum PHP can be read from a JSON file.
* That JSON file is also used by `composer`, so you'll also get better errors when downloading that way.
* At some unknown point, the minimum will probably bump up again (7.1 or 7.2 or whatever). When that
  happens, the unit-test will ensure we keep `CRM/Upgrade/Form.php` and `composer.json` in sync.

Note: I was little concerned that the `composer.json` file might not be
available when normal installers run, so I checked the published tarballs
for D7, BD, WP, and J - in all cases, the `composer.json` looks to be
included at the expected location.

4 years agoMerge pull request #15087 from agh1/5.17.0-releasenotes
Eileen McNaughton [Tue, 20 Aug 2019 19:52:41 +0000 (07:52 +1200)]
Merge pull request #15087 from agh1/5.17.0-releasenotes

5.17.0 release notes - initial run

4 years ago5.17.0 release notes: added boilerplate
Andrew Hunt [Tue, 20 Aug 2019 16:39:44 +0000 (12:39 -0400)]
5.17.0 release notes: added boilerplate

4 years ago5.17.0 release notes: raw from script
Andrew Hunt [Tue, 20 Aug 2019 16:36:31 +0000 (12:36 -0400)]
5.17.0 release notes: raw from script

4 years agoMerge pull request #15082 from totten/5.17-php-min
Seamus Lee [Tue, 20 Aug 2019 03:29:56 +0000 (13:29 +1000)]
Merge pull request #15082 from totten/5.17-php-min

(dev/drupal#79) CRM_Upgrade_Form - Raise MINIMUM_PHP_VERSION from 5.6 to 7.0

4 years agoMerge pull request #15051 from agileware/CIVICRM-1290
Seamus Lee [Tue, 20 Aug 2019 03:22:43 +0000 (13:22 +1000)]
Merge pull request #15051 from agileware/CIVICRM-1290

Remove "Copy Case custom data" code (circa 2013)

4 years agoCIVICRM-1290 CIVICRM-967 Add unit test: Migrate custom file attachments to new case...
Justin Freeman [Fri, 16 Aug 2019 21:24:26 +0000 (07:24 +1000)]
CIVICRM-1290 CIVICRM-967 Add unit test: Migrate custom file attachments to new case on reassignment
Add unit test from PR #14213 Migrate custom file attachments to new case on reassignment. https://github.com/civicrm/civicrm-core/pull/14213

4 years agoCIVICRM-1290 Remove "Copy Case custom data" code
Justin Freeman [Fri, 16 Aug 2019 07:20:50 +0000 (17:20 +1000)]
CIVICRM-1290 Remove "Copy Case custom data" code

Remove "Copy Case custom data" code. Fixes https://lab.civicrm.org/dev/core/issues/1183

4 years ago(dev/drupal#79) CRM_Upgrade_Form - Raise MINIMUM_PHP_VERSION from 5.6 to 7.0
Tim Otten [Tue, 20 Aug 2019 00:29:32 +0000 (17:29 -0700)]
(dev/drupal#79) CRM_Upgrade_Form - Raise MINIMUM_PHP_VERSION from 5.6 to 7.0

This version requirement officially went up to PHP 7.0 circa Civi 5.14.
However, at that time, the upgrade metadata was kept at PHP 5.6 to allow somewhat
softer landing for stragglers. That's no longer possible in 5.16+, so this
just updates the requirement.

Before
------

When upgrading via drush to Civi 5.16+ on PHP 5.6, the Civi class-loader fails to initialize.

```
Parse error: syntax error, unexpected ':', expecting '{' in /Users/totten/bknix/build/dmaster/web/sites/all/modules/civicrm/vendor/league/csv/src/functions.php on line 33
```

(Approximate call-path: `civicrm.drush.inc` => `civicrm.settings.php` =>
`CRM_Core_ClassLoader` => `vendor/autoload.php` => `vendor/league/csv/src/functions.php`)

After
-----

It still fails, but at least the metadata is accurate.

There will be a separate patch in another repo to make `drush` use this
metadata and present a better error.

4 years agoMerge pull request #15048 from eileenmcnaughton/5.17
Seamus Lee [Sun, 18 Aug 2019 03:33:12 +0000 (13:33 +1000)]
Merge pull request #15048 from eileenmcnaughton/5.17

Fix unreleased regression on import

4 years agoMerge pull request #15058 from seamuslee001/dev_core_1186
Seamus Lee [Sat, 17 Aug 2019 08:10:48 +0000 (18:10 +1000)]
Merge pull request #15058 from seamuslee001/dev_core_1186

dev/core#1186 add in unit test to lock in fix from dmeritcowboy in #1…

4 years agoMerge pull request #15055 from demeritcowboy/file-no-description
Eileen McNaughton [Sat, 17 Aug 2019 04:48:01 +0000 (16:48 +1200)]
Merge pull request #15055 from demeritcowboy/file-no-description

dev/core#1186 - ignore exception if no description field

4 years agodev/core#1186 add in unit test to lock in fix from dmeritcowboy in #15055
Seamus Lee [Sat, 17 Aug 2019 04:42:33 +0000 (14:42 +1000)]
dev/core#1186 add in unit test to lock in fix from dmeritcowboy in #15055

4 years agoMerge pull request #15047 from eileenmcnaughton/pptx
Seamus Lee [Sat, 17 Aug 2019 01:42:49 +0000 (11:42 +1000)]
Merge pull request #15047 from eileenmcnaughton/pptx

dev/core#1190 Add pptx to safe file types

4 years agocatch exception when no description
DemeritCowboy [Sat, 17 Aug 2019 01:31:42 +0000 (21:31 -0400)]
catch exception when no description

4 years agodev/core#1190 Add pptx to safe file types
eileen [Thu, 15 Aug 2019 20:54:20 +0000 (08:54 +1200)]
dev/core#1190 Add pptx to safe file types

I feel like it would be better to store these as an array somewhere - maybe as the first step to
a metadata construct for Option groups...

4 years agoFix unreleased regression on import
eileen [Wed, 14 Aug 2019 03:26:56 +0000 (15:26 +1200)]
Fix unreleased regression on import

https://github.com/civicrm/civicrm-core/commit/2adc819d0e59d71ffcf14c6799a379f108b07d60
made the code a little more readable but changed the indexing from 0-based to column based.

See https://pear.php.net/manual/en/package.database.db.db-common.setfetchmode.php

THis can be replicated by trying to update an existing mapping

4 years agoMerge pull request #15041 from seamuslee001/5.17
Seamus Lee [Thu, 15 Aug 2019 04:43:04 +0000 (14:43 +1000)]
Merge pull request #15041 from seamuslee001/5.17

Add release-notes/5.16.2.md