Seamus Lee [Wed, 7 Oct 2020 05:47:03 +0000 (16:47 +1100)]
dev/translation#54 Ensure that Component titles are translated in link text
Seamus Lee [Wed, 7 Oct 2020 04:24:53 +0000 (15:24 +1100)]
Merge pull request #18623 from eileenmcnaughton/rene
dev/core#1790 - Contact Card - Email Links
Seamus Lee [Wed, 7 Oct 2020 03:54:55 +0000 (14:54 +1100)]
Merge pull request #18684 from eileenmcnaughton/block
dev/core#2039 Call del directly - rather than now-deprecated blockDelete
Eileen McNaughton [Wed, 7 Oct 2020 02:49:42 +0000 (15:49 +1300)]
Merge pull request #18672 from colemanw/searchKit
Search ext: rename to Search Kit, mark as beta
eileen [Wed, 7 Oct 2020 01:05:46 +0000 (14:05 +1300)]
dev/core#2039 Call del directly - rather than now-deprecated blockDelete
blockDelete is now just wrapper for del so this is really NFC
Seamus Lee [Tue, 6 Oct 2020 22:24:26 +0000 (09:24 +1100)]
Merge pull request #18679 from seamuslee001/vardump_d9_compatability
[REF] Fix compatability with Drupal 9 installing of var_dumper
Seamus Lee [Tue, 6 Oct 2020 22:09:15 +0000 (09:09 +1100)]
Merge pull request #18658 from eileenmcnaughton/address
dev/core#2046 Migrate BAO_Address::create towards standardisation
Seamus Lee [Tue, 6 Oct 2020 22:08:34 +0000 (09:08 +1100)]
Merge pull request #18661 from eileenmcnaughton/blockdel
dev/core#2046 Fix blockDelete to delete while ensuring is_primary is valid
Seamus Lee [Tue, 6 Oct 2020 21:59:34 +0000 (08:59 +1100)]
Merge pull request #18664 from eileenmcnaughton/list
dev/core#2079 [REF] clean up call to apiQuery
Eileen McNaughton [Tue, 6 Oct 2020 21:11:33 +0000 (10:11 +1300)]
Merge pull request #18677 from pradpnayak/float
change civicrm_price_set.min_amount to float
Seamus Lee [Tue, 6 Oct 2020 20:39:38 +0000 (07:39 +1100)]
[REF] Fix compatability with Drupal 9 installing of var_dumper
Seamus Lee [Tue, 6 Oct 2020 20:36:25 +0000 (07:36 +1100)]
Merge pull request #18678 from demeritcowboy/class-typos
dev/core#2093 - Fix red error box on new individual form and ltrim typos and doubling-up of class attribute
demeritcowboy [Tue, 6 Oct 2020 14:34:48 +0000 (10:34 -0400)]
ltrim typos
Pradeep Nayak [Tue, 6 Oct 2020 10:48:01 +0000 (11:48 +0100)]
change civicrm_price_set.min_amount to float
Seamus Lee [Tue, 6 Oct 2020 06:16:32 +0000 (17:16 +1100)]
Merge pull request #18665 from eileenmcnaughton/list2
dev/core#2079 [REF] clean up call to apiQuery
Seamus Lee [Tue, 6 Oct 2020 06:14:05 +0000 (17:14 +1100)]
Merge pull request #18657 from eileenmcnaughton/token_2
dev/core#2079 do not return never-used, query-wasting variable
eileen [Tue, 6 Oct 2020 04:52:19 +0000 (17:52 +1300)]
Remove caching that messes with tests without any time saving
eileen [Mon, 5 Oct 2020 23:11:38 +0000 (12:11 +1300)]
Add supporting test
Eileen McNaughton [Tue, 6 Oct 2020 04:47:33 +0000 (17:47 +1300)]
Merge pull request #18676 from seamuslee001/ref_remove_xml_util
[REF] Remove XML_Util dependancy within ewaysingle extension
Seamus Lee [Tue, 6 Oct 2020 01:23:50 +0000 (12:23 +1100)]
[REF] Remove XML_Util dependancy within ewaysingle extension
Seamus Lee [Tue, 6 Oct 2020 01:27:44 +0000 (12:27 +1100)]
Merge pull request #18673 from totten/master-gitignore
When exporting for composer-style deployment, exclude the `.gitignore` file
eileen [Fri, 2 Oct 2020 20:13:04 +0000 (09:13 +1300)]
dev/core#2079 [REF] clean up call to apiQuery
This fixes a few things
1) fixes apiQuery to be called statically as it is a static function
2) casts results directly to detail
3) removes unnused variable
Seamus Lee [Tue, 6 Oct 2020 01:10:37 +0000 (12:10 +1100)]
Merge pull request #18675 from eileenmcnaughton/uf2
dev/core#2087 move uf_match check above the primary check
Eileen McNaughton [Tue, 6 Oct 2020 00:47:12 +0000 (13:47 +1300)]
Merge pull request #18674 from seamuslee001/form_buttons_key
[REF] Fix adding in the accessKey based on the button array
eileen [Fri, 2 Oct 2020 22:07:37 +0000 (11:07 +1300)]
dev/core#2087 move uf_match check above the primary check
the uf_match check will result in an early return more often than the other
Seamus Lee [Mon, 5 Oct 2020 22:50:57 +0000 (09:50 +1100)]
[REF] Fix adding in the accessKey based on the button array
Seamus Lee [Mon, 5 Oct 2020 22:50:08 +0000 (09:50 +1100)]
Merge pull request #18143 from mattwire/membertabbuttons
Move membership tab add/submit membership buttons to PHP layer
Seamus Lee [Mon, 5 Oct 2020 22:34:02 +0000 (09:34 +1100)]
Merge pull request #18611 from mattwire/activitytokensmodifieddate
Add modified_date to list of activity tokens
Seamus Lee [Mon, 5 Oct 2020 22:27:24 +0000 (09:27 +1100)]
Merge pull request #18610 from demeritcowboy/error-recursion-recursion
dev/drupal#119 - Avoid crash from recursion on unhandled exceptions
Tim Otten [Mon, 5 Oct 2020 20:40:46 +0000 (13:40 -0700)]
gitattributes - When exporting for composer-style tarball, exclude gitignore
Eileen McNaughton [Mon, 5 Oct 2020 20:12:58 +0000 (09:12 +1300)]
Merge pull request #18649 from seamuslee001/error_class_remove
Ensure that the crm-error class on the field is also remove when field is changed
Coleman Watts [Mon, 5 Oct 2020 12:45:16 +0000 (08:45 -0400)]
Search ext: rename to Search Kit, mark as beta
Yashodha Chaku [Mon, 5 Oct 2020 11:27:18 +0000 (16:57 +0530)]
Merge pull request #18671 from MegaphoneJon/fix-perm-labels
fix labels on new admin permissions
colemanw [Sun, 4 Oct 2020 23:03:28 +0000 (19:03 -0400)]
Merge pull request #17675 from agh1/aria-form-fixes
Select field fixes for screen reader
Jon Goldberg [Sun, 4 Oct 2020 22:37:13 +0000 (18:37 -0400)]
fix labels on new admin permissions
demeritcowboy [Sat, 26 Sep 2020 14:25:12 +0000 (10:25 -0400)]
avoid crash from recursion on exceptions
Seamus Lee [Thu, 1 Oct 2020 01:41:10 +0000 (11:41 +1000)]
[REF] Ensure that the crm-error class on the field is also remove when field is changed
Only handle crm-error class
Seamus Lee [Sun, 4 Oct 2020 04:55:37 +0000 (15:55 +1100)]
Merge pull request #18644 from colemanw/savedSearch
Search ext: support complex joins & HAVING clause in api4 smart groups
Seamus Lee [Sun, 4 Oct 2020 04:22:10 +0000 (15:22 +1100)]
Merge pull request #18670 from totten/master-compup
composer.json - Update compile-lib and compile-plugin
Coleman Watts [Sat, 3 Oct 2020 00:45:47 +0000 (20:45 -0400)]
Updates for Angular 1.8 - fix premature access to component properties
Angular 1.8 doesn't seem to like it when you try to access component properties
before the init function.
colemanw [Sun, 4 Oct 2020 01:55:00 +0000 (21:55 -0400)]
Merge pull request #18647 from seamuslee001/widget_button_classes
[REF] Add in css classes to make the save and preview button on the C…
Tim Otten [Sun, 4 Oct 2020 01:00:41 +0000 (18:00 -0700)]
composer.lock - Update composer-compile-lib and composer-compile-plugin
Tim Otten [Sun, 4 Oct 2020 01:00:20 +0000 (18:00 -0700)]
composer.json - Update composer-compile-lib
Eileen McNaughton [Sat, 3 Oct 2020 23:02:54 +0000 (12:02 +1300)]
Merge pull request #18669 from demeritcowboy/blank-target-contact
dev/core#2090 - Undefined index on contact's activity tab when there's an activity that has no With Contact
Andrew Hunt [Mon, 14 Sep 2020 18:39:45 +0000 (14:39 -0400)]
StateProvince DAO title should be State/Province
Andrew Hunt [Mon, 14 Sep 2020 18:38:27 +0000 (14:38 -0400)]
Select placeholders should always say what kind of thing they select
Andrew Hunt [Sat, 20 Jun 2020 18:00:33 +0000 (14:00 -0400)]
Cleanup with ??
Andrew Hunt [Sat, 20 Jun 2020 17:14:42 +0000 (13:14 -0400)]
Attributes for a form element should always be an array
demeritcowboy [Sat, 3 Oct 2020 16:46:15 +0000 (12:46 -0400)]
handle missing array member
eileen [Fri, 2 Oct 2020 20:59:47 +0000 (09:59 +1300)]
dev/core#2079 [REF] clean up call to apiQuery
This fixes
1) fixes apiQuery to be called statically as it is a static function
2) casts results directly to detail
This is the copy & paste source of https://github.com/civicrm/civicrm-core/pull/18664 I guess....
Coleman Watts [Sat, 3 Oct 2020 00:44:43 +0000 (20:44 -0400)]
Search ext: Fix column appearing in the aggregate list when it is used in GROUP_BY
The bug was that it wasn't recognizing the column name after a function was added to it.
Coleman Watts [Wed, 30 Sep 2020 18:56:59 +0000 (14:56 -0400)]
Search ext: Extend api4 smart groups to work with HAVING
Eileen McNaughton [Fri, 2 Oct 2020 22:01:17 +0000 (11:01 +1300)]
Merge pull request #18666 from civicrm/5.30
5.30 to master
Eileen McNaughton [Fri, 2 Oct 2020 22:00:19 +0000 (11:00 +1300)]
Merge pull request #18648 from demeritcowboy/missing-mail-help
dev/core#1920 - Fix smarty error and missing mail setting help
Eileen McNaughton [Fri, 2 Oct 2020 21:58:09 +0000 (10:58 +1300)]
Merge pull request #18660 from totten/master-bundle-ext
(REF) Make it easier for extensions to define basic bundles
Coleman Watts [Tue, 29 Sep 2020 15:30:19 +0000 (11:30 -0400)]
Search ext: Choose smart group contact column
Coleman Watts [Tue, 29 Sep 2020 20:22:50 +0000 (16:22 -0400)]
Search ext: fix missing titles in multivalue custom entities
Coleman Watts [Mon, 28 Sep 2020 20:17:16 +0000 (16:17 -0400)]
Search ext: Ability to load saved searches by id
Tim Otten [Fri, 2 Oct 2020 07:31:18 +0000 (00:31 -0700)]
(NFC) Update docblock in CRM_Core_Resources_Common
eileen [Mon, 28 Sep 2020 01:41:10 +0000 (14:41 +1300)]
dev/core#1790 - Contact Card - Email Links
Alternate to https://github.com/civicrm/civicrm-core/pull/17517
The current PR stalled on the issue that passing 'email' to the email task could load up
the wrong contact. This gets around that by doing a separate (but hopefully quick) lookup
to grab the email id. I also made it dependent on the url having is_show_email_task=1 in
it. I went back & forwards on that vs is_backoffice
Tim Otten [Fri, 2 Oct 2020 00:38:00 +0000 (17:38 -0700)]
(DX) Resources - Add helper for creating new bundles
Tim Otten [Fri, 2 Oct 2020 00:16:44 +0000 (17:16 -0700)]
(REF) Convert hidden function 'useRegion' to public 'fillDefaults'
This mostly affects a hypothetical bundle defined outside of core's `Common.php`:
* Before: You cannot re-use `useRegion()`. You'd have to write it again.
* After: You can re-use and/or override `fillDefaults()`.
Seamus Lee [Fri, 2 Oct 2020 05:05:00 +0000 (15:05 +1000)]
Merge pull request #18635 from colemanw/angular-1.8
dev/core#1818 Upgrade AngularJS from 1.5.11 to 1.8
Seamus Lee [Fri, 2 Oct 2020 03:19:00 +0000 (13:19 +1000)]
Merge pull request #18636 from demeritcowboy/test-scalar-target
dev/core#2057 - Failing unit test for passing in activity contacts as scalars to Activity::create()
Seamus Lee [Fri, 2 Oct 2020 03:09:16 +0000 (13:09 +1000)]
Merge pull request #18659 from totten/master-cssmin
dev/core#1393 - distmaker - Skip new file "vendor/bin/cssmin"
eileen [Thu, 1 Oct 2020 22:57:07 +0000 (11:57 +1300)]
dev/core#2046 Migrate BAO_Address::create towards standardisation
Our standard expectation is that each BAO will have a create action that handles a single entity. For legacy
reasons Address.create has special handling for multiple addresses. This extracts that handling
into a separate function (legacyCreate) and updates the (very few) places currently calling create to
call that.
With this merged apis v3 & v4 can call Address.create - currently v3 is hard coded to call add and
v4 bypasses the BAO altogher. The v4 api bypass means we are not managing is_primay integrity on v4 api calls
eileen [Fri, 2 Oct 2020 01:32:56 +0000 (14:32 +1300)]
dev/core#2046 Fix blockDelete to delete while ensuring is_primary is valid
The del function on each of the location DAO ensures that after a delete at least one phone (etc) is
marked is_primary. This blockDelete does not do that & per the test it's possible to call this
in such a way that no addresses are primary. Whether this actually happens is a bit unknown.
However, this cleans up block delete in a way where we can demonstrate the tests work
Tim Otten [Fri, 2 Oct 2020 00:41:29 +0000 (17:41 -0700)]
dev/core#1393 - distmaker - Skip new file "vendor/bin/cssmin"
Overview
----------------------------------------
This fixes the broken distmaker builds in `master`.
The file `vendor/bin/cssmin` was recently added by way of `composer-compile-lib => cssmin`.
We don't need it in the tarball, and it's a symlink, so trying to include breaks some
consumers (like in https://lab.civicrm.org/dev/core/-/issues/1393).
Technical Details
----------------------------------------
* Before (last release): `vendor/bin/cssmin` does not exist
* Before (current master): `vendor/bin/cssmin` is created as symlink, copied to tarball
* After (this commit): `vendor/bin/cssmin` is created on dev-builds but omitted from tarball
Seamus Lee [Fri, 2 Oct 2020 00:22:12 +0000 (10:22 +1000)]
Merge pull request #18625 from eileenmcnaughton/activi
dev/core#2057 Remove extraneous activity contact queries on activity update
Seamus Lee [Fri, 2 Oct 2020 00:19:41 +0000 (10:19 +1000)]
Merge pull request #18643 from eileenmcnaughton/cache
Fix cache bypass
Eileen McNaughton [Thu, 1 Oct 2020 23:12:07 +0000 (12:12 +1300)]
Merge pull request #18656 from eileenmcnaughton/apiq
dev/core#2079 [REF] Remove reference to second param returned from CRM_Contact_BAO_Query::apiQuery
Seamus Lee [Thu, 1 Oct 2020 22:13:54 +0000 (08:13 +1000)]
Merge pull request #18606 from eileenmcnaughton/create
dev/core#2046 Ensure location BAOs have create actions, deprecate add…
Seamus Lee [Thu, 1 Oct 2020 22:10:55 +0000 (08:10 +1000)]
Merge pull request #18608 from eileenmcnaughton/block
[REF] Follow up cleanup from Event Location
eileen [Thu, 1 Oct 2020 20:17:45 +0000 (09:17 +1300)]
dev/core#2079 do not return never-used, query-wasting variable
The second value from apiQuery is calculated using an extraneous uncached query. This function
is the only function that calls that function AND puts that value into a variable. This change clarfies that
this function does not require thhe variable
eileen [Thu, 1 Oct 2020 05:44:49 +0000 (18:44 +1300)]
[REF] Remove reference to second param returned from CRM_Contact_BAO_Query::apiQuery
Coleman Watts [Tue, 29 Sep 2020 21:53:31 +0000 (17:53 -0400)]
Remove problematic tests
This removes 2 tests that broke with the upgrade to Angular 1.8.
Neither test was covering much of anything useful.
Coleman Watts [Tue, 29 Sep 2020 15:53:30 +0000 (11:53 -0400)]
dev/core#1818 Upgrade AngularJS from 1.5.11 to 1.8
https://lab.civicrm.org/dev/core/-/issues/1818
The biggest breaking change between 1.5 and 1.8 was the default hashPrefix.
See https://github.com/angular/angular.js/blob/master/CHANGELOG.md#location-due-to-1
Our solution is to force crmApp to use the previous default. This ensures that existing modules
which rely on crmApp for routing (which is nearly all of them) will be unaffected.
New modules like Afform which use their own routing should use the new default recommended by Angular.
Eileen McNaughton [Thu, 1 Oct 2020 10:43:49 +0000 (23:43 +1300)]
Merge pull request #18655 from eileenmcnaughton/token2
dev/core#2079 [REF] Fix some more calls to getTokens to make it clear only the first return value is used
Seamus Lee [Thu, 1 Oct 2020 07:30:44 +0000 (17:30 +1000)]
Merge pull request #18652 from eileenmcnaughton/silly
Fix patently silly code
eileen [Mon, 28 Sep 2020 10:06:26 +0000 (23:06 +1300)]
dev/core#2057 Remove extraneous activity contact queries on activity update
This changes it so that instead of doing either
1) if passing in an array of activity contacts for a given type then attempt
to delete existing contacts, regardless of whether they are the same as the
existing ones, create new ones
OR
2) if the param is an int then do a lookup, per record type, and update if needed to
- Do one query to find existing records of types to be deleted (for all 3 record types).
Only delete activity contact records that are not to be kept and
don't alter those records that should be retained
eileen [Thu, 1 Oct 2020 05:39:34 +0000 (18:39 +1300)]
[REF] Fix some more calls to getTokens to make it clear only the first return value is used
eileen [Thu, 1 Oct 2020 03:59:30 +0000 (16:59 +1300)]
Fix patently silly code
eileen [Thu, 1 Oct 2020 03:15:35 +0000 (16:15 +1300)]
Fix insufficiently distinct cache key
eileen [Wed, 30 Sep 2020 09:04:43 +0000 (22:04 +1300)]
Fix cache bypass
If the contact is not impacted by any acls then ids will be an empty array. However, currently
an empty array is treated as 'uncached' rather than 'cached by empty' which
would be represented by null
Seamus Lee [Thu, 1 Oct 2020 02:56:54 +0000 (12:56 +1000)]
Merge pull request #18640 from eileenmcnaughton/syn
dev/core#2073 Improve cleanup on syntax conformance test
Eileen McNaughton [Thu, 1 Oct 2020 02:54:27 +0000 (15:54 +1300)]
Merge pull request #18416 from seamuslee001/dev_core_2003
dev/core#2003 Use Brick/Money to ensure that we display all possible …
Seamus Lee [Thu, 1 Oct 2020 02:14:20 +0000 (12:14 +1000)]
Merge pull request #18646 from totten/master-complib
(REF) Switch to composer-compile-lib
eileen [Wed, 30 Sep 2020 05:09:05 +0000 (18:09 +1300)]
dev/core#2073 Improve cleanup on syntaxconformance test
Cleaning up all objects seems a bit too much - but ensuring we
re-set the DAO we create in this class should be a memory-friendly action
https://github.com/civicrm/civicrm-core/pull/18639
demeritcowboy [Wed, 30 Sep 2020 23:44:48 +0000 (19:44 -0400)]
fix missing mail setting help
Tim Otten [Wed, 30 Sep 2020 22:42:29 +0000 (15:42 -0700)]
Greenwich - Switch to composer-compile-lib
Seamus Lee [Wed, 30 Sep 2020 23:18:33 +0000 (09:18 +1000)]
[REF] Add in css classes to make the save and preview button on the Contribution Page widget settings form look consistant with the other buttons on the page
Seamus Lee [Wed, 30 Sep 2020 23:11:05 +0000 (09:11 +1000)]
Merge pull request #18607 from eileenmcnaughton/website
dev/core#2046 Rationalise add vs create on website BAO
Seamus Lee [Wed, 30 Sep 2020 22:38:31 +0000 (08:38 +1000)]
Merge pull request #18642 from seamuslee001/dev_core_339_custom_field
dev/core#334 Use the current in use collation and character sets when…
Tim Otten [Wed, 30 Sep 2020 21:36:44 +0000 (14:36 -0700)]
composer.json - Switch to composer-compile-lib. Add more helpers.
The overall effect of this change is to get access to a few more helpers.
Before: Load `composer-compile-plugin`, `scssphp`, and `php-autoprefxer` as
three distinct packages.
After: Load `composer-compile-lib`, which transitively requires all those others
*and* includes some helpers.
Sea also
* https://github.com/civicrm/composer-compile-plugin
* https://github.com/civicrm/composer-compile-lib
Seamus Lee [Wed, 9 Sep 2020 05:54:50 +0000 (15:54 +1000)]
dev/core#2003 Use Brick/Money to ensure that we display all possible digits stored in the database for the option amount
Add in noisy notice about fall back due to missing intl extension
Seamus Lee [Wed, 30 Sep 2020 21:10:47 +0000 (07:10 +1000)]
Merge pull request #18621 from eileenmcnaughton/prefix
dev/membership#27 Update outdated membership statuses in preProcess rather than submit
Seamus Lee [Wed, 30 Sep 2020 21:05:36 +0000 (07:05 +1000)]
Merge pull request #18632 from eileenmcnaughton/leak
dev/core#2073 Memory drain
Seamus Lee [Wed, 30 Sep 2020 08:19:58 +0000 (18:19 +1000)]
dev/core#334 Use the current in use collation and character sets when creating new custom value tables
Seamus Lee [Wed, 30 Sep 2020 20:32:06 +0000 (06:32 +1000)]
Merge pull request #18599 from seamuslee001/frontend_group_fields
[REF] Add in frontend fields for title and description of group Schem…
Seamus Lee [Fri, 25 Sep 2020 21:05:06 +0000 (07:05 +1000)]
[REF] Add in frontend fields for title and description of group Schema only change
Add in upgrade step to expand title column to be 255 as well
Update langauge as per Artfulrobot and require group title field