Seamus Lee [Thu, 26 Mar 2020 23:44:55 +0000 (10:44 +1100)]
Merge pull request #16895 from eileenmcnaughton/case
Remove assigns for atypefile
colemanw [Thu, 26 Mar 2020 23:17:35 +0000 (19:17 -0400)]
Merge pull request #16910 from eileenmcnaughton/conf
Deprecate use of in OptionGroup::add() function
Eileen McNaughton [Thu, 26 Mar 2020 22:28:44 +0000 (11:28 +1300)]
Merge pull request #16909 from colemanw/api4sel
[REF] APIv4 - Preserve order when expanding select wildcards
Eileen McNaughton [Thu, 26 Mar 2020 22:09:47 +0000 (11:09 +1300)]
Merge pull request #16863 from seamuslee001/dev_core_561_daterange_deprecation
dev/core#561 Add in deprecation notice on addDateRange funtion
eileen [Thu, 26 Mar 2020 22:06:17 +0000 (11:06 +1300)]
Deprecate use of in OptionGroup::add() function
We agreed some time back not to use as part of add, create signatures
Coleman Watts [Thu, 26 Mar 2020 20:52:10 +0000 (16:52 -0400)]
APIv4 - Preserve order when expanding select wildcards
Yashodha Chaku [Thu, 26 Mar 2020 14:40:11 +0000 (20:10 +0530)]
Merge pull request #16845 from jitendrapurohit/core-1663
dev/core#1663 - Fix warning on relationship form
colemanw [Thu, 26 Mar 2020 14:31:37 +0000 (10:31 -0400)]
Merge pull request #16896 from eileenmcnaughton/act
[NFC] Use strict comparison where possible
Seamus Lee [Thu, 26 Mar 2020 07:51:20 +0000 (18:51 +1100)]
Merge pull request #16904 from colemanw/selectUtil
Improve APIv4 selectUtils to handle join paths in fieldnames.
Seamus Lee [Thu, 26 Mar 2020 07:48:27 +0000 (18:48 +1100)]
Merge pull request #16906 from eileenmcnaughton/format
[NFC] Code formatting
Seamus Lee [Thu, 26 Mar 2020 07:48:08 +0000 (18:48 +1100)]
Merge pull request #16905 from eileenmcnaughton/acti
[NFC] minor form cleanup.
eileen [Wed, 25 Mar 2020 03:49:39 +0000 (16:49 +1300)]
[NFC] Use strict comparison where possible
Also fixes a couple of comments & uses of Array::value
eileen [Thu, 26 Mar 2020 04:02:44 +0000 (17:02 +1300)]
[NFC] Code formatting
eileen [Thu, 26 Mar 2020 03:56:35 +0000 (16:56 +1300)]
[NFC] minor form cleanup.
Most notably fix calling a non-static method statically but also remove comment that
clearly came in by copy & paste,
Coleman Watts [Thu, 26 Mar 2020 03:48:49 +0000 (23:48 -0400)]
Improve APIv4 selectUtils to handle join paths in fieldnames.
Eileen McNaughton [Thu, 26 Mar 2020 03:41:18 +0000 (16:41 +1300)]
Merge pull request #16900 from colemanw/api4fix
APIv4 - bugfix in select query
Coleman Watts [Wed, 25 Mar 2020 23:57:48 +0000 (19:57 -0400)]
APIv4 - bugfix in select query
Tim Otten [Wed, 25 Mar 2020 20:32:40 +0000 (13:32 -0700)]
Merge pull request #16886 from demeritcowboy/xmlinclude-windows
dev/core#1643 - Make civicrm-setup (especially drupal 8) work on windows
Seamus Lee [Wed, 25 Mar 2020 20:30:22 +0000 (07:30 +1100)]
Merge pull request #16897 from eileenmcnaughton/actt2
[REF] Remove & from before variable
Matthew Wire [Wed, 25 Mar 2020 20:00:35 +0000 (20:00 +0000)]
Merge pull request #16880 from yashodha/error
log error message instead of throwing exception
Eileen McNaughton [Wed, 25 Mar 2020 19:22:49 +0000 (08:22 +1300)]
Merge pull request #16898 from civicrm/5.24
5.24
Eileen McNaughton [Wed, 25 Mar 2020 19:22:17 +0000 (08:22 +1300)]
Merge pull request #16697 from eileenmcnaughton/deprecate
Add some deprecation notices, stop calling PrevNext::cleanupCache
eileen [Wed, 25 Mar 2020 04:40:59 +0000 (17:40 +1300)]
[REF] Remove & from before variable
I couldn't see how this & could do anything useful given it's an object & testing shows the form is unchanged
Seamus Lee [Wed, 25 Mar 2020 02:45:54 +0000 (13:45 +1100)]
Merge pull request #16842 from demeritcowboy/lang-install-crash
dev/translation#40 - Fix crash when change language on installer page
eileen [Wed, 25 Mar 2020 02:42:04 +0000 (15:42 +1300)]
Remove assigns for atypefile
This is old code - I traced back it's introduction to https://github.com/civicrm/civicrm-svn/commit/
fb3038000356998e43b0c9aea67f0186f7e41516
which relates to https://issues.civicrm.org/jira/browse/CRM-3829?page=com.atlassian.streams.streams-jira-plugin:activity-stream-issue-tab
At that time the template used the variable- ie https://github.com/civicrm/civicrm-svn/commit/
fb3038000356998e43b0c9aea67f0186f7e41516#diff-6fc7e9552ffce6cf4cb7680854ef7b70R4
But that is no longer the case
Seamus Lee [Wed, 25 Mar 2020 02:15:37 +0000 (13:15 +1100)]
Merge pull request #16894 from seamuslee001/core/issues/923
Fixed fatal error for Event Participants custom search if price set f…
Eileen McNaughton [Wed, 25 Mar 2020 01:16:41 +0000 (14:16 +1300)]
Merge pull request #16869 from colemanw/del
APIv3 - Use new DAO::deleteRecord method
Eileen McNaughton [Wed, 25 Mar 2020 01:12:43 +0000 (14:12 +1300)]
Merge pull request #16867 from colemanw/dashboard
APIv4 - Add Dashboard & DashboardContact entities
Seamus Lee [Wed, 25 Mar 2020 00:57:54 +0000 (11:57 +1100)]
Merge pull request #16892 from civicrm/5.24
5.24
Pradeep Nayak [Sat, 11 May 2019 09:30:36 +0000 (10:30 +0100)]
Fixed fatal error for Event Participants custom search if price set field option is disabled after a registrant has already selected it
Fix test failure and parametise queries
Seamus Lee [Tue, 24 Mar 2020 23:46:40 +0000 (10:46 +1100)]
Merge pull request #16891 from seamuslee001/5_23_4_release_notes
Add release-notes/5.23.4.md
Seamus Lee [Tue, 24 Mar 2020 23:45:56 +0000 (10:45 +1100)]
Merge pull request #16887 from totten/5.24-dbl-path
dev/joomla#26 - Fix path derivation when CMS is rooted in a subdir
Tim Otten [Tue, 24 Mar 2020 22:28:00 +0000 (15:28 -0700)]
Add release-notes/5.23.4.md
Tim Otten [Tue, 24 Mar 2020 21:46:10 +0000 (14:46 -0700)]
(NFC) Update comments in PathsTest.php
yashodha [Tue, 24 Mar 2020 11:36:41 +0000 (17:06 +0530)]
log error message instead of throwing exception
yashodha [Mon, 23 Mar 2020 11:52:46 +0000 (17:22 +0530)]
log error message instead of throwing exception
Seamus Lee [Tue, 24 Mar 2020 06:28:55 +0000 (17:28 +1100)]
Merge pull request #16872 from colemanw/arrayValue8
[REF] Replace \CRM_Utils_Array::value with ??
Seamus Lee [Tue, 24 Mar 2020 06:26:44 +0000 (17:26 +1100)]
Merge pull request #16873 from colemanw/api4ArrayValue
[REF] Civi/Api4 - Refactor out 'use CRM_Utils_Array'
Seamus Lee [Tue, 24 Mar 2020 06:25:40 +0000 (17:25 +1100)]
Merge pull request #16874 from colemanw/contactCleanup
[REF] BAO_Contact - Remove CRM_Utils_Array::value and other unnecessary code
colemanw [Tue, 24 Mar 2020 05:59:59 +0000 (01:59 -0400)]
Merge pull request #16884 from civicrm/5.24
5.24
Tim Otten [Tue, 24 Mar 2020 05:56:36 +0000 (22:56 -0700)]
dev/joomla#26 - Fix path derivation when CMS is rooted in a subdir
Overview
--------
CiviCRM is deployed inside a CMS. The CMS is usually deployed at the HTTP root (`http://example.org`),
but it is sometimes deployed in a subdirectory (`http://example.org/my-cms`).
Some asset URLs are computed using the variables `[civicrm.bower]`, `[civicrm.packages]`, and `[civicrm.vendor]`, which
are derived from the value of `[civicrm.root]`. However, if the site is deployed in a subdirectory, and if using v5.23,
then the computation of `[civicrm.bower]` (etc) can misbehave.
Before
------
When the URL for `[civicrm.bower]` (or similar) is derived, it goes through multiple filters - first, from absolute to
relative, and then later from relative back to absolute. In the process, the base is inadvertently changed.
After
-----
When the URL is derived, it is computed in absolute format - and simply kept that way.
Comments
--------
Regarding test coverage, there are two relevant unit-tests. This PR only updates one.
* `E2E\Core\PathUrlTest`: This is a more concrete smoke test which demonstrates functional problems with variables like
`[civicrm.bower]`. It should already catch problems like dev/joomla#26... but only if you run the E2E suite on a system
where the CMS was deployed to a subdirectory. `civibuild` doesn't currently include such a build-type.
* `Civi\Core\PathsTest`: This is a more abstract, headless test to examine edge-cases in `Civi\Core\Paths`. It does not
specifically check for `[civicrm.bower]` or similar variables (b/c the URL routing is ill-defined in a headless context).
However, I've updated it to compare/contrast the working and non-working ways to derive variables.
demeritcowboy [Tue, 24 Mar 2020 03:07:29 +0000 (23:07 -0400)]
make install work on windows
Eileen McNaughton [Tue, 24 Mar 2020 03:03:20 +0000 (16:03 +1300)]
Merge pull request #16878 from colemanw/api4Sql
[REF] APIv4 - Restructure the way get query objects are constucted
Seamus Lee [Tue, 24 Mar 2020 01:55:19 +0000 (12:55 +1100)]
Merge pull request #16883 from demeritcowboy/blank-dashboard-notice
dev/core#1668 - Avoid E_NOTICE when removing last dashlet
Eileen McNaughton [Tue, 24 Mar 2020 00:45:43 +0000 (13:45 +1300)]
Merge pull request #16876 from colemanw/ssFix
Fix undefined index warning in SavedSearch api
Seamus Lee [Mon, 23 Mar 2020 21:20:51 +0000 (08:20 +1100)]
Merge pull request #16659 from demeritcowboy/name-label-print-report
Alternate to #16650 - On Case Audit/Print Report richtext details field is getting escaped when system is non-english
demeritcowboy [Mon, 23 Mar 2020 20:43:49 +0000 (16:43 -0400)]
avoid notice on removing last dashlet
Seamus Lee [Mon, 23 Mar 2020 20:39:46 +0000 (07:39 +1100)]
Merge pull request #16591 from ixiam/dev/core#1575
Fix use col "Soft Credit Amount Stats" and any filter of contribution…
Coleman Watts [Fri, 20 Mar 2020 17:25:15 +0000 (13:25 -0400)]
DashboardContact - Change column_no field from bool to int
Coleman Watts [Fri, 20 Mar 2020 17:02:09 +0000 (13:02 -0400)]
Cleanup Dashboard BAO
Coleman Watts [Fri, 20 Mar 2020 16:29:05 +0000 (12:29 -0400)]
APIv4 - Generic handler for domain_id field.
This field should be treated the same across all entities for consistency.
Coleman Watts [Fri, 20 Mar 2020 15:54:49 +0000 (11:54 -0400)]
Dashboard - serialize field in metadata
Coleman Watts [Fri, 20 Mar 2020 14:19:59 +0000 (10:19 -0400)]
APIv4 - Add Dashboard & DashboardContact entities
colemanw [Mon, 23 Mar 2020 20:10:07 +0000 (16:10 -0400)]
Merge pull request #16870 from seamuslee001/pear_mail_patch_port
[REF] Use composer patches to apply CiviCRM Customisations for CRM-1367 and CRM-5946
colemanw [Mon, 23 Mar 2020 18:47:37 +0000 (14:47 -0400)]
Merge pull request #16881 from wmortada/core#1331-4
dev/core#1331 Add missing parameter to translation string
colemanw [Mon, 23 Mar 2020 18:36:50 +0000 (14:36 -0400)]
Merge pull request #16875 from colemanw/arrayValue9
[REF] Cleanup is_array(CRM_Utils_Array::value()) pattern
Coleman Watts [Mon, 23 Mar 2020 14:41:34 +0000 (10:41 -0400)]
Deprecate redundant api3 util function
Coleman Watts [Mon, 23 Mar 2020 02:32:04 +0000 (22:32 -0400)]
APIv4 - Cleanup and restructure the way get query objects are constructed
William Mortada [Mon, 23 Mar 2020 16:18:13 +0000 (16:18 +0000)]
Add missing parameter to translation string
colemanw [Mon, 23 Mar 2020 16:15:32 +0000 (12:15 -0400)]
Merge pull request #16832 from eileenmcnaughton/deltest2
dev/core#667 Fix bug where entity_tags are not deleted by 'soft FK'
Coleman Watts [Sat, 21 Mar 2020 16:08:43 +0000 (12:08 -0400)]
BAO_Contact - Remove CRM_Utils_Array::value and other unnecessary code
Matthew Wire [Mon, 23 Mar 2020 11:14:40 +0000 (11:14 +0000)]
Merge pull request #16785 from demeritcowboy/weird-casetype-check
dev/core#1652 - Check for change case type activity on case activity form doesn't work
Matthew Wire [Mon, 23 Mar 2020 11:10:16 +0000 (11:10 +0000)]
Merge pull request #16674 from alexymik/patch-2
Add privacy fields to ContributionDetail report
Seamus Lee [Mon, 23 Mar 2020 07:36:21 +0000 (18:36 +1100)]
Merge pull request #16787 from eileenmcnaughton/dead
Follow up on fix on updating memberships when a contact is deceased
Seamus Lee [Mon, 23 Mar 2020 07:01:14 +0000 (18:01 +1100)]
Merge pull request #16879 from civicrm/5.24
5.24
Tim Otten [Mon, 23 Mar 2020 03:32:47 +0000 (20:32 -0700)]
Merge pull request #16702 from seamuslee001/5.24
bin/*, extern/* - Fix leak of "$config" in global namespace
Eileen McNaughton [Sun, 22 Mar 2020 21:38:47 +0000 (10:38 +1300)]
Merge pull request #16857 from mattwire/cancelsubscriptionprocessorname
Fix display of payment processor title in cancelSubscription form
Eileen McNaughton [Sun, 22 Mar 2020 21:37:26 +0000 (10:37 +1300)]
Merge pull request #16853 from colemanw/bool3
CRM/Contribute - Cleanup boolean expressions
eileen [Sun, 15 Mar 2020 23:53:22 +0000 (12:53 +1300)]
Follow up on fix on updating memberships when a contact is deceased
This removes the now-duplicate call from the Contact edit form & fixes it such that the message would appear
for any logged in action that causes this (notably the 2 ways of editing the contact at the moment.)
Note it might change the way the messages look from one message to more than one - this feels like
it's arguable enough that it's not worth worrying about
eileen [Wed, 18 Mar 2020 02:32:02 +0000 (15:32 +1300)]
dev/core#667 Fix bug where entity_tags are not deleted by 'soft FK'
Eileen McNaughton [Sun, 22 Mar 2020 02:01:33 +0000 (15:01 +1300)]
Merge pull request #16480 from eileenmcnaughton/comp
dev/financial#87 make it possible to add a payment to a fully paid contribution
Coleman Watts [Sat, 21 Mar 2020 19:32:06 +0000 (15:32 -0400)]
Fix undefined index warning in SavedSearch api
colemanw [Sat, 21 Mar 2020 18:44:06 +0000 (14:44 -0400)]
Merge pull request #16742 from jaapjansma/dev-1640
dev/1640 New feature - adds a checkbox to the update contribution status form to determine if a receipt is sent
Coleman Watts [Sat, 21 Mar 2020 18:01:14 +0000 (14:01 -0400)]
Cleanup is_array(CRM_Utils_Array::value()) pattern
Jaap Jansma [Sat, 21 Mar 2020 16:37:07 +0000 (17:37 +0100)]
Issue #1640 including a test
Seamus Lee [Sat, 21 Mar 2020 01:43:42 +0000 (12:43 +1100)]
Merge pull request #16871 from colemanw/arrayValueTest
Civi/Test - Refactor out CRM_Utils_Array::value
Coleman Watts [Sat, 21 Mar 2020 00:42:33 +0000 (20:42 -0400)]
Civi/Api4 - Refactor out 'use CRM_Utils_Array'
Coleman Watts [Fri, 20 Mar 2020 23:52:57 +0000 (19:52 -0400)]
Civi - replace CRM_Utils_Array::value with ??
Coleman Watts [Fri, 20 Mar 2020 23:41:10 +0000 (19:41 -0400)]
Civi/Test - Refactor out CRM_Utils_Array::value
Seamus Lee [Fri, 20 Mar 2020 22:19:42 +0000 (09:19 +1100)]
Use composer patches to apply CiviCRM customisations for pear_mail
Seamus Lee [Wed, 18 Mar 2020 04:46:39 +0000 (15:46 +1100)]
Rename file to be standard patch file
Matthew Wire [Fri, 20 Mar 2020 22:08:53 +0000 (22:08 +0000)]
Merge pull request #16609 from wmortada/core#1331-3
dev/core#1331 Don't freeze fields for auto-renew memberships
Seamus Lee [Fri, 20 Mar 2020 22:02:00 +0000 (09:02 +1100)]
Merge pull request #16861 from eileenmcnaughton/dep
[TEST] Add test for to time processing
Eileen McNaughton [Fri, 20 Mar 2020 21:42:31 +0000 (10:42 +1300)]
Merge pull request #16865 from yashodha/typo-fixes
fix typo
Eileen McNaughton [Fri, 20 Mar 2020 21:40:54 +0000 (10:40 +1300)]
Merge pull request #16834 from colemanw/apiGroup
APIv4 - Improve saveSearch popup in Explorer
Seamus Lee [Fri, 20 Mar 2020 21:40:15 +0000 (08:40 +1100)]
Merge pull request #16866 from colemanw/versionThreeAndFour
API tests - remove unnecessary check for v4
Coleman Watts [Fri, 20 Mar 2020 19:45:34 +0000 (15:45 -0400)]
APIv3 - Use new DAO::deleteRecord method
Matthew Wire [Thu, 19 Mar 2020 18:19:30 +0000 (18:19 +0000)]
Fix display of payment processor title in cancelSubscription form
Coleman Watts [Fri, 20 Mar 2020 14:26:20 +0000 (10:26 -0400)]
API tests - remove unnecessary check for v4
Coleman Watts [Tue, 17 Mar 2020 20:28:14 +0000 (16:28 -0400)]
APIv4 - Improve saveSearch popup in Explorer
yashodha [Fri, 20 Mar 2020 09:03:01 +0000 (14:33 +0530)]
fix typo
Seamus Lee [Fri, 20 Mar 2020 05:23:43 +0000 (16:23 +1100)]
Merge pull request #16862 from eileenmcnaughton/build
[REF] Remove redundant call to build permissions
Seamus Lee [Fri, 20 Mar 2020 05:20:42 +0000 (16:20 +1100)]
dev/core#561 Add in deprecation notice on addDateRange funtion
Seamus Lee [Fri, 20 Mar 2020 05:08:16 +0000 (16:08 +1100)]
Merge pull request #15709 from seamuslee001/report_jcalender_upgrade
dev/core#561 Convert Reports from jcalender to datepicker format
eileen [Tue, 17 Mar 2020 01:52:48 +0000 (14:52 +1300)]
dev/core#667 Add test to demonstrate entity tags are not being deleted
Seamus Lee [Fri, 20 Mar 2020 04:36:12 +0000 (15:36 +1100)]
Merge pull request #16846 from jitendrapurohit/core-1664
dev/core#1664 - Fix errors recorded in log message on Manage Case scr…
eileen [Fri, 20 Mar 2020 04:00:32 +0000 (17:00 +1300)]
[REF] Remove redundant call to build permissions
Per the comments I added to the function the output of this permissions clause is overwritten. I stepped through
this in the process of reviewing the datepicker PR & confirmed it
Seamus Lee [Sat, 2 Nov 2019 21:40:09 +0000 (08:40 +1100)]
Convert Reports from jcalender to datepicker format
Add in unit test of report upgrade process
Fix time handling as per review from Eileen and fix query for time handling
Jitendra Purohit [Thu, 19 Mar 2020 08:52:36 +0000 (14:22 +0530)]
dev/core#1664 - Fix errors recorded in log message on Manage Case screen and case dashboard page
eileen [Fri, 20 Mar 2020 00:02:50 +0000 (13:02 +1300)]
[TEST] Add test for to time processing