civicrm-core.git
5 years agoMerge pull request #15902 from eileenmcnaughton/transaction_sillyness
Seamus Lee [Thu, 21 Nov 2019 05:07:15 +0000 (16:07 +1100)]
Merge pull request #15902 from eileenmcnaughton/transaction_sillyness

[REF] remove another unnecessary pass-by-reference

5 years agoMerge pull request #15903 from eileenmcnaughton/except
Eileen McNaughton [Thu, 21 Nov 2019 04:07:22 +0000 (17:07 +1300)]
Merge pull request #15903 from eileenmcnaughton/except

Convert a few fatals to exceptions.

5 years ago[REF] remove another unnecessary pass-by-reference
eileen [Thu, 21 Nov 2019 01:49:54 +0000 (14:49 +1300)]
[REF] remove another unnecessary pass-by-reference

the recur function is only called once. Immediately after it is called there is a return &
the calling function has not passed in any variables by reference - ergo we gain nothing but confusion by using pass-by-ref
here

5 years agoMerge in 5.20
Seamus Lee [Thu, 21 Nov 2019 01:22:13 +0000 (12:22 +1100)]
Merge in 5.20

5 years agoMerge pull request #15841 from mattwire/participant_cleanup_removeparticipantfrominput
Eileen McNaughton [Thu, 21 Nov 2019 01:17:02 +0000 (14:17 +1300)]
Merge pull request #15841 from mattwire/participant_cleanup_removeparticipantfrominput

Remove unused variables in completeOrder()

5 years agoMerge branch '5.20-security_release_release_notes' into '5.20-security'
totten [Wed, 20 Nov 2019 21:53:44 +0000 (21:53 +0000)]
Merge branch '5.20-security_release_release_notes' into '5.20-security'

Release notes for 5.19.2 Release

See merge request security/core!90

5 years agoUpdate 5.19.2.md
totten [Wed, 20 Nov 2019 20:09:10 +0000 (20:09 +0000)]
Update 5.19.2.md

5 years agoUpdate 5.19.2.md
totten [Wed, 20 Nov 2019 19:59:12 +0000 (19:59 +0000)]
Update 5.19.2.md

5 years agoUpdate release notes for Public MRs being merged into 5.19
Seamus Lee [Wed, 20 Nov 2019 19:23:24 +0000 (06:23 +1100)]
Update release notes for Public MRs being merged into 5.19

5 years agoUpdate 5.19.2.md
totten [Wed, 20 Nov 2019 08:14:02 +0000 (08:14 +0000)]
Update 5.19.2.md

5 years agoUpdate 5.19.2.md
totten [Wed, 20 Nov 2019 08:05:07 +0000 (08:05 +0000)]
Update 5.19.2.md

5 years agoUpdate 5.19.2.md
totten [Wed, 20 Nov 2019 07:35:07 +0000 (07:35 +0000)]
Update 5.19.2.md

5 years agoMinor update to release notes
Seamus Lee [Tue, 19 Nov 2019 22:18:42 +0000 (09:18 +1100)]
Minor update to release notes

5 years agoUpdate release notes as per Tim's copy editing of the SA
Seamus Lee [Mon, 18 Nov 2019 05:38:23 +0000 (16:38 +1100)]
Update release notes as per Tim's copy editing of the SA

5 years agoRelease notes for 5.19.2 Release
Seamus Lee [Mon, 18 Nov 2019 05:34:14 +0000 (16:34 +1100)]
Release notes for 5.19.2 Release

5 years agoUpdate to latest versions of polyfill-ctype and polyfill-iconv
Seamus Lee [Wed, 20 Nov 2019 02:13:35 +0000 (13:13 +1100)]
Update to latest versions of polyfill-ctype and polyfill-iconv

5 years agosecuriry/core#70 Upgrade Symfony version to 2.8.50
Seamus Lee [Wed, 20 Nov 2019 02:03:22 +0000 (13:03 +1100)]
securiry/core#70 Upgrade Symfony version to 2.8.50

5 years agoContactApiKeyTest - Add additional test-case
Tim Otten [Wed, 20 Nov 2019 03:50:11 +0000 (19:50 -0800)]
ContactApiKeyTest - Add additional test-case

This case was failing before but now passes with the update

5 years agoEnsure that APIv4 Properly filters out permissable fields when no permission to view...
Seamus Lee [Wed, 20 Nov 2019 03:14:16 +0000 (14:14 +1100)]
Ensure that APIv4 Properly filters out permissable fields when no permission to view field exists

5 years agoUpdate unit test to match the output of the CRM_Utils_String function
Jenkins [Sat, 9 Nov 2019 07:16:07 +0000 (07:16 +0000)]
Update unit test to match the output of the CRM_Utils_String function

5 years agoSavedSearch API - Only accept safe inputs
Tim Otten [Tue, 29 Oct 2019 01:55:18 +0000 (18:55 -0700)]
SavedSearch API - Only accept safe inputs

5 years agoCRM_Utils_String::unserialize() - Add wrapper for parsing safe exprs (int/string...
Tim Otten [Tue, 29 Oct 2019 01:53:03 +0000 (18:53 -0700)]
CRM_Utils_String::unserialize() - Add wrapper for parsing safe exprs (int/string/array/etc)

5 years ago[NFC] Update Doc block as per Patrick
Seamus Lee [Sun, 3 Nov 2019 06:20:31 +0000 (17:20 +1100)]
[NFC] Update Doc block as per Patrick

5 years agoRevert changes in CRM/Core/BAO{Cache|ConfigSetting}.php CRM/Extension/ClassLoader...
Seamus Lee [Tue, 29 Oct 2019 22:34:55 +0000 (09:34 +1100)]
Revert changes in CRM/Core/BAO{Cache|ConfigSetting}.php CRM/Extension/ClassLoader.php CRM/Queue and CRM/Utils/Cache

5 years agoReturn FALSE instead of throwing Exception if package throws Exception
Seamus Lee [Tue, 29 Oct 2019 04:26:57 +0000 (15:26 +1100)]
Return FALSE instead of throwing Exception if package throws Exception

5 years agoImplement xKerman/restricted-unserialize package to guard against unsafe unserialize
Seamus Lee [Tue, 29 Oct 2019 04:21:06 +0000 (15:21 +1100)]
Implement xKerman/restricted-unserialize package to guard against unsafe unserialize

5 years agoContactInterchangeTest - Add coverage for APIv4 joins/chains
Tim Otten [Thu, 31 Oct 2019 06:00:21 +0000 (23:00 -0700)]
ContactInterchangeTest - Add coverage for APIv4 joins/chains

5 years ago(security/core#67) Port APIv3's escaping scheme to APIv4
Tim Otten [Fri, 25 Oct 2019 03:59:08 +0000 (20:59 -0700)]
(security/core#67) Port APIv3's escaping scheme to APIv4

5 years agoHTMLInputCoder - Add more variants for encoding arrays
Tim Otten [Fri, 25 Oct 2019 03:57:34 +0000 (20:57 -0700)]
HTMLInputCoder - Add more variants for encoding arrays

5 years agoFix unit test for APIv4 format
Seamus Lee [Wed, 9 Oct 2019 09:24:42 +0000 (20:24 +1100)]
Fix unit test for APIv4 format

5 years agoFix api_key handling from joins
Coleman Watts [Mon, 1 Jul 2019 00:47:47 +0000 (20:47 -0400)]
Fix api_key handling from joins

5 years agosecurity/core#65 - Fix XSS in Dashboard Report Title
Patrick Figel [Wed, 9 Oct 2019 10:45:33 +0000 (12:45 +0200)]
security/core#65 - Fix XSS in Dashboard Report Title

This fixes an XSS in report titles displayed on the dashboard page
by escaping the title on output.

5 years agosecurity/core#65 Fix Display of Report title that contains XSS in it when shown on...
Seamus Lee [Thu, 8 Aug 2019 21:38:06 +0000 (07:38 +1000)]
security/core#65 Fix Display of Report title that contains XSS in it when shown on dashboard

5 years agosecurity/core#59 - Fix SQL injection in civicrm/ajax/dedupefind
Patrick Figel [Fri, 5 Jul 2019 18:49:44 +0000 (20:49 +0200)]
security/core#59 - Fix SQL injection in civicrm/ajax/dedupefind

This fixes an SQL injection in civicrm/ajax/dedupefind by validating
the order direction parameter.

Fixes #59

5 years agoMerge pull request #15890 from civicrm/5.20
Seamus Lee [Wed, 20 Nov 2019 21:22:34 +0000 (08:22 +1100)]
Merge pull request #15890 from civicrm/5.20

5.20

5 years agoMerge pull request #15892 from totten/master-extgettest
Seamus Lee [Wed, 20 Nov 2019 19:44:27 +0000 (06:44 +1100)]
Merge pull request #15892 from totten/master-extgettest

(NFC) api_v3_ExtensionTest - Fix when executing on build with 25+ extensions

5 years agoMerge pull request #15889 from eileenmcnaughton/refund
Seamus Lee [Wed, 20 Nov 2019 19:44:00 +0000 (06:44 +1100)]
Merge pull request #15889 from eileenmcnaughton/refund

dev/core#1409 Remove net_amount from Addtional Payment form

5 years agodev/core#1409 Remove net_amount from Addtional Payment form
eileen [Wed, 20 Nov 2019 04:54:22 +0000 (17:54 +1300)]
dev/core#1409 Remove net_amount from Addtional Payment form

This is causing a validation problem. We used to have an issue on the contribution form which we eventually
resolved by removing net_amount as it's best calculated anyway

In order to make this changed I had to ensure Payment.create adds the net_amount & had
to do a couple of tweaks for the test to pass

5 years ago(NFC) api_v3_ExtensionTest - Fix when executing on build with 25+ extensions
Tim Otten [Wed, 20 Nov 2019 17:56:38 +0000 (09:56 -0800)]
(NFC) api_v3_ExtensionTest - Fix when executing on build with 25+ extensions

Overview
--------

This fixes a small issue with running the test locally.

Before
------

If the system has code for 25+ extensions (whether enabled or not), `api_v3_ExtensionTest` fails.

After
-----

The number of extensions doesn't matter.

5 years agoMerge pull request #15326 from totten/master-headfoot-2
Yashodha Chaku [Wed, 20 Nov 2019 12:17:39 +0000 (17:47 +0530)]
Merge pull request #15326 from totten/master-headfoot-2

CiviMail - Only display "Headers and Footers" if there are headers and footers

5 years agoMerge pull request #15863 from seamuslee001/status_bounce_extension
Seamus Lee [Wed, 20 Nov 2019 08:17:57 +0000 (19:17 +1100)]
Merge pull request #15863 from seamuslee001/status_bounce_extension

[REF] Convert CRM_Core_Error::fatal to CRM_Core_Error::statusBounce i…

5 years agoMerge pull request #15888 from seamuslee001/lab_core_1406
Seamus Lee [Wed, 20 Nov 2019 06:39:17 +0000 (17:39 +1100)]
Merge pull request #15888 from seamuslee001/lab_core_1406

dev/core#1406 Ensure that we use the CRM_Member_DAO_Membership as dao…

5 years ago[REF] Convert CRM_Core_Error::fatal to CRM_Core_Exception in Extension folder
Seamus Lee [Fri, 15 Nov 2019 22:26:55 +0000 (09:26 +1100)]
[REF] Convert CRM_Core_Error::fatal to CRM_Core_Exception in Extension folder

5 years agodev/core#1406 Ensure that we use the CRM_Member_DAO_Membership as dao for the civicrm...
Seamus Lee [Wed, 20 Nov 2019 04:42:52 +0000 (15:42 +1100)]
dev/core#1406 Ensure that we use the CRM_Member_DAO_Membership as dao for the civicrm_membership table

5 years agoMerge pull request #15821 from seamuslee001/dev_core_183_custom_group
Eileen McNaughton [Wed, 20 Nov 2019 00:38:06 +0000 (13:38 +1300)]
Merge pull request #15821 from seamuslee001/dev_core_183_custom_group

dev/core#183 Convert Include group / exclude group and include tags /…

5 years agoMerge pull request #15886 from seamuslee001/nfc_composer_lock_update
Seamus Lee [Wed, 20 Nov 2019 00:21:31 +0000 (11:21 +1100)]
Merge pull request #15886 from seamuslee001/nfc_composer_lock_update

[NFC] Update composer lockfile to remove warning

5 years agoMerge pull request #15864 from mfb/string-type-declaration
Eileen McNaughton [Wed, 20 Nov 2019 00:13:41 +0000 (13:13 +1300)]
Merge pull request #15864 from mfb/string-type-declaration

Add string type declarations to global API functions.

5 years ago[NFC] Update composer lockfile to remove warning
Seamus Lee [Tue, 19 Nov 2019 21:16:18 +0000 (08:16 +1100)]
[NFC] Update composer lockfile to remove warning

5 years agoVarious tests assume civicrm_api() $entity param is nullable.
mark burdett [Tue, 19 Nov 2019 04:13:03 +0000 (20:13 -0800)]
Various tests assume civicrm_api() $entity param is nullable.

5 years agoAdd string type declarations to global API functions.
mark burdett [Fri, 15 Nov 2019 22:37:45 +0000 (14:37 -0800)]
Add string type declarations to global API functions.

5 years agoRemove unused variables in completeOrder()
Matthew Wire (MJW Consulting) [Wed, 13 Nov 2019 05:57:07 +0000 (18:57 +1300)]
Remove unused variables in completeOrder()

5 years agoMerge pull request #15880 from mlutfy/fixUserDashboardEvent
Matthew Wire [Tue, 19 Nov 2019 02:24:27 +0000 (15:24 +1300)]
Merge pull request #15880 from mlutfy/fixUserDashboardEvent

Remove nbsp from UserDashboard Event section

5 years agoMerge pull request #15817 from colemanw/Fix
Seamus Lee [Tue, 19 Nov 2019 01:42:33 +0000 (12:42 +1100)]
Merge pull request #15817 from colemanw/Fix

Fix api explorer formatting IS NULL clauses

5 years agoMerge pull request #15881 from civicrm/5.20
Eileen McNaughton [Mon, 18 Nov 2019 21:52:07 +0000 (10:52 +1300)]
Merge pull request #15881 from civicrm/5.20

5.20

5 years agoMerge pull request #15879 from alifrumin/rn5.20
Seamus Lee [Mon, 18 Nov 2019 21:26:04 +0000 (08:26 +1100)]
Merge pull request #15879 from alifrumin/rn5.20

First pass at sorting and annotating 5.20 release notes

5 years agoRemove nbsp from UserDashboard Event section
Mathieu Lutfy [Mon, 18 Nov 2019 20:59:06 +0000 (15:59 -0500)]
Remove nbsp from UserDashboard Event section

5 years agoMerge pull request #15878 from civicrm/5.20
Eileen McNaughton [Mon, 18 Nov 2019 20:53:05 +0000 (09:53 +1300)]
Merge pull request #15878 from civicrm/5.20

5.20

5 years agorelease notes 5.20 - first pass at editing, sorting and annotating
Alice Frumin [Fri, 8 Nov 2019 21:28:06 +0000 (16:28 -0500)]
release notes 5.20 - first pass at editing, sorting and annotating

5 years agoMerge pull request #15846 from greenpeace-cee/fix-cancel-date
Eileen McNaughton [Mon, 18 Nov 2019 20:25:44 +0000 (09:25 +1300)]
Merge pull request #15846 from greenpeace-cee/fix-cancel-date

Fix contribution cancel_date not being loaded

5 years agocrmMailingAB - Only display "Headers and Footers" if there are headers and footers
Tim Otten [Wed, 18 Sep 2019 17:55:56 +0000 (13:55 -0400)]
crmMailingAB - Only display "Headers and Footers" if there are headers and footers

5 years agocrmMailing - Only display "Headers and Footers" if there are headers and footers
Tim Otten [Wed, 18 Sep 2019 17:55:24 +0000 (13:55 -0400)]
crmMailing - Only display "Headers and Footers" if there are headers and footers

5 years agodev/core#1391 - Fix contribution cancel_date not being loaded
Patrick Figel [Thu, 14 Nov 2019 13:19:04 +0000 (14:19 +0100)]
dev/core#1391 - Fix contribution cancel_date not being loaded

This fixes an issue where the contribution cancel_date is not loaded
in the contribution search, causing cancelled contributions not to be
greyed out and the cancel date not to be shown.

5 years agoMerge pull request #15800 from eileenmcnaughton/anet_valid
Matthew Wire [Mon, 18 Nov 2019 05:10:49 +0000 (18:10 +1300)]
Merge pull request #15800 from eileenmcnaughton/anet_valid

Remove unused  parameter recur from CompleteOrder signature

5 years agoMerge pull request #15871 from eileenmcnaughton/init_fatal
Matthew Wire [Mon, 18 Nov 2019 05:09:41 +0000 (18:09 +1300)]
Merge pull request #15871 from eileenmcnaughton/init_fatal

[REF] Move CRM_Event_Form_EventFees::buildQuickForm to Participant_Form class

5 years agoMerge pull request #15866 from eileenmcnaughton/test_dumb
Matthew Wire [Mon, 18 Nov 2019 05:09:04 +0000 (18:09 +1300)]
Merge pull request #15866 from eileenmcnaughton/test_dumb

[NFC] [Test-only] Remove partially paid from statuses tested for RenewContribution

5 years agoMerge pull request #15870 from eileenmcnaughton/init_set
Matthew Wire [Mon, 18 Nov 2019 05:08:18 +0000 (18:08 +1300)]
Merge pull request #15870 from eileenmcnaughton/init_set

[REF] Minor simplifcation on initSet

5 years agoMerge pull request #15854 from eileenmcnaughton/test_fix
Matthew Wire [Mon, 18 Nov 2019 05:07:05 +0000 (18:07 +1300)]
Merge pull request #15854 from eileenmcnaughton/test_fix

[NFC] Test fix - incorrect records created due to test set up using PartiallyPaid when no payment is made

5 years agoMerge pull request #15869 from eileenmcnaughton/add_pay
Matthew Wire [Mon, 18 Nov 2019 05:04:11 +0000 (18:04 +1300)]
Merge pull request #15869 from eileenmcnaughton/add_pay

[REF] remove unused lines of code

5 years agoConvert a few fatals to exceptions.
eileen [Mon, 18 Nov 2019 00:11:18 +0000 (13:11 +1300)]
Convert a few fatals to exceptions.

This is a general thing we are doing. In this case they are all ones that really should
never be hit

5 years agoMerge pull request #15826 from seamuslee001/dev_core_183_dedupe
Seamus Lee [Sun, 17 Nov 2019 23:28:40 +0000 (10:28 +1100)]
Merge pull request #15826 from seamuslee001/dev_core_183_dedupe

dev/core#183 CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php report to using CRM_Utils…

5 years agoMerge pull request #15853 from demeritcowboy/civicasetestcase-duplicate-option-values
Seamus Lee [Sun, 17 Nov 2019 21:38:00 +0000 (08:38 +1100)]
Merge pull request #15853 from demeritcowboy/civicasetestcase-duplicate-option-values

[TEST] dev/core#1394 - Avoid duplicate activity types in tests that use CiviCaseTestCase

5 years agoMerge pull request #15849 from seamuslee001/dev_core_183_dedupe_test
Seamus Lee [Sun, 17 Nov 2019 21:35:14 +0000 (08:35 +1100)]
Merge pull request #15849 from seamuslee001/dev_core_183_dedupe_test

[NFC] Add in unit test of code being altered by #15826

5 years agoMerge pull request #15874 from seamuslee001/dev_core_183_env_check
Seamus Lee [Sun, 17 Nov 2019 21:34:48 +0000 (08:34 +1100)]
Merge pull request #15874 from seamuslee001/dev_core_183_env_check

dev/core#183 Use standard temporary table name format when creating t…

5 years agoAdd in unit test of code being altered by #15826
Seamus Lee [Thu, 14 Nov 2019 19:51:36 +0000 (06:51 +1100)]
Add in unit test of code being altered by #15826

5 years agoMerge pull request #15875 from civicrm/5.20
Eileen McNaughton [Sun, 17 Nov 2019 20:23:57 +0000 (09:23 +1300)]
Merge pull request #15875 from civicrm/5.20

5.20

5 years agoMerge pull request #15872 from eileenmcnaughton/sybunt
Seamus Lee [Sun, 17 Nov 2019 19:50:59 +0000 (06:50 +1100)]
Merge pull request #15872 from eileenmcnaughton/sybunt

Fix Sybunt to select mark rows as selected

5 years agodev/core#183 Use standard temporary table name format when creating temporary utf8mb4...
Seamus Lee [Sun, 17 Nov 2019 19:45:43 +0000 (06:45 +1100)]
dev/core#183 Use standard temporary table name format when creating temporary utf8mb4 temporary table

5 years agoMerge pull request #15873 from eileenmcnaughton/cont_ag
Eileen McNaughton [Sun, 17 Nov 2019 19:29:04 +0000 (08:29 +1300)]
Merge pull request #15873 from eileenmcnaughton/cont_ag

dev/core#1377 Fix bug where search action doesn't work.

5 years agoMerge pull request #15865 from eileenmcnaughton/query
Seamus Lee [Sun, 17 Nov 2019 08:38:03 +0000 (19:38 +1100)]
Merge pull request #15865 from eileenmcnaughton/query

Fix incorrect reference on extracted function

5 years agodev/core#1377 Fix bug where search action doesn't work.
eileen [Sun, 17 Nov 2019 08:18:47 +0000 (21:18 +1300)]
dev/core#1377 Fix bug where search action doesn't work.

Fixes a regression where the search actions are not working on the contributionAggregate custom search

5 years agoMerge pull request #15867 from eileenmcnaughton/test_dumber
Seamus Lee [Sun, 17 Nov 2019 08:15:17 +0000 (19:15 +1100)]
Merge pull request #15867 from eileenmcnaughton/test_dumber

[NFC] fix test to correctly set up partially paid contribution

5 years agoFix Sybunt to select mark rows as selected
eileen [Sun, 17 Nov 2019 07:04:26 +0000 (20:04 +1300)]
Fix Sybunt to select mark rows as selected

5 years agoMerge pull request #15820 from seamuslee001/dev_core_183_custom_contribsybnt
Eileen McNaughton [Sun, 17 Nov 2019 06:17:10 +0000 (19:17 +1300)]
Merge pull request #15820 from seamuslee001/dev_core_183_custom_contribsybnt

dev/core#183 Finish converting contrib sybnt custom search to using t…

5 years agoMerge pull request #15868 from colemanw/sortable
Eileen McNaughton [Sun, 17 Nov 2019 06:12:00 +0000 (19:12 +1300)]
Merge pull request #15868 from colemanw/sortable

Upgrade ui-sortable angular library to v0.19.0

5 years ago[REF] Minor simplifcation on initSet
eileen [Sun, 17 Nov 2019 05:20:33 +0000 (18:20 +1300)]
[REF] Minor simplifcation on initSet

Instead of passing the information to calculate the priceSetID into this function it's more helpful
to calculate it first & pass it in - this determination makes more sense on the calling form

5 years ago[REF] Move CRM_Event_Form_EventFees::buildQuickForm to Participant_Form class
eileen [Sun, 17 Nov 2019 05:48:40 +0000 (18:48 +1300)]
[REF] Move CRM_Event_Form_EventFees::buildQuickForm to Participant_Form class

It turns out this function is only ever used from the ParticipantForm class so moving it back there simplifies
that for people looking at the code

5 years ago[REF] remove unused lines of code
eileen [Sun, 17 Nov 2019 04:32:21 +0000 (17:32 +1300)]
[REF] remove unused lines of code

On checking this out this variable is never used ( is)

5 years agoMerge pull request #15815 from artfulrobot/issue-1108-fix-unsubscribe
Seamus Lee [Sun, 17 Nov 2019 02:04:54 +0000 (13:04 +1100)]
Merge pull request #15815 from artfulrobot/issue-1108-fix-unsubscribe

dev/core#1108 Fix unsubscribe bug

5 years agoUpgrade ui-sortable angular library to v0.19.0
Coleman Watts [Sat, 16 Nov 2019 18:35:52 +0000 (13:35 -0500)]
Upgrade ui-sortable angular library to v0.19.0

5 years ago[NFC] fix test to correctly set up partially paid contribution
eileen [Sat, 16 Nov 2019 03:55:53 +0000 (16:55 +1300)]
[NFC] fix test to correctly set up partially paid contribution

5 years agoRemove partially paid from statuses tested for RenewContribution
eileen [Sat, 16 Nov 2019 03:50:00 +0000 (16:50 +1300)]
Remove partially paid from statuses tested for RenewContribution

We want to deprecate this as it doesn't work properly. In this case there is no need to test
it as it's not really valid & hopefully soon it would trigger a deprecation notice

Test that will work when we can deprecate https://github.com/civicrm/civicrm-core/pull/15855

5 years agoFix incorrect reference on extracted function
eileen [Sat, 16 Nov 2019 02:23:35 +0000 (15:23 +1300)]
Fix incorrect reference on extracted function

Per https://github.com/civicrm/civicrm-core/pull/15803#pullrequestreview-317543503

5 years agoMerge pull request #13232 from JO0st/core-574
Tim Otten [Fri, 15 Nov 2019 20:39:15 +0000 (12:39 -0800)]
Merge pull request #13232 from JO0st/core-574

(dev/core#574) Prevent memory exhaustion when generating large PDFs

5 years agoMerge pull request #15848 from colemanw/dateIcons
colemanw [Fri, 15 Nov 2019 20:13:16 +0000 (15:13 -0500)]
Merge pull request #15848 from colemanw/dateIcons

Improve datePicker placeholder/icons

5 years agoMerge pull request #15818 from colemanw/fields
Tim Otten [Fri, 15 Nov 2019 19:11:46 +0000 (11:11 -0800)]
Merge pull request #15818 from colemanw/fields

Field metadata cleanup: Contact & Activity & Custom

5 years agoImprove datePicker placeholder/icons
Coleman Watts [Thu, 14 Nov 2019 17:44:37 +0000 (12:44 -0500)]
Improve datePicker placeholder/icons

5 years agoMerge pull request #15794 from KarinG/master
Mathieu Lu [Fri, 15 Nov 2019 17:00:03 +0000 (12:00 -0500)]
Merge pull request #15794 from KarinG/master

Implement drupal_get_user_timezone()

5 years agoMerge pull request #15837 from totten/master-prtmpl
Mathieu Lu [Fri, 15 Nov 2019 16:49:23 +0000 (11:49 -0500)]
Merge pull request #15837 from totten/master-prtmpl

(NFC) PULL_REQUEST_TEMPLATE.md - Improve suggestions for under-the-hood/non-UI changes

5 years agoMerge pull request #15840 from yashodha/participant_edit
Mathieu Lu [Fri, 15 Nov 2019 16:46:30 +0000 (11:46 -0500)]
Merge pull request #15840 from yashodha/participant_edit

dev/core#1065 Change verbiage in accordance with context

5 years agoAvoid duplicate activity types
DemeritCowboy [Fri, 15 Nov 2019 03:45:00 +0000 (22:45 -0500)]
Avoid duplicate activity types