Seamus Lee [Sat, 18 Jul 2020 08:57:43 +0000 (18:57 +1000)]
Merge pull request #17880 from colemanw/headerComments
[NFC] Fix nonstandard header comments
Eileen McNaughton [Sat, 18 Jul 2020 03:03:03 +0000 (15:03 +1200)]
Merge pull request #17480 from tunbola/email-template-perms
dev/core#1751: [Create Email] Only Show Update/Save Template when User has Permission to Edit Templates
Coleman Watts [Sat, 18 Jul 2020 01:21:59 +0000 (21:21 -0400)]
Fix nonstandard header comments
Seamus Lee [Fri, 17 Jul 2020 23:12:29 +0000 (09:12 +1000)]
Merge pull request #17874 from colemanw/checkPermShort
Use new checkPermissions shorthand in api calls
Eileen McNaughton [Fri, 17 Jul 2020 22:40:31 +0000 (10:40 +1200)]
Merge pull request #17878 from civicrm/5.28
5.28
Eileen McNaughton [Fri, 17 Jul 2020 22:17:39 +0000 (10:17 +1200)]
Merge pull request #17846 from mattwire/optimiseclearcaches
Simplify flushing group contact cache query to reduce table locking and improve performance
Seamus Lee [Fri, 17 Jul 2020 21:58:17 +0000 (07:58 +1000)]
Merge pull request #17806 from demeritcowboy/mail-report-csv-bom
dev/core#1869 - Include BOM in attachment when sending CSV CiviReport via mail_report job
Seamus Lee [Fri, 17 Jul 2020 21:55:29 +0000 (07:55 +1000)]
Merge pull request #17875 from colemanw/customFieldVersionCheck
Ensure serialize field exists before adding to query
Coleman Watts [Fri, 17 Jul 2020 16:16:35 +0000 (12:16 -0400)]
Ensure serialize field exists before adding to query
Mathieu Lu [Fri, 17 Jul 2020 15:54:47 +0000 (11:54 -0400)]
Merge pull request #16838 from mlutfy/core1280
dev/core#1280 Fix ContributionPage soft_credit translation
Coleman Watts [Fri, 17 Jul 2020 14:16:01 +0000 (10:16 -0400)]
Use new checkPermissions shorthand in api calls
colemanw [Fri, 17 Jul 2020 13:08:53 +0000 (09:08 -0400)]
Merge pull request #17872 from eileenmcnaughton/ids
[NFC] Comment block cleanup
Mathieu Lutfy [Wed, 18 Mar 2020 18:11:12 +0000 (14:11 -0400)]
dev/core#1280 Test for ContributionPage soft_credit translation
eileen [Fri, 17 Jul 2020 07:03:53 +0000 (19:03 +1200)]
[NFC] Comment block cleanup
Eileen McNaughton [Fri, 17 Jul 2020 06:55:02 +0000 (18:55 +1200)]
Merge pull request #17524 from mattwire/memberbaocreate
REF Extract addToRecentItems from membership create
Eileen McNaughton [Fri, 17 Jul 2020 06:49:34 +0000 (18:49 +1200)]
Merge pull request #17526 from mattwire/frontendrequiredpaymentfrequency
Disable frequency/interval fields if not required. Mark required if they are so they are validated before submit
Eileen McNaughton [Fri, 17 Jul 2020 06:23:04 +0000 (18:23 +1200)]
Merge pull request #16298 from mattwire/membership_disabled
dev/membership#18 Enhance parameters for Job.process_membership
Seamus Lee [Fri, 17 Jul 2020 05:49:15 +0000 (15:49 +1000)]
Merge pull request #17703 from mattwire/contributionpage_currency
Fix currency symbol for Total Amount on contribution page
Seamus Lee [Fri, 17 Jul 2020 02:30:27 +0000 (12:30 +1000)]
Merge pull request #17781 from totten/master-vortex-max
RelationshipCache - Add a high-level index to facilitate relationship queries (more fields)
Seamus Lee [Fri, 17 Jul 2020 02:28:05 +0000 (12:28 +1000)]
Merge pull request #17871 from seamuslee001/deprecated_jquery
[REF] Fix a couple of jQuery errors that have cropped up
Eileen McNaughton [Fri, 17 Jul 2020 01:22:13 +0000 (13:22 +1200)]
Merge pull request #17831 from totten/master-no-preboot
Hooks/Dispatcher - Close loopholes that occur around "preboot" hooks
Eileen McNaughton [Fri, 17 Jul 2020 01:05:06 +0000 (13:05 +1200)]
Merge pull request #17834 from colemanw/api4perm
APIv4 - Add shorthand for setCheckPermissions()
Eileen McNaughton [Fri, 17 Jul 2020 01:01:27 +0000 (13:01 +1200)]
Merge pull request #17870 from eileenmcnaughton/line
Use PrematureExit exception instead of weird hack in tests
Eileen McNaughton [Fri, 17 Jul 2020 00:52:57 +0000 (12:52 +1200)]
Merge pull request #16429 from ixiam/dev/core#1113
dev/core#1113 - Decimal Separator - Invalid value "total_amount" (NaN,N) creating or editing a membership
Seamus Lee [Fri, 17 Jul 2020 00:09:43 +0000 (10:09 +1000)]
Merge pull request #17869 from totten/master-regen-zipcode
(REF) regen.sh - Remove unusual handling of `zipcodes.mysql`
colemanw [Thu, 16 Jul 2020 23:34:04 +0000 (19:34 -0400)]
Merge pull request #17863 from demeritcowboy/be-greener
dev/report#43 - Icon after saving a civireport instance is misleading
Seamus Lee [Thu, 16 Jul 2020 23:22:42 +0000 (09:22 +1000)]
[REF] Fix a couple of jQuery errors that have cropped up
Seamus Lee [Thu, 16 Jul 2020 23:20:32 +0000 (09:20 +1000)]
Merge pull request #17823 from colemanw/upgradeSafe
Remove unnecessary try/catch per #17729
eileen [Thu, 16 Jul 2020 23:00:46 +0000 (11:00 +1200)]
Use PrematureExit exception instead of weird hack in tests
Passing is_unit_test to a function to avoid the civiExit routine has been superceded by catching
PrematureExitExceptions
Seamus Lee [Thu, 16 Jul 2020 23:14:40 +0000 (09:14 +1000)]
Merge pull request #17458 from eileenmcnaughton/export
dev/core#1725 Only export primary address fields
Seamus Lee [Thu, 16 Jul 2020 22:44:26 +0000 (08:44 +1000)]
Merge pull request #17860 from eileenmcnaughton/test
api_v3_TaxContributionPageTest fix - remove hard coded processor id
Tim Otten [Thu, 16 Jul 2020 07:35:00 +0000 (00:35 -0700)]
Regenerate sql/civicrm_generated.mysql
Tim Otten [Thu, 16 Jul 2020 07:34:01 +0000 (00:34 -0700)]
RelationshipCache - Remove case_id
Tim Otten [Thu, 16 Jul 2020 07:21:58 +0000 (00:21 -0700)]
Rename RelationshipVortex to RelationshipCache
Tim Otten [Tue, 7 Jul 2020 09:18:45 +0000 (02:18 -0700)]
RelationshipVortex - Add to list of example fields in MergerTest::testGetCidRefs
Tim Otten [Wed, 1 Jul 2020 06:44:08 +0000 (23:44 -0700)]
RelationshipVortex - Create and populate table during upgrade (5.29)
Tim Otten [Wed, 1 Jul 2020 06:43:06 +0000 (23:43 -0700)]
RelationshipVortex - Define MySQL trigger to keep data sync'd. Add test. Use syncInto().
Tim Otten [Wed, 1 Jul 2020 04:50:44 +0000 (21:50 -0700)]
RelationshipVortex - Add schema files (incl start_date, end_date, etal)
This is the more maximal variant of the schema which includes mirrors for most fields.
Coleman Watts [Tue, 7 Jul 2020 23:54:21 +0000 (19:54 -0400)]
GenCode - Fix pluralization of words ending in x
Eileen McNaughton [Thu, 16 Jul 2020 22:18:40 +0000 (10:18 +1200)]
Merge pull request #16626 from pradpnayak/lineItemFixes
Fixed DB Error: syntax error if line item refers to civicrm_case
Tim Otten [Thu, 16 Jul 2020 20:41:15 +0000 (13:41 -0700)]
(REF) regen.sh - Remove unusual handling of `zipcodes.mysql`
Overview
--------
This is a small refactoring in service of the broader goal of simplifying
the sample-data generation and incorporating it into the installer (where it
can be localized/configured and where we don't have to commit any blobs).
The current process revolves around `regen.sh` and `civicrm_generated.mysql`.
Before
------
`regen.sh` builds an example DB and dumps the content into `civicrm_generated.mysql`.
As part of this, it loads `zipcodes.mysql` into the example DB,
drops/creates a table `zipcodes`, then runs some setup work,
and then re-drops `zipcodes`.
This is only safe on an isolated database. If you're trying to run it on
a pre-existing database created by `$cms`, then you don't know if there's going
to be a conflict on `zipcodes`.
After
-----
It doesn't drop/create/drop the `zipcodes` table. It just reads from the file.
Comment
-------
The main change is fairly small. It looks big because `zipcodes.mysql` as
to be reformatted as `zipcodes.json`.
Eileen McNaughton [Thu, 16 Jul 2020 21:59:53 +0000 (09:59 +1200)]
Merge pull request #17865 from colemanw/summary
Fix potential js error on summary screen when reloading blocks
eileen [Thu, 16 Jul 2020 07:12:54 +0000 (19:12 +1200)]
api_v3_TaxContributionPageTest fix - remove hard coded processor id
colemanw [Thu, 16 Jul 2020 21:27:19 +0000 (17:27 -0400)]
Merge pull request #17864 from colemanw/searchFix
Search Ext: fix loading options and parsing custom field names
Coleman Watts [Thu, 16 Jul 2020 19:03:08 +0000 (15:03 -0400)]
Fix potential js error on summary screen when reloading blocks
Tim Otten [Thu, 16 Jul 2020 18:49:01 +0000 (11:49 -0700)]
Merge pull request #17861 from totten/master-dao-event
EventCart - Resolve BAO identity and uncommitted DAO changes
Coleman Watts [Thu, 16 Jul 2020 18:18:48 +0000 (14:18 -0400)]
Search Ext: fix loading options and parsing custom field names
colemanw [Thu, 16 Jul 2020 18:02:12 +0000 (14:02 -0400)]
Merge pull request #17862 from colemanw/jobCleanup
[REF] ScheduledJob cleanup, remove unused var
Coleman Watts [Thu, 16 Jul 2020 15:28:21 +0000 (11:28 -0400)]
ScheduledJob cleanup, remove unused var
demeritcowboy [Thu, 16 Jul 2020 14:35:18 +0000 (10:35 -0400)]
tests for processReportMode
demeritcowboy [Thu, 16 Jul 2020 14:34:52 +0000 (10:34 -0400)]
icon in status message is misleading
Seamus Lee [Thu, 16 Jul 2020 11:13:43 +0000 (21:13 +1000)]
Merge pull request #17855 from seamuslee001/dev_core_1090
dev/core#1090 Update extendedSerializeData to use the Backbone namesp…
Seamus Lee [Thu, 16 Jul 2020 11:13:11 +0000 (21:13 +1000)]
Merge pull request #17835 from demeritcowboy/test-contact-form
dev/core#1874 - Failing test for new Individual form
Tim Otten [Thu, 16 Jul 2020 09:33:07 +0000 (02:33 -0700)]
EventCart - Resolve BAO identity and uncommitted DAO changes
Overview
--------
This fixes a recent issue in which `setup.sh` is producing local-only changes to the `Cart`
and `EventInCart` DAO files.
To reduce ambiguity, I'm rephrasing the normal "Before/After" and giving a 3-step evolution/history.
Evolution
---------
(1) Traditionally, the `Cart`/`EventInCart` entities have both BAO+DAO in main source-tree.
(2) With #17743 (
685bf3d218a9dad7e90d24aec165c63df12c1f67), the BAO moved away. But then
we get some detritus in the code-tree whenever you run `setup.sh`.
(3) With this patch, we don't get the detritus anymore.
Technical Details
-----------------
When I ran `setup.sh -g`, it produced local modifications like this:
```
diff --git a/CRM/Event/Cart/DAO/Cart.php b/CRM/Event/Cart/DAO/Cart.php
index
4683add13d..
3a7f721dc1 100644
--- a/CRM/Event/Cart/DAO/Cart.php
+++ b/CRM/Event/Cart/DAO/Cart.php
@@ -94,7 +94,7 @@ class CRM_Event_Cart_DAO_Cart extends CRM_Core_DAO {
'where' => 'civicrm_event_carts.id',
'table_name' => 'civicrm_event_carts',
'entity' => 'Cart',
- 'bao' => 'CRM_Event_Cart_BAO_Cart',
+ 'bao' => 'CRM_Event_Cart_DAO_Cart',
'localizable' => 0,
'add' => '4.1',
],
```
(Let's ignore the cyclic dependency in this design - that's a messier/pre-existing
problem.)
That metadata is inaccurate. The `bao` should point to the BAO, sinec the BAO does exist.
It's inaccurate because the BAO exists in a different location.
This patch allows you override the file-existence check -- saying, "this entity will
use BAO's even though they're not in the file-location you might normally expect."
Seamus Lee [Thu, 16 Jul 2020 07:20:51 +0000 (17:20 +1000)]
Merge pull request #17858 from civicrm/dependabot/npm_and_yarn/lodash-4.17.19
Bump lodash from 4.17.15 to 4.17.19
Eileen McNaughton [Thu, 16 Jul 2020 06:57:59 +0000 (18:57 +1200)]
Merge pull request #17859 from civicrm/5.28
5.28
Monish Deb [Thu, 16 Jul 2020 06:51:35 +0000 (12:21 +0530)]
Merge pull request #17836 from seamuslee001/dev_core_1874
dev/core#1874 Fix fatal error by passing through the string formatTyp…
Eileen McNaughton [Thu, 16 Jul 2020 05:52:26 +0000 (17:52 +1200)]
Merge pull request #17841 from seamuslee001/eventcart_setting
[REF] Migrate Event Cart Setting into the Extension
dependabot[bot] [Thu, 16 Jul 2020 03:41:11 +0000 (03:41 +0000)]
Bump lodash from 4.17.15 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)
Signed-off-by: dependabot[bot] <support@github.com>
Seamus Lee [Thu, 16 Jul 2020 03:40:41 +0000 (13:40 +1000)]
Merge pull request #17856 from civicrm/5.28
5.28
Seamus Lee [Thu, 16 Jul 2020 03:40:10 +0000 (13:40 +1000)]
Merge pull request #17851 from alifrumin/5.28rn
[NFC] 5.28 Release Notes First Pass
Seamus Lee [Thu, 16 Jul 2020 03:39:54 +0000 (13:39 +1000)]
Merge pull request #17857 from demeritcowboy/membershiptest-5.28
[Test framework] - Backport of membership test fix
Seamus Lee [Thu, 16 Jul 2020 01:25:41 +0000 (11:25 +1000)]
Merge pull request #17854 from demeritcowboy/missing-codeversion-5.28
dev/core#1882 - Missing version number in status check message about db version vs code version
demeritcowboy [Thu, 16 Jul 2020 01:21:52 +0000 (21:21 -0400)]
backport of membership test fix
Seamus Lee [Thu, 16 Jul 2020 00:42:15 +0000 (10:42 +1000)]
Merge pull request #17853 from seamuslee001/dev_wordpress_62
dev/wordpress#62 Update adrienrn/php-mimetyper gitignore file to ensu…
Seamus Lee [Thu, 16 Jul 2020 00:20:28 +0000 (10:20 +1000)]
dev/core#1090 Update extendedSerializeData to use the Backbone namespace to fix an issue with recent versions of elementor wordpress plugin
demeritcowboy [Wed, 15 Jul 2020 23:52:24 +0000 (19:52 -0400)]
missing version number in message
Seamus Lee [Wed, 15 Jul 2020 22:37:39 +0000 (08:37 +1000)]
Merge pull request #17849 from mattwire/statichandlePaymentNotification
handlePaymentNotification() should not be declared as a static method
Alice Frumin [Tue, 14 Jul 2020 21:15:53 +0000 (17:15 -0400)]
5.28 release notes: first pass
Seamus Lee [Wed, 15 Jul 2020 21:44:41 +0000 (07:44 +1000)]
dev/wordpress#62 Update adrienrn/php-mimetyper gitignore file to ensure that sites that manage their systems using git can access the db.json file
Eileen McNaughton [Wed, 15 Jul 2020 20:17:40 +0000 (08:17 +1200)]
Merge pull request #17850 from demeritcowboy/you-only-print-once
[REF] Only printOnly once
Eileen McNaughton [Wed, 15 Jul 2020 20:12:29 +0000 (08:12 +1200)]
Merge pull request #17847 from colemanw/versionThreeAndFour
API tests - label versions in dataprovider versionThreeAndFour
Eileen McNaughton [Wed, 15 Jul 2020 20:10:55 +0000 (08:10 +1200)]
Merge pull request #17848 from lcdservices/dev-core-1880
dev/core#1880 add backticks to custom field insertions
demeritcowboy [Wed, 15 Jul 2020 18:53:36 +0000 (14:53 -0400)]
only printOnly once
Matthew Wire [Wed, 15 Jul 2020 18:28:27 +0000 (19:28 +0100)]
CRM_Core_Payment::handlePaymentNotification() is not a static method
Brian Shaughnessy [Wed, 15 Jul 2020 17:29:36 +0000 (13:29 -0400)]
dev/core#1880 add backticks to custom field insertions
Coleman Watts [Wed, 15 Jul 2020 13:27:57 +0000 (09:27 -0400)]
API tests - label versions in dataprovider versionThreeAndFour
colemanw [Wed, 15 Jul 2020 13:08:03 +0000 (09:08 -0400)]
Merge pull request #17845 from totten/master-api4-conf-provider
(REF) APIv4 ConformanceTest - Split apart into per-entity sub-tests
Matthew Wire [Wed, 15 Jul 2020 11:03:39 +0000 (12:03 +0100)]
Simplify flushing group contact cache query to reduce locking and improve performance
Matthew Wire [Wed, 15 Jul 2020 11:27:14 +0000 (12:27 +0100)]
Add api3 metadata to validate exclude_membership_status_ids
Matthew Wire [Tue, 16 Jun 2020 11:46:11 +0000 (12:46 +0100)]
Tests should call API not updateAllMembershipStatus() function directly.
Carlos Capote Pérez-Andreu [Thu, 23 Apr 2020 16:22:25 +0000 (17:22 +0100)]
Test the new Job.process.membership parameters
Matthew Wire [Wed, 15 Jan 2020 14:41:41 +0000 (14:41 +0000)]
Add parameters to process_membership job
Eileen McNaughton [Wed, 15 Jul 2020 06:50:15 +0000 (18:50 +1200)]
Merge pull request #17844 from demeritcowboy/check-packages
dev/core#1872 - Packages and vendor path calculation used in system check is outdated
Tim Otten [Wed, 15 Jul 2020 03:38:09 +0000 (20:38 -0700)]
Civi::dispatcher() - Extend protection against pre-boot hooks
Before: The protection extends up until `createLockManager()`
After: The protection extends up until `CRM_Extension_System...->register()`
Tim Otten [Wed, 15 Jul 2020 05:41:16 +0000 (22:41 -0700)]
(REF) APIv4 ConformanceTest - Split apart into per-entity sub-tests
Overview
--------
This updates a unit-test to make the output easier to understand.
We need more output because the test sporadically fails, and we don't know why.
Before
------
There is a function `testConformance()` which internally
loops through a list of entities.
Whenever the test fails, it aborts testing and reports one failure (for all
entities) without indicating the specific entity which failed.
After
-----
There is a test function `testConformance($entity)` which uses
a data provider.
Whenever the test fails, it will be logged with the entity name.
Testing can resume for additional entities.
Technical Details
-----------------
There are a couple technical distinctions between this revision, the
previous revision, and the comparable APIv3 test:
1. Each test-case returned by the '@dataProvider' has a symbolic name.
These are easier to skim than numeric names.
2. The list of entities is *not* based on runtime services,
because that constrains how PHPUnit and Civi lifecycles interact.
It uses a heuristic/low-tech listing (`getEntitiesLotech()`).
In the rare case where the low-tech list is wrong, it will complain
and ask for maintenance.
demeritcowboy [Wed, 15 Jul 2020 04:04:59 +0000 (00:04 -0400)]
paths are no longer always relative to civi root
Seamus Lee [Wed, 15 Jul 2020 01:47:19 +0000 (11:47 +1000)]
Merge pull request #17842 from seamuslee001/regen
[NFC] Re run regen after recent merges
Seamus Lee [Wed, 15 Jul 2020 00:43:12 +0000 (10:43 +1000)]
Merge pull request #17843 from civicrm/5.28
5.28
Seamus Lee [Wed, 15 Jul 2020 00:41:00 +0000 (10:41 +1000)]
Merge pull request #17840 from seamuslee001/5272_rns
5.27.1 and 5.27.2 Release Notes
Seamus Lee [Wed, 15 Jul 2020 00:01:08 +0000 (10:01 +1000)]
[NFC] Re run regen after recent merges
Seamus Lee [Tue, 14 Jul 2020 23:56:17 +0000 (09:56 +1000)]
Merge pull request #17743 from eileenmcnaughton/eventcart
Move BAO and template files into event cart
Eileen McNaughton [Tue, 14 Jul 2020 23:30:49 +0000 (11:30 +1200)]
Merge pull request #17839 from eileenmcnaughton/regen
Update regen.sh with new & upcoming core extensions
Tim Otten [Fri, 10 Jul 2020 05:55:29 +0000 (22:55 -0700)]
Add release-notes/5.27.1.md
Tim Otten [Tue, 14 Jul 2020 22:08:56 +0000 (15:08 -0700)]
Update 5.27.2.md
Remove dev/core#1847 - the initial fix caused other regressions, and the full fix merits a longer incubation
Tim Otten [Tue, 14 Jul 2020 21:30:03 +0000 (14:30 -0700)]
5.27.2 - Add release notes
Seamus Lee [Tue, 14 Jul 2020 23:05:43 +0000 (09:05 +1000)]
[REF] Migrate Event Cart Setting into the Extension
Seamus Lee [Tue, 14 Jul 2020 23:04:51 +0000 (09:04 +1000)]
Merge pull request #17830 from eileenmcnaughton/renewtest
MembershipRenewalTest - Fix failure
eileen [Fri, 3 Jul 2020 08:00:04 +0000 (20:00 +1200)]
Move BAO and template files into event cart
Fix templates Path
colemanw [Tue, 14 Jul 2020 22:10:16 +0000 (18:10 -0400)]
Merge pull request #17826 from eileenmcnaughton/less_utf
Remove hard coded charset.