civicrm-core.git
5 years agoMerge pull request #14202 from civicrm/5.14
Seamus Lee [Sun, 5 May 2019 02:39:53 +0000 (12:39 +1000)]
Merge pull request #14202 from civicrm/5.14

5.14

5 years agoMerge pull request #14200 from demeritcowboy/to-be-or-not-to-be
Seamus Lee [Sun, 5 May 2019 02:39:21 +0000 (12:39 +1000)]
Merge pull request #14200 from demeritcowboy/to-be-or-not-to-be

contributor-keys file - jira/lab.c.o username fix

5 years agoMerge pull request #14194 from eileenmcnaughton/activity_sort
Seamus Lee [Sun, 5 May 2019 02:38:19 +0000 (12:38 +1000)]
Merge pull request #14194 from eileenmcnaughton/activity_sort

dev/core#934 Fix regression on sorting activity tab by 'Added by'

5 years agoMerge pull request #14177 from eileenmcnaughton/free
Eileen McNaughton [Sat, 4 May 2019 23:30:16 +0000 (11:30 +1200)]
Merge pull request #14177 from eileenmcnaughton/free

IDE re-format of tools directory

5 years agoMerge pull request #14180 from eileenmcnaughton/recur_search
Eileen McNaughton [Sat, 4 May 2019 23:18:33 +0000 (11:18 +1200)]
Merge pull request #14180 from eileenmcnaughton/recur_search

Enotice fix on creating a smart group

5 years agodev/core#934 Fix regression on sorting activity tab by 'Added by'
eileen [Fri, 3 May 2019 02:37:14 +0000 (14:37 +1200)]
dev/core#934 Fix regression on sorting activity tab by 'Added by'

5 years agojira
DemeritCowboy [Fri, 3 May 2019 23:49:27 +0000 (19:49 -0400)]
jira

5 years agoMerge pull request #14193 from seamuslee001/5.14
Eileen McNaughton [Fri, 3 May 2019 05:29:19 +0000 (17:29 +1200)]
Merge pull request #14193 from seamuslee001/5.14

On PHP 7.2 we cannot start session until it has been configured by Dr…

5 years agoOn PHP 7.2 we cannot start session until it has been configured by Drupal.
mark burdett [Tue, 16 Apr 2019 23:29:43 +0000 (16:29 -0700)]
On PHP 7.2 we cannot start session until it has been configured by Drupal.

5 years agoMerge pull request #14192 from civicrm/5.14
Eileen McNaughton [Fri, 3 May 2019 01:26:13 +0000 (13:26 +1200)]
Merge pull request #14192 from civicrm/5.14

5.14

5 years agoMerge pull request #14191 from seamuslee001/5_13_release_notes
Seamus Lee [Fri, 3 May 2019 00:55:29 +0000 (10:55 +1000)]
Merge pull request #14191 from seamuslee001/5_13_release_notes

Add in release notes for 5.13.1 drop

5 years agoMerge pull request #14074 from mfb/session-start
Tim Otten [Thu, 2 May 2019 23:22:01 +0000 (16:22 -0700)]
Merge pull request #14074 from mfb/session-start

Don't call session_start() before CMS bootstrap (PHP 7.2 compat)

5 years agoMerge pull request #14135 from colemanw/menubarVars
Seamus Lee [Thu, 2 May 2019 23:16:12 +0000 (09:16 +1000)]
Merge pull request #14135 from colemanw/menubarVars

Hook to alter menubar css variables & fix breakpoint in WP

5 years agoUpdate 5.13.1.md
Tim Otten [Thu, 2 May 2019 22:48:16 +0000 (15:48 -0700)]
Update 5.13.1.md

5 years agoMerge pull request #14189 from MegaphoneJon/wordpress-26-5.14
Seamus Lee [Thu, 2 May 2019 22:08:02 +0000 (08:08 +1000)]
Merge pull request #14189 from MegaphoneJon/wordpress-26-5.14

wordpress#26 - fix REST

5 years agoAdd in release notes for 5.13.1 drop
Seamus Lee [Thu, 2 May 2019 21:30:39 +0000 (07:30 +1000)]
Add in release notes for 5.13.1 drop

5 years agowordpress#26 - fix REST
Jon Goldberg [Thu, 2 May 2019 20:00:19 +0000 (16:00 -0400)]
wordpress#26 - fix REST

5 years agoMerge pull request #14188 from seamuslee001/dev_core_931_5_14
Seamus Lee [Thu, 2 May 2019 21:09:40 +0000 (07:09 +1000)]
Merge pull request #14188 from seamuslee001/dev_core_931_5_14

Resolve dev/core#931 by not doing translation on the query if field e…

5 years agoResolve dev/core#931 by not doing translation on the query if field exists during...
Seamus Lee [Thu, 2 May 2019 20:22:41 +0000 (06:22 +1000)]
Resolve dev/core#931 by not doing translation on the query if field exists during the upgrade process

5 years agoMerge pull request #14171 from eileenmcnaughton/copy_dao
Matthew Wire [Thu, 2 May 2019 09:32:19 +0000 (10:32 +0100)]
Merge pull request #14171 from eileenmcnaughton/copy_dao

[ref] Move copyCustomFields function from Event to Core_DAO for re-usablibilty

5 years agoMerge pull request #14152 from seamuslee001/dev_translation_26
Monish Deb [Thu, 2 May 2019 07:44:17 +0000 (13:14 +0530)]
Merge pull request #14152 from seamuslee001/dev_translation_26

dev/translation#26 Fix Notice errors caused by l10n rewriting of quer…

5 years agoIDE re-format of tools directory
eileen [Thu, 2 May 2019 02:37:57 +0000 (14:37 +1200)]
IDE re-format of tools directory

We didn't fix array syntax on this one yet

5 years agoEnotice fix
eileen [Thu, 2 May 2019 05:05:29 +0000 (17:05 +1200)]
Enotice fix

Dates back to https://github.com/civicrm/civicrm-core/commit/eda34f9b15c494715e8fc54f09b5ea4308d16b17#diff-8041069091a94b730ff8ad60bdd24042R70
(Mar 2018).

To recreate do a first name search & create a smart group from it

5 years agoMerge pull request #14178 from eileenmcnaughton/config
Eileen McNaughton [Thu, 2 May 2019 04:48:31 +0000 (16:48 +1200)]
Merge pull request #14178 from eileenmcnaughton/config

[cleanup] Remove deprecated pattern &CRM_Core_Config::singleton()

5 years agoMerge pull request #14179 from eileenmcnaughton/free_dao
Eileen McNaughton [Thu, 2 May 2019 04:48:11 +0000 (16:48 +1200)]
Merge pull request #14179 from eileenmcnaughton/free_dao

dev/core#562 [cleanup] remove some more instances of ->free()

5 years agoSet version to 5.15.alpha1
CiviCRM [Thu, 2 May 2019 04:40:58 +0000 (04:40 +0000)]
Set version to 5.15.alpha1

5 years agoSet version to 5.14.beta1
CiviCRM [Thu, 2 May 2019 04:35:35 +0000 (04:35 +0000)]
Set version to 5.14.beta1

5 years agodev/core#562 remove some more instances of ->free()
eileen [Thu, 2 May 2019 02:55:05 +0000 (14:55 +1200)]
dev/core#562 remove some more instances of ->free()

5 years ago[cleanup] Remove deprecated pattern &CRM_Core_Config::singleton()
eileen [Thu, 2 May 2019 02:44:35 +0000 (14:44 +1200)]
[cleanup] Remove deprecated pattern &CRM_Core_Config::singleton()

5 years agoMerge pull request #14176 from civicrm/5.13
Seamus Lee [Thu, 2 May 2019 02:29:36 +0000 (12:29 +1000)]
Merge pull request #14176 from civicrm/5.13

5.13

5 years agoMerge pull request #14056 from agh1/5.13.0-releasenotes
Tim Otten [Thu, 2 May 2019 02:23:55 +0000 (19:23 -0700)]
Merge pull request #14056 from agh1/5.13.0-releasenotes

5.13.0 release notes

5 years agoUpdate 5.13.0.md
Tim Otten [Wed, 1 May 2019 23:50:50 +0000 (16:50 -0700)]
Update 5.13.0.md

5 years agoMerge pull request #14173 from mlutfy/cart-payment-cid
Eileen McNaughton [Wed, 1 May 2019 23:27:10 +0000 (11:27 +1200)]
Merge pull request #14173 from mlutfy/cart-payment-cid

Event Cart: pass the contactID to fix payment on Stripe

5 years agoMerge pull request #14170 from mlutfy/cart-emails
Eileen McNaughton [Wed, 1 May 2019 23:26:27 +0000 (11:26 +1200)]
Merge pull request #14170 from mlutfy/cart-emails

Event Cart: fix sending of email receipts

5 years agoMerge pull request #14175 from mlutfy/cart-cc-icons
Eileen McNaughton [Wed, 1 May 2019 23:25:51 +0000 (11:25 +1200)]
Merge pull request #14175 from mlutfy/cart-cc-icons

Event Cart: add support for the Credit Card type icons

5 years agoMerge pull request #14174 from mlutfy/cart-allow-same-participant
Eileen McNaughton [Wed, 1 May 2019 23:25:31 +0000 (11:25 +1200)]
Merge pull request #14174 from mlutfy/cart-allow-same-participant

Event Cart: honor the allow_same_participant_emails setting

5 years agoEvent Cart: pass the contactID to fix payment on Stripe
Mathieu Lutfy [Wed, 1 May 2019 15:08:06 +0000 (11:08 -0400)]
Event Cart: pass the contactID to fix payment on Stripe

5 years ago5.13.0 release notes: late changes
Andrew Hunt [Wed, 1 May 2019 21:23:38 +0000 (17:23 -0400)]
5.13.0 release notes: late changes

5 years agouppercase if work is continued or begun
Alice Frumin [Thu, 25 Apr 2019 20:12:08 +0000 (16:12 -0400)]
uppercase if work is continued or begun

5 years agomoving gitlab issues to the end
Alice Frumin [Thu, 25 Apr 2019 20:06:12 +0000 (16:06 -0400)]
moving gitlab issues to the end

5 years ago5.13.0 release notes: bulk of edits
Alice Frumin [Tue, 16 Apr 2019 17:21:09 +0000 (13:21 -0400)]
5.13.0 release notes: bulk of edits

5 years ago5.13.0 release notes: added boilerplate
Andrew Hunt [Mon, 15 Apr 2019 21:01:28 +0000 (17:01 -0400)]
5.13.0 release notes: added boilerplate

5 years ago5.13.0 release notes: raw from script
Andrew Hunt [Mon, 15 Apr 2019 19:21:33 +0000 (15:21 -0400)]
5.13.0 release notes: raw from script

5 years agoEvent Cart: add support for the Credit Card type icons
Mathieu Lutfy [Wed, 1 May 2019 15:33:37 +0000 (11:33 -0400)]
Event Cart: add support for the Credit Card type icons

5 years agoEvent Cart: honor the allow_same_participant_emails setting
Mathieu Lutfy [Wed, 1 May 2019 15:13:28 +0000 (11:13 -0400)]
Event Cart: honor the allow_same_participant_emails setting

5 years agoFollow up by making more generic
eileen [Wed, 1 May 2019 13:28:30 +0000 (01:28 +1200)]
Follow up by making more generic

5 years ago[ref] Move copyCustomFields function from Event to Core_DAO for re-usablibilty
eileen [Wed, 1 May 2019 12:19:51 +0000 (00:19 +1200)]
[ref] Move copyCustomFields function from Event to Core_DAO for re-usablibilty

5 years agoMerge pull request #14169 from mlutfy/cart-i18n
Matthew Wire [Wed, 1 May 2019 12:05:26 +0000 (13:05 +0100)]
Merge pull request #14169 from mlutfy/cart-i18n

Event Cart: fix start_date formatting in line items during checkout

5 years agoMerge pull request #14168 from eileenmcnaughton/enotice
Matthew Wire [Wed, 1 May 2019 11:26:04 +0000 (12:26 +0100)]
Merge pull request #14168 from eileenmcnaughton/enotice

dev/core#918 enotice fix part 2 #14165

5 years agoEvent Cart: fix sending of email receipts
Mathieu Lutfy [Wed, 1 May 2019 10:32:52 +0000 (06:32 -0400)]
Event Cart: fix sending of email receipts

5 years agoEvent Cart: fix start_date formatting in line items during checkout
Mathieu Lutfy [Wed, 1 May 2019 10:25:00 +0000 (06:25 -0400)]
Event Cart: fix start_date formatting in line items during checkout

5 years agodev/core#918 enotice fix part 2 #14165
eileen [Wed, 1 May 2019 08:34:34 +0000 (20:34 +1200)]
dev/core#918 enotice fix part 2 #14165

5 years agoMerge pull request #14166 from civicrm/5.13
Seamus Lee [Wed, 1 May 2019 00:33:41 +0000 (10:33 +1000)]
Merge pull request #14166 from civicrm/5.13

5.13

5 years agoMerge pull request #14163 from seamuslee001/flexmailer_26
Seamus Lee [Wed, 1 May 2019 00:25:06 +0000 (10:25 +1000)]
Merge pull request #14163 from seamuslee001/flexmailer_26

(flexmailer#29) civicrm/mailing/view - Use Mailing.preview API. Fix compatibility with Flexmailer.

5 years agoMerge pull request #13887 from eileenmcnaughton/group_entity
Eileen McNaughton [Tue, 30 Apr 2019 23:59:47 +0000 (11:59 +1200)]
Merge pull request #13887 from eileenmcnaughton/group_entity

dev/core#818 Partial conversion of Group form to be an EntityForm

5 years agoMerge pull request #14164 from eileenmcnaughton/in_fix
Eileen McNaughton [Tue, 30 Apr 2019 23:41:42 +0000 (11:41 +1200)]
Merge pull request #14164 from eileenmcnaughton/in_fix

Fix deprecation handling [intra-rc-follow up] on #13999]

5 years agoReturn MailingID rather than ['id'] as id may not always be supplied
Seamus Lee [Tue, 30 Apr 2019 23:11:56 +0000 (09:11 +1000)]
Return MailingID rather than ['id'] as id may not always be supplied

5 years ago(flexmailer#29) civicrm/mailing/view - Generate content via Mailing.preview API
Tim Otten [Tue, 30 Apr 2019 22:50:21 +0000 (15:50 -0700)]
(flexmailer#29) civicrm/mailing/view - Generate content via Mailing.preview API

A root cause of flexmailer#29 is that the flexmailer has to override
multiple parts of CiviMail.  Case in point: it overrides the
`civicrm/mailing/view` and forces it to generate content via
`Mailing.preview` API.  This is unfortunate because flexmailer's variant is
missing other features (regarding permissioning and contact IDs).

This revision makes it unnecessary for flexmailer to override
`civicrm/mailing/view`.

5 years agoMerge pull request #14165 from eileenmcnaughton/enotice
colemanw [Tue, 30 Apr 2019 22:44:11 +0000 (18:44 -0400)]
Merge pull request #14165 from eileenmcnaughton/enotice

dev/core#918 Enotice fix

5 years agoMerge pull request #14161 from eileenmcnaughton/really
colemanw [Tue, 30 Apr 2019 22:43:54 +0000 (18:43 -0400)]
Merge pull request #14161 from eileenmcnaughton/really

Convert dedupe select to select 2 and remove not-used var

5 years ago(flexmailer#29) Mailing.preview API - Fix array access warning. Make unit-test pass.
Tim Otten [Tue, 30 Apr 2019 22:42:20 +0000 (15:42 -0700)]
(flexmailer#29) Mailing.preview API - Fix array access warning. Make unit-test pass.

5 years ago(flexmailer#29) Mailing.preview API - Add unit-test for call without contact ID
Tim Otten [Tue, 30 Apr 2019 22:40:46 +0000 (15:40 -0700)]
(flexmailer#29) Mailing.preview API - Add unit-test for call without contact ID

5 years agoEnotice fix
eileen [Tue, 30 Apr 2019 21:57:21 +0000 (09:57 +1200)]
Enotice fix

The check is looking for status at the wrong level in the array

5 years agoflexmailer#26 Fix Flexmailer handling of annonmous user access to view Mailings by...
Seamus Lee [Tue, 30 Apr 2019 20:57:32 +0000 (06:57 +1000)]
flexmailer#26 Fix Flexmailer handling of annonmous user access to view Mailings by porting handling of annon situation to api

5 years agoFix deprecation handling
eileen [Tue, 30 Apr 2019 21:33:26 +0000 (09:33 +1200)]
Fix deprecation handling

Turns out we were one of the sites naughtily using the BAO directly who needed this handling
to work - but because we passed a number in quote it didn't - this fixes

5 years agoMerge pull request #14157 from eileenmcnaughton/ref_dedupe
Seamus Lee [Tue, 30 Apr 2019 21:26:22 +0000 (07:26 +1000)]
Merge pull request #14157 from eileenmcnaughton/ref_dedupe

[REF] function extraction in dedupe code

5 years agoMerge pull request #14162 from civicrm/5.13
Seamus Lee [Tue, 30 Apr 2019 11:06:39 +0000 (21:06 +1000)]
Merge pull request #14162 from civicrm/5.13

5.13

5 years agoMerge pull request #14064 from JMAConsulting/core-338
Yashodha Chaku [Tue, 30 Apr 2019 06:21:27 +0000 (11:51 +0530)]
Merge pull request #14064 from JMAConsulting/core-338

dev/core#338: Batch update membership type

5 years agoMerge pull request #14156 from totten/5.13-mail-tokens
Tim Otten [Tue, 30 Apr 2019 05:50:32 +0000 (22:50 -0700)]
Merge pull request #14156 from totten/5.13-mail-tokens

CiviMail - Restore support for preview of "mailing"/"action" tokens via TokenProcessor/Flexmailer

5 years agoConvert dedupe select to select 2 and remove not-used var
eileen [Tue, 30 Apr 2019 05:01:11 +0000 (17:01 +1200)]
Convert dedupe select to select 2 and remove not-used var

5 years agoCRM_Mailing_TokensTest - Update spec to match expected behavior
Tim Otten [Tue, 30 Apr 2019 04:26:15 +0000 (21:26 -0700)]
CRM_Mailing_TokensTest - Update spec to match expected behavior

The preceding commits revised the behavior of `{mailing.*}` and `{action.*}`
when previewed via `TokenProcessor` (so that they match the preview
logic in other cases).

This simply changes the spec to match.

5 years agoMerge pull request #14159 from civicrm/5.13
Eileen McNaughton [Tue, 30 Apr 2019 02:55:22 +0000 (14:55 +1200)]
Merge pull request #14159 from civicrm/5.13

5.13 to master

5 years agoMerge pull request #14155 from seamuslee001/php_7_2_bin_cli_class
Eileen McNaughton [Tue, 30 Apr 2019 02:54:23 +0000 (14:54 +1200)]
Merge pull request #14155 from seamuslee001/php_7_2_bin_cli_class

dev/core#907 Fix Deprecation notice for PHP7.2 in bin/cli.class.php

5 years ago[REF] function extraction in dedupe code
eileen [Tue, 30 Apr 2019 00:38:15 +0000 (12:38 +1200)]
[REF] function extraction in dedupe code

5 years agoCiviMail - Restore support for previewing mailing-tokens via TokenProcessor/Flexmailer
Tim Otten [Mon, 29 Apr 2019 23:59:35 +0000 (16:59 -0700)]
CiviMail - Restore support for previewing mailing-tokens via TokenProcessor/Flexmailer

See preceding commit for general description - this simply applies the same
concept for another set of tokens.

5 years agoCiviMail - Restore support for previewing action-tokens via TokenProcessor/Flexmailer
Tim Otten [Mon, 29 Apr 2019 20:35:48 +0000 (13:35 -0700)]
CiviMail - Restore support for previewing action-tokens via TokenProcessor/Flexmailer

Overview
--------

When using `TokenProcessor` to generate a mailing (e.g.  as with Flexmailer/Mosaico), the action-tokens (e.g.
`{action.optOutUrl}`) are generated via `CRM_Mailing_ActionTokens`.  To properly generate them,
`CRM_Mailing_ActionTokens` relies on certain information (e.g.  mailing/job ID).  However, that information is no
longer available when performing a "Preview" -- leading to misbehavior in previews.  This patch allows Flexmailer to
restore parity for previewing those tokens.

Before (Pre-5.6)
----------------

* When a user begins composing a mailing, CiviMail creates a draft mailing with a concrete ID (e.g.  `mailing #123`).
* To preview the mailing, the UI calls `Mailing.preview` API with the ID of the mailing.
* Flexmailer/Mosaico generates the preview by calling `TokenProcessor` and therefore `CRM_Mailing_ActionTokens`.
* `CRM_Mailing_ActionTokens` has strictness checks. These pass because the ID is available.

Before (5.6-5.12)
----------------

As a performance enhancement, CiviCRM 5.6 (PR #12509; [dev/mail#20](https://lab.civicrm.org/dev/mail/issues/20)) revised
the signature for `Mailing.preview` API to allow previews *without* having a specific mailing record/job/ID. Consequently:

* When a user begins composing a mailing, CiviMail creates a draft mailing with a concrete ID (e.g.  `mailing #123`).
* To preview the mailing, the UI calls `Mailing.preview` API ~~with~~ **without** the ID of the mailing.
* Flexmailer/Mosaico generates the preview by calling `TokenProcessor` and therefore `CRM_Mailing_ActionTokens`.
* `CRM_Mailing_ActionTokens` has strictness checks. These ~~pass~~ **fail** because the ID is ~~available~~ **unavailable**.

After
----------------

* When a user begins composing a mailing, CiviMail creates a draft mailing with a concrete ID (e.g.  `mailing #123`).
* To preview the mailing, the UI calls `Mailing.preview` API ~~with~~ **without** the ID of the mailing.
* Flexmailer/Mosaico generates the preview by calling `TokenProcessor` and therefore `CRM_Mailing_ActionTokens`.
* `CRM_Mailing_ActionTokens` has ~~strictness~~ **less strict** checks. These **pass** because the `context[schema]` hints that
  a mailing ID *will be available* when needed.

5 years agoMerge pull request #13844 from mattwire/corepaymentmore_essay
Eileen McNaughton [Mon, 29 Apr 2019 22:21:12 +0000 (10:21 +1200)]
Merge pull request #13844 from mattwire/corepaymentmore_essay

Update docblock for doPayment function

5 years agodev/core#907 Fix Deprecation notice for PHP7.2 in bin/cli.class.php
Seamus Lee [Mon, 29 Apr 2019 21:52:49 +0000 (07:52 +1000)]
dev/core#907 Fix Deprecation notice for PHP7.2 in bin/cli.class.php

5 years agoUpdate docblock for doPayment function
Matthew Wire (MJW Consulting) [Sat, 16 Mar 2019 10:43:42 +0000 (10:43 +0000)]
Update docblock for doPayment function

5 years agoMerge pull request #14145 from demeritcowboy/submitOften
Matthew Wire [Mon, 29 Apr 2019 10:32:41 +0000 (11:32 +0100)]
Merge pull request #14145 from demeritcowboy/submitOften

dev/core#904 - undo part of 13333

5 years agoMerge pull request #14144 from eileenmcnaughton/dedupe4
Eileen McNaughton [Sun, 28 Apr 2019 23:40:01 +0000 (11:40 +1200)]
Merge pull request #14144 from eileenmcnaughton/dedupe4

dev/core#723 [REF] extract chunk of code that definitely does something.

5 years agoMerge pull request #14148 from eileenmcnaughton/dedupe8
Eileen McNaughton [Sun, 28 Apr 2019 22:34:25 +0000 (10:34 +1200)]
Merge pull request #14148 from eileenmcnaughton/dedupe8

[REF] extract getConflicts function

5 years ago[REF] extract chunk of code that definitely does something.
eileen [Sat, 27 Apr 2019 04:37:07 +0000 (16:37 +1200)]
[REF] extract chunk of code that definitely does something.

This is a really blunt extraction of a chunk of code whose Raison D'Etre I don't quite know as yet.

I've done the absolute minimum variable cleanup to keep it really clean in the first instance

5 years ago[REF] extract getConflicts function
eileen [Sat, 27 Apr 2019 06:36:12 +0000 (18:36 +1200)]
[REF] extract getConflicts function

This is for readability but I also want to add an api that retrieves conflicts without
trying a merge for more control

5 years agoMerge pull request #14151 from eileenmcnaughton/dedupe7
Seamus Lee [Sun, 28 Apr 2019 04:25:42 +0000 (14:25 +1000)]
Merge pull request #14151 from eileenmcnaughton/dedupe7

[REF] Extract get cfields function

5 years agodev/translation#26 Fix Notice errors caused by l10n rewriting of query so query outpu...
Seamus Lee [Sun, 28 Apr 2019 02:14:09 +0000 (12:14 +1000)]
dev/translation#26 Fix Notice errors caused by l10n rewriting of query so query outputed create view rather than the create table

5 years agoMerge pull request #14150 from eileenmcnaughton/last_free_jcal
Seamus Lee [Sat, 27 Apr 2019 23:18:23 +0000 (09:18 +1000)]
Merge pull request #14150 from eileenmcnaughton/last_free_jcal

dev/core#561 Remove last free jcalendar

5 years agoExtract get cfields function
eileen [Sat, 27 Apr 2019 05:48:38 +0000 (17:48 +1200)]
Extract get cfields function

5 years agoMerge pull request #14119 from eileenmcnaughton/recur_meta
Seamus Lee [Sat, 27 Apr 2019 21:54:54 +0000 (07:54 +1000)]
Merge pull request #14119 from eileenmcnaughton/recur_meta

dev/core#830 [REF] Add unit tests on contribution recur trxn_id, contribution recur processor id

5 years agoRemove last free jcalendar
eileen [Sat, 27 Apr 2019 07:34:20 +0000 (19:34 +1200)]
Remove last free jcalendar

This is the last jcalendar outside of buildDateRange instances.

It turns out to be 'just a form' and pretty straight forward

5 years agoMerge pull request #14146 from eileenmcnaughton/dedupe6
Seamus Lee [Sat, 27 Apr 2019 21:46:10 +0000 (07:46 +1000)]
Merge pull request #14146 from eileenmcnaughton/dedupe6

dev/core#723 [REF] Declare contactType var rather than using long array syntax.

5 years agoMerge pull request #14149 from eileenmcnaughton/exreport
Seamus Lee [Sat, 27 Apr 2019 21:44:41 +0000 (07:44 +1000)]
Merge pull request #14149 from eileenmcnaughton/exreport

[cleanup] remove CRM_Report_Form_Extended

5 years agofix save and new
DemeritCowboy [Sat, 27 Apr 2019 20:28:47 +0000 (16:28 -0400)]
fix save and new

5 years agoMerge pull request #14134 from stesi561/dev/core/248
Mathieu Lu [Sat, 27 Apr 2019 20:07:08 +0000 (16:07 -0400)]
Merge pull request #14134 from stesi561/dev/core/248

dev/core#248 - Fixes advanced search mailings results headers

5 years agoMerge pull request #14141 from seamuslee001/view_url_double_protocol_test
Seamus Lee [Sat, 27 Apr 2019 09:32:31 +0000 (19:32 +1000)]
Merge pull request #14141 from seamuslee001/view_url_double_protocol_test

(NFC) Expand unit test to show off double protocol error

5 years ago(NFC) Expand unit test to show off double protocol error
Seamus Lee [Sat, 27 Apr 2019 04:16:19 +0000 (14:16 +1000)]
(NFC) Expand unit test to show off double protocol error

Expand test to include situation if the Other protocol is set rather than a specific protocol

Make test portable

5 years ago[cleanup] remove CRM_Report_Form_Extended
eileen [Sat, 27 Apr 2019 06:48:09 +0000 (18:48 +1200)]
[cleanup] remove CRM_Report_Form_Extended

This file was added to core around 4.2 but for various reasons the ExtendedReport intiative
moved to an extension & it was never used. This just removes it

5 years agoDeclare contactType var rather than using long array syntax.
eileen [Sat, 27 Apr 2019 05:40:14 +0000 (17:40 +1200)]
Declare contactType var rather than using long array syntax.

Very small tidy up for legibility

5 years agoMerge pull request #14142 from eileenmcnaughton/dedupe2
Eileen McNaughton [Sat, 27 Apr 2019 05:45:44 +0000 (17:45 +1200)]
Merge pull request #14142 from eileenmcnaughton/dedupe2

 [REF] move gathering of location info to relevant function (towards dev/core#723)

5 years agoMerge pull request #14143 from eileenmcnaughton/dedupe3
Eileen McNaughton [Sat, 27 Apr 2019 05:31:01 +0000 (17:31 +1200)]
Merge pull request #14143 from eileenmcnaughton/dedupe3

dev/core#560 Remove a couple of instances of fatal errors in favour of throwing exceptions