Tim Otten [Mon, 6 May 2019 19:34:37 +0000 (12:34 -0700)]
(dev/core#934; followup) Fix escaping on new query code
This updates a line which was added in the past day (#14194) to ensure that
the data is escaped.
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'
eileen [Fri, 3 May 2019 02:37:14 +0000 (14:37 +1200)]
dev/core#934 Fix regression on sorting activity tab by 'Added by'
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…
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.
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
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
Tim Otten [Thu, 2 May 2019 22:48:16 +0000 (15:48 -0700)]
Update 5.13.1.md
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
Seamus Lee [Thu, 2 May 2019 21:30:39 +0000 (07:30 +1000)]
Add in release notes for 5.13.1 drop
Jon Goldberg [Thu, 2 May 2019 20:00:19 +0000 (16:00 -0400)]
wordpress#26 - fix REST
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…
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
CiviCRM [Thu, 2 May 2019 04:35:35 +0000 (04:35 +0000)]
Set version to 5.14.beta1
Seamus Lee [Thu, 2 May 2019 02:29:36 +0000 (12:29 +1000)]
Merge pull request #14176 from civicrm/5.13
5.13
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
Tim Otten [Wed, 1 May 2019 23:50:50 +0000 (16:50 -0700)]
Update 5.13.0.md
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
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
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
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
Mathieu Lutfy [Wed, 1 May 2019 15:08:06 +0000 (11:08 -0400)]
Event Cart: pass the contactID to fix payment on Stripe
Andrew Hunt [Wed, 1 May 2019 21:23:38 +0000 (17:23 -0400)]
5.13.0 release notes: late changes
Alice Frumin [Thu, 25 Apr 2019 20:12:08 +0000 (16:12 -0400)]
uppercase if work is continued or begun
Alice Frumin [Thu, 25 Apr 2019 20:06:12 +0000 (16:06 -0400)]
moving gitlab issues to the end
Alice Frumin [Tue, 16 Apr 2019 17:21:09 +0000 (13:21 -0400)]
5.13.0 release notes: bulk of edits
Andrew Hunt [Mon, 15 Apr 2019 21:01:28 +0000 (17:01 -0400)]
5.13.0 release notes: added boilerplate
Andrew Hunt [Mon, 15 Apr 2019 19:21:33 +0000 (15:21 -0400)]
5.13.0 release notes: raw from script
Mathieu Lutfy [Wed, 1 May 2019 15:33:37 +0000 (11:33 -0400)]
Event Cart: add support for the Credit Card type icons
Mathieu Lutfy [Wed, 1 May 2019 15:13:28 +0000 (11:13 -0400)]
Event Cart: honor the allow_same_participant_emails setting
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
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
Mathieu Lutfy [Wed, 1 May 2019 10:32:52 +0000 (06:32 -0400)]
Event Cart: fix sending of email receipts
Mathieu Lutfy [Wed, 1 May 2019 10:25:00 +0000 (06:25 -0400)]
Event Cart: fix start_date formatting in line items during checkout
eileen [Wed, 1 May 2019 08:34:34 +0000 (20:34 +1200)]
dev/core#918 enotice fix part 2 #14165
Seamus Lee [Wed, 1 May 2019 00:33:41 +0000 (10:33 +1000)]
Merge pull request #14166 from civicrm/5.13
5.13
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.
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
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]
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
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`.
colemanw [Tue, 30 Apr 2019 22:44:11 +0000 (18:44 -0400)]
Merge pull request #14165 from eileenmcnaughton/enotice
dev/core#918 Enotice fix
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
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.
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
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
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
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
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
Seamus Lee [Tue, 30 Apr 2019 11:06:39 +0000 (21:06 +1000)]
Merge pull request #14162 from civicrm/5.13
5.13
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
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
eileen [Tue, 30 Apr 2019 05:01:11 +0000 (17:01 +1200)]
Convert dedupe select to select 2 and remove not-used var
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.
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
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
eileen [Tue, 30 Apr 2019 00:38:15 +0000 (12:38 +1200)]
[REF] function extraction in dedupe code
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.
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.
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
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
Matthew Wire (MJW Consulting) [Sat, 16 Mar 2019 10:43:42 +0000 (10:43 +0000)]
Update docblock for doPayment function
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
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.
Eileen McNaughton [Sun, 28 Apr 2019 22:34:25 +0000 (10:34 +1200)]
Merge pull request #14148 from eileenmcnaughton/dedupe8
[REF] extract getConflicts function
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
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
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
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
eileen [Sat, 27 Apr 2019 05:48:38 +0000 (17:48 +1200)]
Extract get cfields function
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
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
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.
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
DemeritCowboy [Sat, 27 Apr 2019 20:28:47 +0000 (16:28 -0400)]
fix save and new
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
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
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
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
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
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)
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
Seamus Lee [Sat, 27 Apr 2019 05:23:22 +0000 (15:23 +1000)]
Merge pull request #14140 from eileenmcnaughton/dedupe
[REF] Move the qfbug handling to it's own function (towards dev/core#723)
Seamus Lee [Sat, 27 Apr 2019 04:40:00 +0000 (14:40 +1000)]
Merge pull request #14128 from agileware/CIVICRM-1143
Fixed double protocol being added in link by CKEditor.
eileen [Sat, 27 Apr 2019 04:28:33 +0000 (16:28 +1200)]
Remove a couple of instances of fatal errors in favour of throwing exceptions
https://lab.civicrm.org/dev/core/issues/560
eileen [Sat, 27 Apr 2019 04:13:00 +0000 (16:13 +1200)]
[REF] move gathering of location info to relevant function
We have a loop that parses the migrationInfo to get just location fields which we loop through, but
migrationInfo is already available in the moveLocationInfo fn so we can just handle that param in there
& improve code readability (we do a little less array looping but it's pretty cheap & the code
readabiliity is a real issue here
eileen [Sat, 27 Apr 2019 03:58:34 +0000 (15:58 +1200)]
Move the qfbug handling to it's own function
This is a really toxi function. In order to save the pain or iterating multiple times through a small array
we are dealing with an awful lot of complexity. I'm changing this to iterate through it multiple
times in order to rationalise the code - I think performance is minimal & being able to read the code....
Seamus Lee [Sat, 27 Apr 2019 02:03:37 +0000 (12:03 +1000)]
Merge pull request #14139 from agh1/upgrade-rebuild-caseact-views
dev/core#832 CiviCase: rebuild case activity views during upgrade
Andrew Hunt [Sat, 27 Apr 2019 00:10:33 +0000 (20:10 -0400)]
dev/core#832 CiviCase: rebuild case activity views during upgrade
Luke Stewart [Fri, 26 Apr 2019 21:49:51 +0000 (09:49 +1200)]
Use CRM_Core_I18n::isMultiLingual() to detect if is multilingual
Luke Stewart [Fri, 26 Apr 2019 21:33:37 +0000 (09:33 +1200)]
Fix extra space
Coleman Watts [Fri, 26 Apr 2019 14:09:02 +0000 (10:09 -0400)]
Better variable name
Coleman Watts [Fri, 26 Apr 2019 12:56:46 +0000 (08:56 -0400)]
Alter menubar breakpoint to match WP admin theme
Coleman Watts [Fri, 26 Apr 2019 03:01:03 +0000 (23:01 -0400)]
Add hook to influince menubar css variables
Coleman Watts [Fri, 26 Apr 2019 02:48:14 +0000 (22:48 -0400)]
Add css variable for menubar breakpoint
Luke Stewart [Fri, 26 Apr 2019 08:00:45 +0000 (20:00 +1200)]
dev/core/248 - Fixes advanced search results headers mailings
Removes language from advanced search results mailings column
headers for non-multilingual sites.
Tim Otten [Fri, 26 Apr 2019 06:54:08 +0000 (23:54 -0700)]
Merge pull request #14131 from colemanw/resourceList
[REF] Use events for CMS resource loading
eileen [Wed, 24 Apr 2019 07:01:32 +0000 (19:01 +1200)]
Add unit tests on contribution recur trxn_id, contribution recur processor id
This is preliminary cleanup towards exposing cancel_reason as a search field, as committed to in proposal to
add the field. This change
- adds unit tests for the trxn_id & processor_id fields
- makes the handling of them more generic
- adds contribution recur field data to the contribution query object so it can be accessed.
Some points about the last of these. Basically we have a situation where the query object needs metadata to
avoid field by field handling. We have done this is some wierd & wonderful ways with dependencies on 'import' &
'export' metadata info to the point where they were given to so many fields as to become meaningless.
I think this method is better - ie. just adding the additional metadata to the query class for all the entities it
deals with. A recently merged PR means 'where' data is still available using this method.
Also I have added uniquenames to the contribution recur fields. Uniquenames no longer really matter outside
- the query object
- profiles
- possibly import & export
We only really expose recurring contribution info through the query object of these so it should be safe. In a future happy
space apiv4 & namespacing will render uniquenames a distant memory.
I couldn't rip out the special handling entirely without dealing with the labels that go into the qill. I figure
we should merge this & then address that - but briefly the issue is that Matt has just changed all the labels
to not quite work in this context so we need to discuss / agree how to manage 'Recurring Contribution Trxn ID' vs
'Trxn ID'.
I also didn't want to rip out the special handling fully in advance of https://github.com/civicrm/civicrm-core/pull/14118
being merged as there could be a performance regression if we let more code hit that unnecessary join line
Seamus Lee [Fri, 26 Apr 2019 02:53:00 +0000 (12:53 +1000)]
Merge pull request #14133 from civicrm/5.13
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