Eileen McNaughton [Mon, 13 Jul 2020 23:56:43 +0000 (11:56 +1200)]
Merge pull request #17729 from colemanw/upgradeSafeApi
Make api get upgrade-safe
Eileen McNaughton [Mon, 13 Jul 2020 23:36:14 +0000 (11:36 +1200)]
Merge pull request #17799 from civicrm/5.28
5.28
Seamus Lee [Mon, 13 Jul 2020 23:24:12 +0000 (09:24 +1000)]
Merge pull request #17820 from seamuslee001/1867_qill
dev/core#1867 Ensure that the qill matches the filter when no time is…
Eileen McNaughton [Mon, 13 Jul 2020 22:56:39 +0000 (10:56 +1200)]
Merge pull request #17780 from totten/master-sync-into
CRM_Utils_SQL - Add "onDuplicate()" and "syncInto()" helpers
Seamus Lee [Mon, 13 Jul 2020 22:19:48 +0000 (08:19 +1000)]
dev/core#1867 Ensure that the qill matches the filter when no time is supplied
Seamus Lee [Mon, 13 Jul 2020 22:20:02 +0000 (08:20 +1000)]
Merge pull request #17811 from eileenmcnaughton/fromto
dev/core#1867 CiviReport filters: Fix incorrect defaulting to the beginning rather than end the to-range day
Seamus Lee [Mon, 13 Jul 2020 22:05:09 +0000 (08:05 +1000)]
Merge pull request #17814 from eileenmcnaughton/dedupe
Fix dedupe on same-activity-connection
Eileen McNaughton [Mon, 13 Jul 2020 20:58:23 +0000 (08:58 +1200)]
Merge pull request #17800 from colemanw/cronCheck
CheckEnv - Give new installs a grace period before 'Cron Not Running' msg
Eileen McNaughton [Mon, 13 Jul 2020 20:14:57 +0000 (08:14 +1200)]
Merge pull request #17816 from JKingsnorth/patch-16
Fix 'Undefined variable: jsSet in CRM_Core_BAO_Mapping::loadSavedMapping()'
Eileen McNaughton [Mon, 13 Jul 2020 20:10:22 +0000 (08:10 +1200)]
Merge pull request #17812 from eileenmcnaughton/uff
dev/core#1861 fix failure to unset location_type_id when saving uffield
Eileen McNaughton [Mon, 13 Jul 2020 19:53:39 +0000 (07:53 +1200)]
Merge pull request #17807 from colemanw/nonProdCronCheck
dev/core#1863 Downgrade checkEnvironment level and skip non-prod checks
Coleman Watts [Sun, 12 Jul 2020 22:59:37 +0000 (18:59 -0400)]
CheckEnv - Give new installs a grace period before 'Cron Not Running' error
John Kingsnorth [Mon, 13 Jul 2020 12:18:59 +0000 (13:18 +0100)]
[NFC] Ensure jsSet returned variable exists
eileen [Mon, 13 Jul 2020 11:09:34 +0000 (23:09 +1200)]
Fix dedupe on same-activity-connection
Seamus Lee [Mon, 13 Jul 2020 09:55:19 +0000 (19:55 +1000)]
Merge pull request #17803 from eileenmcnaughton/dedupe
dev/core#1862 Skip cache tables during merge, rely on cache management processes
eileen [Mon, 13 Jul 2020 07:06:27 +0000 (19:06 +1200)]
dev/core#1861 fix failure to unset location_type_id when saving uffield
https://lab.civicrm.org/dev/core/-/issues/1861
If this is a regression it probably from 2017
https://github.com/civicrm/civicrm-core/commit/
2e74ff5574027b2ce84177b82884ebd7c9b87fd1#diff-1911d0c1a896701ba9aa044181f5972bR556
eileen [Mon, 13 Jul 2020 05:47:08 +0000 (17:47 +1200)]
Fix incorrect defaulting to the beginning rather than end the to-range day
eileen [Mon, 13 Jul 2020 01:15:28 +0000 (13:15 +1200)]
dev/core#1862 Skip cache tables during merge, rely on cache management processes
We later call Contact.create on both contacts so that should manage the caches for this update 'as well as for any other update'
and solve the bug + reduce locking queries
Seamus Lee [Mon, 13 Jul 2020 05:03:03 +0000 (15:03 +1000)]
Merge pull request #17797 from seamuslee001/dev_core_1865
dev/core#1865 Remove civiwp and option query strings from redirected …
Eileen McNaughton [Mon, 13 Jul 2020 05:00:43 +0000 (17:00 +1200)]
Merge pull request #15435 from MegaphoneJon/reporting-21
reporting#21 - don't multiple contribution details when a 1-to-many r…
Coleman Watts [Mon, 13 Jul 2020 02:03:53 +0000 (22:03 -0400)]
Downgrade checkEnvironment level and skip non-prod checks
Seamus Lee [Mon, 13 Jul 2020 01:34:04 +0000 (11:34 +1000)]
Merge pull request #17762 from eileenmcnaughton/date
dev/core#1847 Fix datepicker to respect the searchDate offsets
Seamus Lee [Mon, 13 Jul 2020 00:53:31 +0000 (10:53 +1000)]
Merge pull request #17789 from eileenmcnaughton/search
Add hidden tag to search extension
Seamus Lee [Mon, 13 Jul 2020 00:34:39 +0000 (10:34 +1000)]
Merge pull request #17788 from eileenmcnaughton/update
[REF] Follow up cleanup
eileen [Mon, 6 Jul 2020 01:52:08 +0000 (13:52 +1200)]
dev/core#1847 Fix datepicker to respect the searchDate offsets
I have some misgivings about this since I suspect the rationale behind the search offsets was primarily about the clunky UI.
Having said that I think the datepicker UI is a bit clunky on this front too as it's not obvious you can choose earlier
dates. This does at least restore established behaviour.
https://lab.civicrm.org/dev/core/-/issues/1847
Eileen McNaughton [Mon, 13 Jul 2020 00:22:14 +0000 (12:22 +1200)]
Merge pull request #17723 from seamuslee001/feature_contribution_detail_no_acl
[REF] Remove ACL join on temp table creation in Member ContributionDe…
Eileen McNaughton [Mon, 13 Jul 2020 00:20:34 +0000 (12:20 +1200)]
Merge pull request #17769 from seamuslee001/lab_core_1858
dev/core#1858 Prevent Duplicate contact records being created and har…
Seamus Lee [Mon, 13 Jul 2020 00:12:28 +0000 (10:12 +1000)]
Merge pull request #17798 from seamuslee001/dev_core_1864
dev/core#1864 Ensure that when search in trash is not checked that on…
Seamus Lee [Mon, 13 Jul 2020 00:12:09 +0000 (10:12 +1000)]
Merge pull request #17801 from colemanw/statusPrefCleanup
REF - Cleanup StatusPreference BAO to be more standard
Seamus Lee [Sun, 12 Jul 2020 23:04:54 +0000 (09:04 +1000)]
Merge pull request #17794 from eileenmcnaughton/act_perms
Sort permittedActivityTypes
Seamus Lee [Sun, 12 Jul 2020 23:03:42 +0000 (09:03 +1000)]
Merge pull request #17792 from agh1/5.28.0-releasenotes-initial
5.28.0 release notes initial run
Seamus Lee [Wed, 8 Jul 2020 06:27:45 +0000 (16:27 +1000)]
dev/core#1858 Ensure that no duplicate contact is created by if we have the contactID in the post variable from the contact task form that we map that to contact_id for the dedupe params
Add in a code comment describing the issue
Seamus Lee [Sun, 12 Jul 2020 21:31:38 +0000 (07:31 +1000)]
dev/core#1865 Remove civiwp and option query strings from redirected url as they only relate to CiviCRM internal uses
Seamus Lee [Sun, 12 Jul 2020 22:47:42 +0000 (08:47 +1000)]
dev/core#1864 Ensure that when search in trash is not checked that only contacts not deleted are returned in the advanced search form
Coleman Watts [Sun, 12 Jul 2020 20:56:25 +0000 (16:56 -0400)]
REF - Cleanup StatusPreference BAO to be more standard
colemanw [Sun, 12 Jul 2020 20:21:15 +0000 (16:21 -0400)]
Merge pull request #17795 from demeritcowboy/comment-resultset
[REF] Do or do not - there is no try
demeritcowboy [Sun, 12 Jul 2020 11:35:38 +0000 (07:35 -0400)]
unnecessary try block
Eileen McNaughton [Sun, 12 Jul 2020 11:27:54 +0000 (23:27 +1200)]
Merge pull request #17683 from agh1/memberdetailreportautorenew
Add auto-renew status to membership detail report
Eileen McNaughton [Sun, 12 Jul 2020 11:12:34 +0000 (23:12 +1200)]
Merge pull request #17791 from colemanw/dev/core#1866
APIv4 - Fix saving custom fields with same name
eileen [Sun, 12 Jul 2020 10:58:48 +0000 (22:58 +1200)]
Sort permittedActivityTypes
When determining whether to add a clause filtering activity types the permitted types
are compared to all types. If all are permitted no clause is needed.
However, without this sort it is incorrectly seeing them as not matching and adding extraneous joins
Eileen McNaughton [Sun, 12 Jul 2020 02:10:17 +0000 (14:10 +1200)]
Merge pull request #17698 from agh1/checkwpbasepage
Add system check to ensure WP base page exists
Andrew Hunt [Sat, 11 Jul 2020 23:08:10 +0000 (19:08 -0400)]
5.28.0 release notes: added boilerplate
Andrew Hunt [Sat, 11 Jul 2020 22:32:46 +0000 (18:32 -0400)]
5.28.0 release notes: raw from script
Coleman Watts [Sat, 11 Jul 2020 20:54:37 +0000 (16:54 -0400)]
Fix saving custom fields with same name
Eileen McNaughton [Sat, 11 Jul 2020 11:02:17 +0000 (23:02 +1200)]
Merge pull request #17786 from demeritcowboy/profile-description
dev/core#1868 - Regression - Description field is always blank on profiles admin page and slew of E_NOTICES
eileen [Sat, 11 Jul 2020 10:56:30 +0000 (22:56 +1200)]
Add hidden tag to search extension
This was a suggestion from @mattwire that we hide the extension from the UI until the styling dependency is resovled.
It seems reasonable to me as this is primarily in the civicrm-core repo for code management purposes and
making it too easy to enable before the styling is resolved could lead to confusion.
I would quite like to enable on buildkit builds just for dev visibility - but that is something to think
about
Eileen McNaughton [Sat, 11 Jul 2020 08:05:38 +0000 (20:05 +1200)]
Merge pull request #17787 from pradpnayak/REF-1
Fixed notice error on Relationships report
eileen [Mon, 29 Jun 2020 04:38:59 +0000 (16:38 +1200)]
[REF] Follow up cleanup
This removes an IF block that relies on the always-true parameter
I'm pretty sure it just wasn't done last round as all the white space created a lot of noise
Pradeep Nayak [Fri, 10 Jul 2020 23:49:41 +0000 (00:49 +0100)]
Fixed notice error on Relationships report
demeritcowboy [Fri, 10 Jul 2020 20:47:52 +0000 (16:47 -0400)]
put description back
Coleman Watts [Fri, 10 Jul 2020 13:36:06 +0000 (09:36 -0400)]
Search extension - improve results display
Seamus Lee [Fri, 10 Jul 2020 01:05:01 +0000 (11:05 +1000)]
Merge pull request #17783 from pradpnayak/REF-1
getLoggedInContactID() is a static function
Eileen McNaughton [Fri, 10 Jul 2020 00:06:57 +0000 (12:06 +1200)]
Merge pull request #17782 from civicrm/5.28
5.28
Eileen McNaughton [Fri, 10 Jul 2020 00:05:11 +0000 (12:05 +1200)]
Merge pull request #17744 from eileenmcnaughton/repeat
dev/core#1679: Ensure Paypal IPN always updates the next scheduled payment date
Seamus Lee [Thu, 9 Jul 2020 21:52:44 +0000 (07:52 +1000)]
Merge pull request #17749 from totten/master-setup
Support for installing CiviCRM-Backdrop via "setup" UI
Pradeep Nayak [Thu, 9 Jul 2020 21:25:35 +0000 (22:25 +0100)]
getLoggedInContactID() is a static function
Seamus Lee [Thu, 9 Jul 2020 21:08:15 +0000 (07:08 +1000)]
Merge pull request #17779 from seamuslee001/nfc_php74_flexmailer
[NFC] Update flexmailer to be PHP7.4 compatible
Seamus Lee [Thu, 9 Jul 2020 21:01:57 +0000 (07:01 +1000)]
Merge pull request #17774 from civicrm/5.28
5.28
Coleman Watts [Thu, 9 Jul 2020 17:10:38 +0000 (13:10 -0400)]
Search extension - blur auto toggle on click
Coleman Watts [Thu, 9 Jul 2020 16:19:10 +0000 (12:19 -0400)]
Rename search base page class
colemanw [Thu, 9 Jul 2020 15:40:28 +0000 (11:40 -0400)]
Merge pull request #17765 from colemanw/dev/core#1853
dev/core#1853 - Fix validation errors when removing contact subtype
Coleman Watts [Thu, 9 Jul 2020 15:38:30 +0000 (11:38 -0400)]
Rename searchBuild to less ambiguous Create Search
Andrew Hunt [Thu, 9 Jul 2020 15:12:41 +0000 (11:12 -0400)]
WP base page system check: suggest both the modified default and the default default
Tim Otten [Thu, 9 Jul 2020 05:52:29 +0000 (22:52 -0700)]
CRM_Utils_SQL - Add "syncInto()" helper
This is slightly more sugary variant of "INSERT INTO...SELECT...ON DUPLICATE UPDATE..." which requires
less boilerplate/duplication.
Before
------
```php
CRM_Utils_SQL_Select::from('foo_table')
->select(['foo_name', 'foo_value1', 'foo_value2'])
->insertInto('bar_table', ['bar_name', 'bar_output1', 'bar_output2'])
->onDuplicate(['bar_output1 = foo_value1', 'bar_output2 = foo_value2'])
```
After
------
```php
CRM_Utils_SQL_Select::from('foo_table')
->syncInto('bar_table', 'bar_name', [
'bar_name' => 'foo_name',
'bar_output1' => 'foo_value1',
'bar_output2' => 'foo_value1',
])
```
Tim Otten [Thu, 9 Jul 2020 04:53:10 +0000 (21:53 -0700)]
CRM_Utils_SQL - Add support for "INSERT INTO...SELECT...ON DUPLICATE UPDATE..."
This is a query structure in which you want to build a SELECT query - and,
using the results, perform a mix of INSERTs and UPDATEs.
Seamus Lee [Thu, 9 Jul 2020 03:25:36 +0000 (13:25 +1000)]
Merge pull request #17775 from colemanw/search
Add search extension
Seamus Lee [Thu, 9 Jul 2020 03:12:56 +0000 (13:12 +1000)]
[NFC] Update flexmailer to be PHP7.4 compatible
Coleman Watts [Wed, 8 Jul 2020 22:15:39 +0000 (18:15 -0400)]
Add search extension
Seamus Lee [Thu, 9 Jul 2020 00:07:40 +0000 (10:07 +1000)]
Merge pull request #17636 from MikeyMJCO/patch-5
[dev/core#750] Don't check server variables if we're running in CLI
Seamus Lee [Wed, 8 Jul 2020 23:45:25 +0000 (09:45 +1000)]
Merge pull request #17763 from eileenmcnaughton/dps
Remove PaymentExpress ipn class
Seamus Lee [Wed, 8 Jul 2020 23:19:13 +0000 (09:19 +1000)]
Merge pull request #17772 from seamuslee001/dev_core_1860
dev/core#1860 Fix installing on PHP7.3 Ubuntu 20.04 and MariaDB 10.3
Seamus Lee [Wed, 8 Jul 2020 23:17:27 +0000 (09:17 +1000)]
Merge pull request #17776 from totten/master-org-check
Status Checks - Use more specific label regarding "Domain"/"Organization" check
Tim Otten [Wed, 8 Jul 2020 22:01:24 +0000 (15:01 -0700)]
Status Checks - Use more specific label regarding "Domain"/"Organization" check
Before
------
Suppose you install CiviCRM anew. The installer shows a bulleted list of
things to do. One of those takes you to another, much longer list of things
to do. And *then* there's a popup on the sidebar which says you need to
"Complete Setup".
You say to yourself, "I thought that's what I was doing!" But you click it anyway.
That takes you to a page with another list of things to do, one of which is
to "Complete Setup". The text and link clarify that "Complete Setup"
actually means *set the name and address of the organization*.
After
-----
There are still several different pages telling you what to do after setup.
But at least the label is more precise. :)
Seamus Lee [Wed, 8 Jul 2020 22:08:35 +0000 (08:08 +1000)]
Merge pull request #17760 from seamuslee001/joomla_track_url
Ensure that when normal routing trackable urls and opens in Joomla go…
Seamus Lee [Wed, 8 Jul 2020 22:04:30 +0000 (08:04 +1000)]
dev/core#1860 Fix installing on PHP7.3 Ubuntu 20.04 and MariaDB 10.3
Eileen McNaughton [Wed, 8 Jul 2020 07:34:43 +0000 (19:34 +1200)]
Merge pull request #17770 from civicrm/5.28
5.28 to master
Eileen McNaughton [Wed, 8 Jul 2020 06:59:25 +0000 (18:59 +1200)]
Merge pull request #17768 from seamuslee001/flexmailer_distmaker
[NFC] Include flexmailer in distmaker
Seamus Lee [Wed, 8 Jul 2020 05:33:43 +0000 (15:33 +1000)]
[NFC] Include flexmailer in distmaker
Tim Otten [Wed, 8 Jul 2020 00:10:17 +0000 (17:10 -0700)]
Setup UI - Allow callers to wrap UI in their own page chrome. Clarify response format.
The general idiom for calling SetupController is like this:
```php
$ctrl = \Civi\Setup::instance()->createController()->getCtrl();
$ctrl->setUrls(...);
\Civi\Setup\BasicRunner::run($ctrl);
```
This changes the data exchanged between `BasicRunner` and `SetupController`
to allow more flexible runners. The `BasicRunner` is the only one currently
used by existing installers, so it's drop-in compatible.
Before
------
The `BasicRunner` calls `$ctrl->run(...)` and gets back an array with the response data
(`[0 => $headers, 1 => $body]`).
After
-----
The `BasicRunner` calls `$ctrl->run(...)` and gets back a `SetupResponse`. This
object provides the `[0]` and `[1]` keys (for backward compat), but it's better
to access the object properties (`$headers`, `$body`, etc).
It provides several additional properties - eg `$title`, `$assets`, `$code`.
Technical Details
------------------
This is a drop-in update for anything that uses `BasicRunner`.
Strictly speaking, if one wrote a different runner, it may or may not be
drop-in compatible. But since I don't think there are any others, it's not
really worth spending much energy on verifying.
The bump in `Setup::PROTOCOL` (`1.0` => `1.1`) indicates that old installers
should generally be forward compatible with this protocol. However, if one
writes a new installer and specifically uses the `SetupResponse` type,
then they should assert protocol `1.1`.
Tim Otten [Tue, 7 Jul 2020 21:59:37 +0000 (14:59 -0700)]
setup/ - Fix CSS loading on "finished" page. Split out "page.php".
The various `finished.*.php` files were outtputting the incorrect URL for
`template.css`. The code for outputting `template.css` is duplicated in a few files.
This commit fixes by extracting a helper (`renderPage()` / `page.php`) to encapsulate
that bit and reuse it for each page-view in the Setup UI.
Tim Otten [Tue, 7 Jul 2020 23:07:49 +0000 (16:07 -0700)]
Setup UI - Fix translation of post-install messages
Here's what happens:
- The "Setup" subsystem does its internal/partial bootstrap; it sets `$tsLocale` and uses `CRM_Core_I18n`. Hooray.
- The "Setup" initializes the database/settings and then does a full bootstrap. The full bootstrap step calls `applyLocale()`, which replaces the active `$tsLocale`... with the *unconfigured default*. Ooops.
- This step runs next - and it updates the DB setting. But we've already trampled `$tsLocale`. Calling `applyLocale()` a second time means we use the preferred `$tsLocale` again. Hooray.
colemanw [Tue, 7 Jul 2020 19:31:00 +0000 (15:31 -0400)]
Merge pull request #17754 from demeritcowboy/resourceurl-check
dev/drupal#114 and dev/core#1647 - Remove resource url status check
Seamus Lee [Tue, 7 Jul 2020 06:04:37 +0000 (16:04 +1000)]
Merge pull request #17750 from colemanw/upgradeBump
Bump minimum upgradable version to 4.4.7
Coleman Watts [Sat, 4 Jul 2020 20:43:29 +0000 (16:43 -0400)]
Bump minimum upgradable version to 4.4.7
Seamus Lee [Tue, 7 Jul 2020 02:17:51 +0000 (12:17 +1000)]
Only encode url if it is the front end in unit tests
Seamus Lee [Tue, 7 Jul 2020 02:07:38 +0000 (12:07 +1000)]
Merge pull request #17767 from demeritcowboy/loss-of-face
[REF] Unused interface CRM_Report_Interface
Seamus Lee [Tue, 7 Jul 2020 02:06:29 +0000 (12:06 +1000)]
Merge pull request #17256 from demeritcowboy/test-for-16559
[TEST] Failing test for PR 16559
Andrew Hunt [Tue, 7 Jul 2020 00:42:29 +0000 (20:42 -0400)]
Member detail report: move autorenew filter to `whereClause()` override
demeritcowboy [Mon, 6 Jul 2020 23:56:07 +0000 (19:56 -0400)]
unused file
Seamus Lee [Mon, 6 Jul 2020 23:09:16 +0000 (09:09 +1000)]
Merge pull request #17764 from jaapjansma/caseActivity
update to pr 16559
Coleman Watts [Mon, 6 Jul 2020 18:56:02 +0000 (14:56 -0400)]
dev/core#1853 - Fix validation errors when removing contact subtype
Jaap Jansma [Mon, 6 Jul 2020 14:33:54 +0000 (16:33 +0200)]
update to pr 16559
colemanw [Mon, 6 Jul 2020 13:27:46 +0000 (09:27 -0400)]
Merge pull request #17761 from eileenmcnaughton/acl
Remove unused, deprecated functions
Matthew Wire [Mon, 6 Jul 2020 10:02:20 +0000 (11:02 +0100)]
Merge pull request #17745 from artfulrobot/artfulrobot-findfiles
Improve efficiency of findFiles
Tim Otten [Mon, 6 Jul 2020 08:46:37 +0000 (01:46 -0700)]
Drupal.civi-setup.php - Don't assume that `$language` is available
Tim Otten [Mon, 6 Jul 2020 08:31:35 +0000 (01:31 -0700)]
finished.Drupal.php - Let it work!
Tim Otten [Mon, 6 Jul 2020 08:18:49 +0000 (01:18 -0700)]
FlushDrupal.civi-setup.php - Update to work with setup UI
Tim Otten [Sat, 4 Jul 2020 04:44:14 +0000 (21:44 -0700)]
FlushBackdrop.civi-setup.php - Update to work with setup UI
Tim Otten [Sat, 4 Jul 2020 03:52:18 +0000 (20:52 -0700)]
finished.Backdrop.php - Fix the FIXMEs. Align closer to finished.Drupal.php
Tim Otten [Sat, 4 Jul 2020 05:34:50 +0000 (22:34 -0700)]
setup/res/template.css - Fix "Sample Data" alignment
This rule appears to be targetted at "Components" section, but it actually affects the entire document
Consequently, the "Localization" and "Sample Data" segments bleed together weirdly.