Seamus Lee [Thu, 28 Jan 2021 22:49:07 +0000 (09:49 +1100)]
Merge pull request #19111 from eileenmcnaughton/act_custom
dev/core#866, dev/core#1318 Fix failure to import checkboxes for activities
Eileen McNaughton [Thu, 28 Jan 2021 21:49:33 +0000 (10:49 +1300)]
Merge pull request #19454 from alifrumin/revrec
[dev/financial#164] Cannot edit contribution with revenue recognition date in a past year
Eileen McNaughton [Thu, 28 Jan 2021 21:43:03 +0000 (10:43 +1300)]
Merge pull request #19451 from wintermoor/patch-1
Update TemplateList.tpl
Alice Frumin [Thu, 28 Jan 2021 19:18:23 +0000 (14:18 -0500)]
fix revenue recognition date
Seamus Lee [Wed, 27 Jan 2021 20:36:22 +0000 (07:36 +1100)]
Merge pull request #19439 from eileenmcnaughton/act_req
dev/core#2308 do not require fields if activity_id is present
Seamus Lee [Wed, 27 Jan 2021 19:44:49 +0000 (06:44 +1100)]
Merge pull request #19453 from demeritcowboy/translate
dev/translation#64 - Using %1%2 seems to confuse transifex - System status check Cms.php
demeritcowboy [Wed, 27 Jan 2021 15:57:42 +0000 (10:57 -0500)]
don't confuse transifex
wintermoor [Wed, 27 Jan 2021 12:46:37 +0000 (13:46 +0100)]
Update TemplateList.tpl
missing {ts} string
Tim Otten [Wed, 27 Jan 2021 07:17:09 +0000 (23:17 -0800)]
Merge pull request #19449 from mattwire/paymentgetspec
Payment API - Add description of `order_reference` parameter
Tim Otten [Wed, 27 Jan 2021 05:46:20 +0000 (21:46 -0800)]
Merge pull request #19445 from demeritcowboy/why2
Remove unnecessary call to error_reporting in drupal 7 integration code
Matthew Wire [Wed, 27 Jan 2021 00:19:49 +0000 (00:19 +0000)]
Add order_reference to spec
Eileen McNaughton [Tue, 26 Jan 2021 21:06:32 +0000 (10:06 +1300)]
Merge pull request #19441 from demeritcowboy/invalid-casetype-name
dev/core#2326 - Status check for invalid case type `name`s
Eileen McNaughton [Tue, 26 Jan 2021 20:57:34 +0000 (09:57 +1300)]
Merge pull request #19391 from seamuslee001/obsolete_replacement
REF Permit installing of replacement extensions during upgrade for ob…
Eileen McNaughton [Tue, 26 Jan 2021 20:52:50 +0000 (09:52 +1300)]
Merge pull request #19442 from demeritcowboy/case-type-name
dev/core#2327 - In the sample casetype xml files the <name> is the label not the name
Eileen McNaughton [Tue, 26 Jan 2021 20:44:53 +0000 (09:44 +1300)]
Merge pull request #19447 from mattwire/phpnotice
Fix PHP notice if membershipBlock is not defined
Eileen McNaughton [Tue, 26 Jan 2021 20:41:12 +0000 (09:41 +1300)]
Merge pull request #19446 from sunilpawar/update_contributor_details
update contributor-key.yml and CONTRIBUTORS.txt file
demeritcowboy [Tue, 26 Jan 2021 00:52:56 +0000 (19:52 -0500)]
remove unnecessary E_ blocker
Matthew Wire [Tue, 26 Jan 2021 10:51:49 +0000 (10:51 +0000)]
Fix PHP notice if membershipBlock is not defined
Sunil Pawar [Tue, 26 Jan 2021 09:08:17 +0000 (14:38 +0530)]
update contributor-key.yml and CONTRIBUTORS.txt file
colemanw [Tue, 26 Jan 2021 00:54:40 +0000 (19:54 -0500)]
Merge pull request #19444 from demeritcowboy/custom-br
dev/core#2328 - Make the description line breaks on the custom field edit form consistent
demeritcowboy [Mon, 25 Jan 2021 23:23:01 +0000 (18:23 -0500)]
consistencize the description line breaks
demeritcowboy [Mon, 25 Jan 2021 15:11:33 +0000 (10:11 -0500)]
name not label
Seamus Lee [Mon, 25 Jan 2021 07:16:13 +0000 (18:16 +1100)]
Merge pull request #19440 from eileenmcnaughton/ipn
[REF] Remove objects var from PaypalProIPN
eileen [Mon, 25 Jan 2021 05:30:44 +0000 (18:30 +1300)]
[REF] Remove objects var from PaypalProIPN
We've managed to make it unnecessary & unused
Seamus Lee [Mon, 25 Jan 2021 05:18:23 +0000 (16:18 +1100)]
Merge pull request #19436 from eileenmcnaughton/pledgepayment
Add pledge payment api
eileen [Tue, 19 Jan 2021 01:12:46 +0000 (14:12 +1300)]
dev/core#2308 do not require fields if activity_id is present
Note this is only one place they are required & it will still fail later with this merged
colemanw [Mon, 25 Jan 2021 02:34:43 +0000 (21:34 -0500)]
Merge pull request #19437 from eileenmcnaughton/clean
[REF] Remove seemingly unreachable attempt to format activity_date_time
demeritcowboy [Sun, 24 Jan 2021 16:50:31 +0000 (11:50 -0500)]
check for invalid names
eileen [Tue, 19 Jan 2021 00:56:58 +0000 (13:56 +1300)]
[REF] Remove seemingly unreachable attempt to format activity_date_time field
This is within the if custom field section - it would never be true but formatting exists further down
eileen [Sat, 23 Jan 2021 07:21:46 +0000 (20:21 +1300)]
Add pledge payment api
Eileen McNaughton [Sat, 23 Jan 2021 05:32:26 +0000 (18:32 +1300)]
Merge pull request #19372 from seamuslee001/dev_wordpress_86
dev/wordpress#86 Ensure that the list of groups in search or on the n…
Seamus Lee [Sat, 23 Jan 2021 04:14:47 +0000 (15:14 +1100)]
Merge pull request #19435 from civicrm/5.34
5.34
Seamus Lee [Sat, 23 Jan 2021 01:13:24 +0000 (12:13 +1100)]
Merge pull request #19434 from alifrumin/rn-5.34
[NFC] 5.34 Release Notes: first pass
Eileen McNaughton [Fri, 22 Jan 2021 22:08:44 +0000 (11:08 +1300)]
Merge pull request #19426 from colemanw/searchCount
dev/core#2312 SearchKit - Improve results loading time in admin UI
Alice Frumin [Fri, 15 Jan 2021 18:19:42 +0000 (13:19 -0500)]
5.34 - Release Notes
Eileen McNaughton [Fri, 22 Jan 2021 20:30:59 +0000 (09:30 +1300)]
Merge pull request #19429 from colemanw/searchJoinDefaults
dev/core#2313 SearchKit - Default join conditions
colemanw [Fri, 22 Jan 2021 18:23:58 +0000 (13:23 -0500)]
Merge pull request #19422 from mattwire/deprecatedcaseactivity
Flag that Embedded Activity Revisions setting is unsupported and deprecated
colemanw [Fri, 22 Jan 2021 04:37:50 +0000 (23:37 -0500)]
Merge pull request #19433 from totten/master-monaco-min
composer.json - Ignore unused variants of Monaco ("dev"/"esm")
Monish Deb [Fri, 22 Jan 2021 01:02:25 +0000 (06:32 +0530)]
Merge pull request #19430 from colemanw/select2Loading
Select2 - Improve styles for disabled, loading elements
Tim Otten [Fri, 22 Jan 2021 00:47:35 +0000 (16:47 -0800)]
Merge pull request #19432 from colemanw/afformApiCleanup
Afform - delete unused, nonfunctional apis
Tim Otten [Fri, 22 Jan 2021 00:21:05 +0000 (16:21 -0800)]
composer.json - Ignore unused from Monaco "dev"/"esm"
Saves ~50mb in the on-disk size of `bower_components`
Before
------
`bower_components` as a full developmental tree for monaco-editor
After
-----
`bower_components` only has the `min` variant of monaco-editor
Coleman Watts [Thu, 21 Jan 2021 22:57:18 +0000 (17:57 -0500)]
Afform - delete unused, nonfunctional apis
Tim Otten [Thu, 21 Jan 2021 21:27:28 +0000 (13:27 -0800)]
Merge pull request #18782 from demeritcowboy/logging-binary2
dev/core#2114 - Changes in upper/lower case or accents are not logged when using trigger-based logging
Coleman Watts [Thu, 21 Jan 2021 16:30:23 +0000 (11:30 -0500)]
Select2 - Improve styles for disabled, loading elements
colemanw [Thu, 21 Jan 2021 16:10:21 +0000 (11:10 -0500)]
Merge pull request #19424 from demeritcowboy/random-relationship
[Test framework] Prevent intermittently failing relationship test
colemanw [Thu, 21 Jan 2021 15:49:01 +0000 (10:49 -0500)]
Merge pull request #19423 from colemanw/tabTweak
Greenwich - fix list margin added by some CMS themes
Coleman Watts [Thu, 21 Jan 2021 15:38:34 +0000 (10:38 -0500)]
SearchKit - Make UI less confusing by not allowing joins to be switched
Switching a join was confusing and buggy. Best to disable that and only allow them to be deleted
Matthew Wire [Thu, 21 Jan 2021 14:58:18 +0000 (14:58 +0000)]
Merge pull request #19386 from totten/master-track-token
(dev/mail#81) Flexmailer - Track click-throughs for URLs with tokens
Coleman Watts [Thu, 21 Jan 2021 14:53:24 +0000 (09:53 -0500)]
DAO - Update field labels for activity_contact & relationship_cache entities
https://lab.civicrm.org/dev/core/-/issues/2313
Coleman Watts [Thu, 21 Jan 2021 14:49:18 +0000 (09:49 -0500)]
SearchKit - Default join conditions
Adds @ui_join_filters annotations to APIv4 entities which automatically shows that field when adding a join
https://lab.civicrm.org/dev/core/-/issues/2313
colemanw [Thu, 21 Jan 2021 02:32:10 +0000 (21:32 -0500)]
Merge pull request #19416 from eileenmcnaughton/dep
dev/financial#148 fully deprecate loadObjects function
Seamus Lee [Thu, 21 Jan 2021 01:38:23 +0000 (12:38 +1100)]
Merge pull request #19427 from civicrm/dependabot/npm_and_yarn/socket.io-2.4.1
Bump socket.io from 2.3.0 to 2.4.1
dependabot[bot] [Thu, 21 Jan 2021 00:16:59 +0000 (00:16 +0000)]
Bump socket.io from 2.3.0 to 2.4.1
Bumps [socket.io](https://github.com/socketio/socket.io) from 2.3.0 to 2.4.1.
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/2.4.1/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io/compare/2.3.0...2.4.1)
Signed-off-by: dependabot[bot] <support@github.com>
Coleman Watts [Wed, 20 Jan 2021 22:16:07 +0000 (17:16 -0500)]
SearchKit - Separate api calls for results & pager count in admin screen
https://lab.civicrm.org/dev/core/-/issues/2312
demeritcowboy [Wed, 20 Jan 2021 02:30:44 +0000 (21:30 -0500)]
don't be random
colemanw [Wed, 20 Jan 2021 18:33:37 +0000 (13:33 -0500)]
Merge pull request #18779 from jaapjansma/dev_report_53
dev/report#53: search on relationship and case
colemanw [Wed, 20 Jan 2021 13:29:22 +0000 (08:29 -0500)]
Merge pull request #19395 from colemanw/afformTypes
Tabbed interface for organizing afforms by type
Coleman Watts [Tue, 19 Jan 2021 16:03:48 +0000 (11:03 -0500)]
Bridge search displays and afforms
This allows an afform af-fieldset to function without a containing af-form or reference to af-entity
Instead it can directly contain an api-entities tag to assist filling field metadata.
The search extension then adds that tag based on the search parameters.
This also eliminates the need to pass in filters to the search display directly (though it still supports that),
as it will infer them from the presence of an af-fieldset.
Coleman Watts [Thu, 14 Jan 2021 18:39:22 +0000 (13:39 -0500)]
Afform - convert afEntity and afField to components, standardize js filenames
Coleman Watts [Wed, 13 Jan 2021 22:22:30 +0000 (17:22 -0500)]
Afform - Use new APIv4 format for option values
Coleman Watts [Wed, 13 Jan 2021 15:21:30 +0000 (10:21 -0500)]
Afform - refactor admin page to use routing, add tabbed UI
Coleman Watts [Mon, 11 Jan 2021 19:35:25 +0000 (14:35 -0500)]
Afform GUI - Rename service from afAdmin to afGiu
Coleman Watts [Mon, 11 Jan 2021 18:27:07 +0000 (13:27 -0500)]
Afform - add option group for afform types
Coleman Watts [Tue, 19 Jan 2021 16:29:17 +0000 (11:29 -0500)]
Greenwich - fix list margin added by some cms themes
colemanw [Tue, 19 Jan 2021 13:13:30 +0000 (08:13 -0500)]
Merge pull request #19419 from eileenmcnaughton/refs
[REF] Remove some of those old php4 &s
colemanw [Tue, 19 Jan 2021 13:10:22 +0000 (08:10 -0500)]
Merge pull request #19297 from eileenmcnaughton/pledge
Add v4 pledge api
Matthew Wire [Tue, 19 Jan 2021 12:27:36 +0000 (12:27 +0000)]
Flag that Embedded Activity Revisions setting is unsupported and deprecated
Seamus Lee [Tue, 19 Jan 2021 10:15:22 +0000 (21:15 +1100)]
Merge pull request #19420 from eileenmcnaughton/activity
Cleanup a couple of unnecessary references
Seamus Lee [Tue, 19 Jan 2021 10:06:48 +0000 (21:06 +1100)]
Merge pull request #19418 from eileenmcnaughton/template
[REF] Move related code to be together
eileen [Tue, 19 Jan 2021 00:44:42 +0000 (13:44 +1300)]
Cleanup a couple of unnecessary references
eileen [Tue, 19 Jan 2021 00:08:45 +0000 (13:08 +1300)]
[REF] Remove some of those old php4 &s
I can't see any call to this that could be affected & I believe they are all well tested
In addition we can see that domain is not altered so it does not
need to be a reference in the 3 functions it is passed through
eileen [Tue, 19 Jan 2021 00:02:49 +0000 (13:02 +1300)]
[REF] Move related code to be together
Puts both if (contactID) sections into the same if
eileen [Mon, 18 Jan 2021 21:04:39 +0000 (10:04 +1300)]
dev/financial#148 fully deprecate loadObjects function
Seamus Lee [Mon, 18 Jan 2021 23:20:01 +0000 (10:20 +1100)]
Merge pull request #19373 from eileenmcnaughton/valid
[REF] Simplify activity import validation
Seamus Lee [Mon, 18 Jan 2021 22:59:06 +0000 (09:59 +1100)]
Merge pull request #19415 from seamuslee001/code_cleanup_dev_core_2307
[#REF] Cleanup recently added code fixing dev/core#2307 for the fact …
Eileen McNaughton [Mon, 18 Jan 2021 21:41:28 +0000 (10:41 +1300)]
Merge pull request #19409 from eileenmcnaughton/template
dev/core#2303 Extract function to load the messageContent for a template
colemanw [Mon, 18 Jan 2021 21:14:45 +0000 (16:14 -0500)]
Merge pull request #19413 from christianwach/lab-core-2306
Fix rendering of Dashlet placeholder
Seamus Lee [Mon, 18 Jan 2021 20:22:14 +0000 (07:22 +1100)]
[#REF] Cleanup recently added code fixing dev/core#2307 for the fact that wasn't a variable before these lines
Seamus Lee [Mon, 18 Jan 2021 20:20:12 +0000 (07:20 +1100)]
Merge pull request #19414 from spalmstr/Issue2307
Fix Issue 2307
eileen [Mon, 18 Jan 2021 20:18:37 +0000 (09:18 +1300)]
Add in-code notes about the workflow_name
eileen [Mon, 18 Jan 2021 01:37:13 +0000 (14:37 +1300)]
dev/core#2303 Extract function to load the messageContent for a template
This is a fairly straightforward extraction, seeking to break down the very-busy sendtemplate function
into the sub-functions within it. Essentially we load the template content, we swap out the tokens
and we send it.
Note that I have added a parameter to the output sent to alterMailContent
of 'workflow_name' which is more accurate - I will update the docs
eileen [Tue, 12 Jan 2021 07:55:15 +0000 (20:55 +1300)]
[REF] Simplify activity import validation
There are 2 types of validation on importing
1) the correct fields have been mapped
2) the specific row has all the required fields
These generally live in different places
- field mapping is validated on the MapField::formRule validation function
- the specific row is validated in the (badly named) 'summary' function.
However, the second function is also doing some validation of the
mapping, checking that either activity_type_id or label is mapped
& ditto activity_date_time. This duplicates the MapField rule
and is hard to read, while making a larger cleanup difficult
eileen [Mon, 18 Jan 2021 06:12:49 +0000 (19:12 +1300)]
Fix pledge to support v4 api
eileen [Thu, 31 Dec 2020 20:04:35 +0000 (09:04 +1300)]
Add v4 pledge api
Stephen Palmstrom [Mon, 18 Jan 2021 18:28:09 +0000 (18:28 +0000)]
Fix Issue 2307
Christian Wach [Mon, 18 Jan 2021 11:39:49 +0000 (11:39 +0000)]
Fix rendering of Dashlet placeholder
Matthew Wire [Mon, 18 Jan 2021 10:15:32 +0000 (10:15 +0000)]
Merge pull request #19402 from eileenmcnaughton/mem_form
[REF] Move instantiation of Order class to earlier in function
Matthew Wire [Mon, 18 Jan 2021 10:05:39 +0000 (10:05 +0000)]
Merge pull request #19411 from eileenmcnaughton/deprecate_add
Deprecate Pledge::add() function
eileen [Mon, 18 Jan 2021 06:20:26 +0000 (19:20 +1300)]
Deprecate Pledge::add() function
This function is no longer called from anywhere and we have settled on preferring 1 create function and
standardising on that. I have left the inner code there but added the deprecation notice
eileen [Sun, 17 Jan 2021 20:51:58 +0000 (09:51 +1300)]
[REF] Move instantiation of Order class to earlier in function
This is part of making the Order object and it's methods available to the non-renewal
form which has the same amount calculation bug the class is used to fix.
Note the Order class is an internal class not the order api which we do wish to switch this
form to using
Eileen McNaughton [Mon, 18 Jan 2021 06:04:25 +0000 (19:04 +1300)]
Merge pull request #19390 from civicrm/php_version_bump
dev/core#2204 Bump Minimum install PHP 7.2
Seamus Lee [Mon, 18 Jan 2021 06:01:16 +0000 (17:01 +1100)]
Merge pull request #19400 from eileenmcnaughton/pledge_ref
Fix pledge to not use pass-by-reference
Seamus Lee [Mon, 18 Jan 2021 04:04:22 +0000 (15:04 +1100)]
Merge pull request #19403 from eileenmcnaughton/mem_order
[REF] Fix Order class to not reload if already loaded
Seamus Lee [Mon, 18 Jan 2021 03:30:22 +0000 (14:30 +1100)]
Merge pull request #19407 from eileenmcnaughton/anet
Remove call to loadRelatedObjects
Seamus Lee [Mon, 18 Jan 2021 03:29:21 +0000 (14:29 +1100)]
Merge pull request #19410 from eileenmcnaughton/load
[REF] Move code closer to where it is used
Seamus Lee [Mon, 18 Jan 2021 03:27:58 +0000 (14:27 +1100)]
Merge pull request #19408 from eileenmcnaughton/old_params
[NFC] Whitespace fix up
eileen [Mon, 18 Jan 2021 01:57:12 +0000 (14:57 +1300)]
[REF] Move code closer to where it is used
Simply moves a few lines of code so the actual usage is apparent
Eileen McNaughton [Mon, 18 Jan 2021 00:43:33 +0000 (13:43 +1300)]
Merge pull request #19404 from eileenmcnaughton/mem_deb
[Test] Extend new membership form to cover multi-line renew + minor cleanup
Eileen McNaughton [Mon, 18 Jan 2021 00:42:31 +0000 (13:42 +1300)]
Merge pull request #19406 from eileenmcnaughton/param
[REF] Param simplification
eileen [Sun, 17 Jan 2021 19:50:56 +0000 (08:50 +1300)]
Fix pledge to not use pass-by-reference
We have deprecated this out of BAO classes