civicrm-core.git
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 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 #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 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 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 #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 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 #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 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 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 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 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 #14132 from seamuslee001/5.13
Seamus Lee [Fri, 26 Apr 2019 01:03:59 +0000 (11:03 +1000)]
Merge pull request #14132 from seamuslee001/5.13

Add 5.12.4 release notes

5 years agoUpdate 5.12.4.md
Tim Otten [Thu, 25 Apr 2019 23:42:50 +0000 (16:42 -0700)]
Update 5.12.4.md

5 years agoUpdate 5.12.4.md
Tim Otten [Thu, 25 Apr 2019 23:42:03 +0000 (16:42 -0700)]
Update 5.12.4.md

5 years agoUpdate release notes
Seamus Lee [Thu, 25 Apr 2019 23:31:42 +0000 (09:31 +1000)]
Update release notes

5 years agoAdd 5.12.4 release notes
Seamus Lee [Thu, 25 Apr 2019 01:11:43 +0000 (11:11 +1000)]
Add 5.12.4 release notes

5 years agoMerge pull request #14126 from seamuslee001/dev_core_880
Seamus Lee [Thu, 25 Apr 2019 09:38:10 +0000 (19:38 +1000)]
Merge pull request #14126 from seamuslee001/dev_core_880

Fix typo in DROP table query.

5 years agoFix typo in DROP table query.
mark burdett [Wed, 24 Apr 2019 18:32:32 +0000 (11:32 -0700)]
Fix typo in DROP table query.

5 years agoMerge pull request #14114 from lcdservices/5.13
Seamus Lee [Tue, 23 Apr 2019 04:17:21 +0000 (14:17 +1000)]
Merge pull request #14114 from lcdservices/5.13

dev/core#891 condition on id existenced when retrieving mailing hash

5 years agodev/core#891 condition on id existenced when retrieving mailing hash
Brian Shaughnessy [Tue, 23 Apr 2019 01:43:19 +0000 (21:43 -0400)]
dev/core#891 condition on id existenced when retrieving mailing hash

5 years agoMerge pull request #14100 from seamuslee001/5.13
Seamus Lee [Mon, 22 Apr 2019 01:52:07 +0000 (11:52 +1000)]
Merge pull request #14100 from seamuslee001/5.13

Add release-notes/5.12.3.md

5 years agoAdd release-notes/5.12.3.md
Tim Otten [Sat, 20 Apr 2019 15:44:42 +0000 (08:44 -0700)]
Add release-notes/5.12.3.md

5 years agoMerge pull request #14092 from eileenmcnaughton/search_513
Seamus Lee [Sat, 20 Apr 2019 02:18:43 +0000 (12:18 +1000)]
Merge pull request #14092 from eileenmcnaughton/search_513

dev/core#887 Fix fatal error on pledge search

5 years agodev/core#887 Fix fatal error on pledge search
eileen [Sat, 20 Apr 2019 00:56:36 +0000 (10:56 +1000)]
dev/core#887 Fix fatal error on pledge search

5 years agoMerge pull request #14090 from seamuslee001/5.13
Tim Otten [Fri, 19 Apr 2019 23:05:14 +0000 (16:05 -0700)]
Merge pull request #14090 from seamuslee001/5.13

Add release-notes/5.12.2.md

5 years agoAdd release-notes/5.12.2.md
Tim Otten [Fri, 19 Apr 2019 22:59:22 +0000 (15:59 -0700)]
Add release-notes/5.12.2.md

5 years agoMerge pull request #14067 from colemanw/menuZindex
colemanw [Thu, 18 Apr 2019 17:58:18 +0000 (13:58 -0400)]
Merge pull request #14067 from colemanw/menuZindex

Menubar z-index fixes

5 years agoBetter variable name
Coleman Watts [Tue, 16 Apr 2019 20:40:36 +0000 (16:40 -0400)]
Better variable name

5 years agoSimplify hiding CMS elements behind modal dialogs
Coleman Watts [Tue, 16 Apr 2019 20:36:42 +0000 (16:36 -0400)]
Simplify hiding CMS elements behind modal dialogs

Using css instead of js makes this a lot simpler

5 years agoMerge pull request #13956 from seamuslee001/dev_mail_41
Eileen McNaughton [Thu, 18 Apr 2019 04:43:42 +0000 (14:43 +1000)]
Merge pull request #13956 from seamuslee001/dev_mail_41

dev/mail#41 Do not generate tracking urls if no mailing id has been p…

5 years agoDrupal#56 - fix quicksearch text color on D8
Jon Goldberg [Wed, 17 Apr 2019 20:04:06 +0000 (16:04 -0400)]
Drupal#56 - fix quicksearch text color on D8

5 years agodev/mail#41 Do not generate tracking urls if no mailing id has been passed in
Seamus Lee [Thu, 4 Apr 2019 04:33:57 +0000 (15:33 +1100)]
dev/mail#41 Do not generate tracking urls if no mailing id has been passed in

5 years agoRemove unnecessary d7 script
Coleman Watts [Tue, 16 Apr 2019 17:40:59 +0000 (13:40 -0400)]
Remove unnecessary d7 script

This is now obsolete due to the new SmartMenus, the drupal tool-drawer
is no longer in the way of dialogs.

5 years agoLower z-index of menubar in body
Coleman Watts [Tue, 16 Apr 2019 17:37:28 +0000 (13:37 -0400)]
Lower z-index of menubar in body

Avoid menubar appearing on top of dialogs which have a z-index of 101

5 years agoCorrectly size UI dialog accounting for height of menubar
Coleman Watts [Tue, 16 Apr 2019 17:36:32 +0000 (13:36 -0400)]
Correctly size UI dialog accounting for height of menubar

5 years agoAdd body class when dialog is open
Coleman Watts [Tue, 16 Apr 2019 17:33:05 +0000 (13:33 -0400)]
Add body class when dialog is open

This should make it easier for reacting to the presence of a dialog with css.

5 years ago5.12.1.md - Fix attribution
Tim Otten [Tue, 16 Apr 2019 09:08:37 +0000 (02:08 -0700)]
5.12.1.md - Fix attribution

5 years agoMerge pull request #14061 from totten/5.13-port-notes
Seamus Lee [Tue, 16 Apr 2019 08:47:02 +0000 (18:47 +1000)]
Merge pull request #14061 from totten/5.13-port-notes

Add release-notes/5.12.1.md

5 years agoAdd release-notes/5.12.1.md
Tim Otten [Tue, 16 Apr 2019 00:37:18 +0000 (17:37 -0700)]
Add release-notes/5.12.1.md

5 years agoMerge pull request #14051 from eileenmcnaughton/inv
Seamus Lee [Mon, 15 Apr 2019 21:16:25 +0000 (07:16 +1000)]
Merge pull request #14051 from eileenmcnaughton/inv

dev/core#534 Re-instate pay-now button

5 years agodev/core#534 Re-instate pay-now button
eileen [Mon, 15 Apr 2019 02:01:21 +0000 (12:01 +1000)]
dev/core#534 Re-instate pay-now button

This is regression - likely for a few months? Fix adds a unit test & does some additional tidy up

We should consider for 5.12

5 years agoMerge pull request #14046 from totten/5.13-schema-fmt
Seamus Lee [Sun, 14 Apr 2019 00:03:22 +0000 (10:03 +1000)]
Merge pull request #14046 from totten/5.13-schema-fmt

(NFC) SchemaStructure.php - Fix up mismatch between stored+generated code

5 years ago(NFC) SchemaStructure.php - Fix up mismatch between stored+generated code
Tim Otten [Sat, 13 Apr 2019 20:19:09 +0000 (13:19 -0700)]
(NFC) SchemaStructure.php - Fix up mismatch between stored+generated code

Overview
--------

The class `CRM_Core_I18n_SchemaStructure` is autogenerated via GenCode, and it is also commited to git.
The two forms don't match because of the recent code-style cleanup.

Before
------

After running GenCode, there appears to be uncommitted changes in `CRM_Core_I18n_SchemaStructure`.
The changes indicate a reversion in code-style (e.g. `null` vs `NULL`; some whitespace).

After
-----

GenCode produces output which matches the recent cleanup.

Comments
--------

Fixing `null` / `NULL` was easy. However, the whitespace mismatch was more subtle -- because the
`PHP_Beautifier` was messing it up. To resolve, I disabled `PHP_Beautifier` for this file, and fixed
the underlying templates to generate well-formed code.

The output of the process matches the existing code; therefore, the change
have no functional impact (NFC).  You can see this by running `setup.sh` and
checking the `git status`.

5 years agoMerge pull request #14036 from eileenmcnaughton/5.13
Eileen McNaughton [Thu, 11 Apr 2019 23:49:43 +0000 (11:49 +1200)]
Merge pull request #14036 from eileenmcnaughton/5.13

Arg I put these fixes in 5.12 & master while trying for 5.13

5 years agoMerge pull request #14031 from seamuslee001/phpcs_disable_mcrypt
Eileen McNaughton [Thu, 11 Apr 2019 23:30:35 +0000 (11:30 +1200)]
Merge pull request #14031 from seamuslee001/phpcs_disable_mcrypt

Disable phpcs checking in the Crypt files where mcrypt functions are

5 years agoMerge pull request #14032 from seamuslee001/ingore_eval
Eileen McNaughton [Thu, 11 Apr 2019 23:30:17 +0000 (11:30 +1200)]
Merge pull request #14032 from seamuslee001/ingore_eval

(NFC) Ensure phpcs ignores eval notice in these files as it is required

5 years agoadd test
DemeritCowboy [Wed, 10 Apr 2019 00:59:15 +0000 (20:59 -0400)]
add test

5 years agofix array and notice
DemeritCowboy [Wed, 10 Apr 2019 00:42:18 +0000 (20:42 -0400)]
fix array and notice

5 years ago(NFC) Ensure phpcs ignores eval notice in these files as it is required
Seamus Lee [Thu, 11 Apr 2019 22:06:43 +0000 (08:06 +1000)]
(NFC) Ensure phpcs ignores eval notice in these files as it is required

5 years agoDisable phpcs checking in the Crypt files where mcrypt functions are
Seamus Lee [Thu, 11 Apr 2019 21:59:12 +0000 (07:59 +1000)]
Disable phpcs checking in the Crypt files where mcrypt functions are

5 years agoMerge pull request #14025 from seamuslee001/coder_lint_alt_php
Seamus Lee [Thu, 11 Apr 2019 03:40:34 +0000 (13:40 +1000)]
Merge pull request #14025 from seamuslee001/coder_lint_alt_php

(NFC) Lint additional php files up to the new coder standard

5 years ago(NFC) Lint additional php files up to the new coder standard
Seamus Lee [Thu, 11 Apr 2019 01:10:56 +0000 (11:10 +1000)]
(NFC) Lint additional php files up to the new coder standard

5 years agoMerge pull request #14026 from seamuslee001/5.13
Tim Otten [Thu, 11 Apr 2019 02:28:40 +0000 (19:28 -0700)]
Merge pull request #14026 from seamuslee001/5.13

Port Code Style Fixes to 5.13 from master

5 years ago(NFC) Minor code style fixes
Seamus Lee [Tue, 9 Apr 2019 23:39:27 +0000 (09:39 +1000)]
(NFC) Minor code style fixes

5 years ago(NFC) Update CRM/Contact to match new coder style
Seamus Lee [Wed, 10 Apr 2019 21:11:37 +0000 (07:11 +1000)]
(NFC) Update CRM/Contact to match new coder style

5 years agoMerge pull request #14023 from seamuslee001/core_dedupe_custom
colemanw [Wed, 10 Apr 2019 23:01:06 +0000 (19:01 -0400)]
Merge pull request #14023 from seamuslee001/core_dedupe_custom

(NFC) Update CRM/Core CRM/Custom CRM/Dedupe to match the new coder style

5 years agoMerge pull request #14019 from seamuslee001/event_new_style
Seamus Lee [Wed, 10 Apr 2019 22:49:43 +0000 (08:49 +1000)]
Merge pull request #14019 from seamuslee001/event_new_style

(NFC) Update CRM/Event folder for the new coder style

5 years agoMerge pull request #14021 from seamuslee001/contribute_new_coder
Seamus Lee [Wed, 10 Apr 2019 21:55:24 +0000 (07:55 +1000)]
Merge pull request #14021 from seamuslee001/contribute_new_coder

(NFC) update CRM/Contribute to be the new coder standard

5 years ago(NFC) Update CRM/Core CRM/Custom CRM/Dedupe to match the new coder style
Seamus Lee [Wed, 10 Apr 2019 21:36:06 +0000 (07:36 +1000)]
(NFC) Update CRM/Core CRM/Custom CRM/Dedupe to match the new coder style

5 years agoMerge pull request #14016 from seamuslee001/mailing_group_grant_friend_new_style
colemanw [Wed, 10 Apr 2019 21:27:25 +0000 (17:27 -0400)]
Merge pull request #14016 from seamuslee001/mailing_group_grant_friend_new_style

(NFC) Update CRM/Friend CRM/Grant CRM/Group CRM/Mailing to be up to d…

5 years agoMerge pull request #14017 from seamuslee001/batch_campaign_case_new_style
colemanw [Wed, 10 Apr 2019 21:26:04 +0000 (17:26 -0400)]
Merge pull request #14017 from seamuslee001/batch_campaign_case_new_style

(NFC) Update CRM/Badge CRM/Campaign CRM/Case to be up to date with a …

5 years agoMerge pull request #14018 from seamuslee001/financial_extension_export_cxn_dashlet
colemanw [Wed, 10 Apr 2019 21:25:07 +0000 (17:25 -0400)]
Merge pull request #14018 from seamuslee001/financial_extension_export_cxn_dashlet

(NFC) Update CRM/Cxn CRM/Dashlet CRM/Export CRM/Extension and CRM/Fin…

5 years ago(NFC) update CRM/Contribute to be the new coder standard
Seamus Lee [Wed, 10 Apr 2019 20:33:50 +0000 (06:33 +1000)]
(NFC) update CRM/Contribute to be the new coder standard

5 years ago(NFC) Update CRM/Friend CRM/Grant CRM/Group CRM/Mailing to be up to date to a future...
Seamus Lee [Wed, 10 Apr 2019 00:25:23 +0000 (10:25 +1000)]
(NFC) Update CRM/Friend CRM/Grant CRM/Group CRM/Mailing to be up to date to a future coder version

5 years ago(NFC) Update CRM/Cxn CRM/Dashlet CRM/Export CRM/Extension and CRM/Financial files...
Seamus Lee [Wed, 10 Apr 2019 01:21:31 +0000 (11:21 +1000)]
(NFC) Update CRM/Cxn CRM/Dashlet CRM/Export CRM/Extension and CRM/Financial files to new coder style

5 years ago(NFC) Update CRM/Event folder for the new coder style
Seamus Lee [Wed, 10 Apr 2019 02:49:09 +0000 (12:49 +1000)]
(NFC) Update CRM/Event folder for the new coder style

5 years ago(NFC) Update CRM/Badge CRM/Campaign CRM/Case to be up to date with a newer coder
Seamus Lee [Wed, 10 Apr 2019 00:48:27 +0000 (10:48 +1000)]
(NFC) Update CRM/Badge CRM/Campaign CRM/Case to be up to date with a newer coder

5 years agoSet version to 5.13.beta1
CiviCRM [Tue, 9 Apr 2019 17:55:28 +0000 (17:55 +0000)]
Set version to 5.13.beta1

5 years agoMerge pull request #13551 from eileenmcnaughton/ext_up
Tim Otten [Tue, 9 Apr 2019 17:46:18 +0000 (10:46 -0700)]
Merge pull request #13551 from eileenmcnaughton/ext_up

Load hooks during upgrade mode

5 years agoAdded myself
Joe Murray [Tue, 9 Apr 2019 15:22:26 +0000 (11:22 -0400)]
Added myself

5 years agoLoad hooks during upgrade mode
eileen [Wed, 6 Feb 2019 21:48:02 +0000 (10:48 +1300)]
Load hooks during upgrade mode

For unknown, svn, reasons extension hooks are not loaded during upgrade
(this doesn't apply to drupal modules) - this causes some fairly serious problems
1) settings are re-loaded & cached with settings from extensions being lost
2) trigger alter hooks are lost this means
 - the summary fields triggers are frequently lost on upgrade
 - hooks that unset various tables to prevent them from being logged can fail, resulting in those log tables being created
 - hooks that specify the table should be innodb can fail to run, resulting in archive format.

I can't think WHY we do this? Presumably there was some problem that would have been better solved another
way but which was solved this way?

Fix "Load hooks during upgrade mode" (45312e1e64dd6af0281fe5fb7f96dbd8be39e524)

In my testing, the commit doesn't do what it says because the symbols are wrong.

5 years agoMerge pull request #14005 from colemanw/shortSettings
Eileen McNaughton [Tue, 9 Apr 2019 03:47:53 +0000 (15:47 +1200)]
Merge pull request #14005 from colemanw/shortSettings

[NFC] Short array syntax - auto convert settings dir

5 years agoMerge pull request #13995 from eileenmcnaughton/loc_title
Eileen McNaughton [Tue, 9 Apr 2019 03:47:35 +0000 (15:47 +1200)]
Merge pull request #13995 from eileenmcnaughton/loc_title

dev/financial#2 Update new payment_processor.title field to be localisable

5 years agoMerge pull request #14007 from colemanw/colorTest
Eileen McNaughton [Tue, 9 Apr 2019 03:46:39 +0000 (15:46 +1200)]
Merge pull request #14007 from colemanw/colorTest

Improve test coverage for CRM_Utils_Color::getRgb()

5 years agoMerge pull request #14009 from eileenmcnaughton/recur_flush
Eileen McNaughton [Tue, 9 Apr 2019 03:07:24 +0000 (15:07 +1200)]
Merge pull request #14009 from eileenmcnaughton/recur_flush

Improve flushing after creating a processor so it can be used for a recurring in the same run

5 years agoMerge pull request #14008 from totten/master-hook
Eileen McNaughton [Tue, 9 Apr 2019 03:06:58 +0000 (15:06 +1200)]
Merge pull request #14008 from totten/master-hook

(REF) CRM_Core_Resources - Move hook declaration from addCoreResources() to Container.php

5 years agoMerge pull request #14006 from eileenmcnaughton/payment_pay
Eileen McNaughton [Tue, 9 Apr 2019 02:23:21 +0000 (14:23 +1200)]
Merge pull request #14006 from eileenmcnaughton/payment_pay

Include lower level data when throwing an exception on payment processor.pay

5 years agoMerge pull request #14002 from colemanw/menuConfig
Eileen McNaughton [Tue, 9 Apr 2019 02:09:22 +0000 (14:09 +1200)]
Merge pull request #14002 from colemanw/menuConfig

Menu config screen improvements

5 years agoImprove flushing after creating a processor so it can be used for a recurring in...
eileen [Tue, 9 Apr 2019 01:56:09 +0000 (13:56 +1200)]
Improve flushing after creating a processor so it can be used for a recurring in the same run

Mostly affects tests....

5 years agoMerge pull request #14000 from eileenmcnaughton/recur_fn
Seamus Lee [Tue, 9 Apr 2019 01:48:18 +0000 (11:48 +1000)]
Merge pull request #14000 from eileenmcnaughton/recur_fn

Add unit testing for activity creation when cancelling a recurring, related cleanup

5 years agoShort array syntax - auto convert settings dir
Coleman Watts [Tue, 9 Apr 2019 00:29:07 +0000 (20:29 -0400)]
Short array syntax - auto convert settings dir

5 years agoUpdate new payment_processor.title field to be localisable
eileen [Sun, 7 Apr 2019 22:16:10 +0000 (10:16 +1200)]
Update new payment_processor.title field to be localisable

Re-order upgrade to fix upgrade process and ensure there is the runSql step

5 years agocolorTest
Coleman Watts [Tue, 9 Apr 2019 01:08:59 +0000 (21:08 -0400)]
colorTest

5 years ago(REF) CRM_Core_Resources - Move hook declaration from addCoreResources() to Container.php
Tim Otten [Mon, 8 Apr 2019 23:13:48 +0000 (16:13 -0700)]
(REF) CRM_Core_Resources - Move hook declaration from addCoreResources() to Container.php

tldr: It's easier to declare `hook_civicrm_buildAsset` listeners at a high-level.

Asset building can use two modes -- production mode writes a static file to
disk when it's being reference.  Debug mode just generates a URL for a
web-service (which in turn dynamically renders the content in a separate
page-view).

If the only mode were production mode, then the code would be on pretty
solid ground.  We could even simplify things a lot by changing the
AssetBuilder contract to replace the hooks with callbacks, as in:

```php
Civi::service('asset_builder')->getUrl('crm-menu.css', function() {
  return '...the css code...';
});
```

Why have a hook?  Because hooks are generally context-free and
always-available.  If we use debug-mode (or if we add a feature to warm-up
the caches during deployment), then we'll want to fire that hook from a
different context (e.g.  web-service or CLI), and the hook-listener needs to
be available in those other contexts.

It would be nice if we could declare hooks generally without needing to edit
the `Container.php` mega-file (e.g.  maybe some kind of annotation).  But,
for the moment, I think this is the best spot that we have in `civicrm-core`
for ensuring that hook listeners are fully/consistently registered.

5 years agoMerge pull request #13996 from colemanw/menuColor
Tim Otten [Tue, 9 Apr 2019 01:05:16 +0000 (18:05 -0700)]
Merge pull request #13996 from colemanw/menuColor

Configurable menubar color

5 years agoInclude lower level data when throwing an exception on payment processor.pay
eileen [Tue, 9 Apr 2019 00:51:57 +0000 (12:51 +1200)]
Include lower level data when throwing an exception on payment processor.pay

5 years agoPass menubar preference as a param. Simplify cache mechanics. (#8)
Tim Otten [Mon, 8 Apr 2019 23:20:36 +0000 (16:20 -0700)]
Pass menubar preference as a param. Simplify cache mechanics. (#8)

Ex: If an admin uses an API call (CLI/REST) to change the menubar color,
then they don't need to follow-up with a cache-clear.  The new setting just
goes live.

Ex: If a customization (via `civicrm.settings.php` or via extension) decides
on the color scheme programmatically (e.g.  per-domain or per-role or
per-user-preference), then they don't need to clear cache.  Multiple color
schemes can coexist.

5 years agoMerge pull request #14003 from seamuslee001/sl_fix_4_7_31_upgrade
Seamus Lee [Mon, 8 Apr 2019 23:19:39 +0000 (09:19 +1000)]
Merge pull request #14003 from seamuslee001/sl_fix_4_7_31_upgrade

Fix 4.7.31 Upgrade in multilingual mode

5 years agoAdd unit testing for activity creation when cancelling a recurring, related cleanup
eileen [Mon, 8 Apr 2019 03:25:46 +0000 (15:25 +1200)]
Add unit testing for activity creation when cancelling a recurring, related cleanup

5 years agoFix 4.7.31 Upgrade in multilingual mode
Seamus Lee [Mon, 8 Apr 2019 21:56:01 +0000 (07:56 +1000)]
Fix 4.7.31 Upgrade in multilingual mode