Seamus Lee [Wed, 21 Apr 2021 00:57:41 +0000 (10:57 +1000)]
Merge pull request #20108 from colemanw/contact-actions-ribbon
Add 'contact-actions-ribbon' region
Eileen McNaughton [Tue, 20 Apr 2021 21:55:34 +0000 (09:55 +1200)]
Merge pull request #20101 from JKingsnorth/patch-18
dev/core#2549 Fix undefined index when merging websites
Coleman Watts [Tue, 20 Apr 2021 20:10:46 +0000 (16:10 -0400)]
Add 'contact-actions-ribbon' region
Seamus Lee [Tue, 20 Apr 2021 09:35:03 +0000 (19:35 +1000)]
Merge pull request #20053 from eileenmcnaughton/money
dev/core#2505 Fix formatLocaleNumeric
Eileen McNaughton [Mon, 19 Apr 2021 22:38:57 +0000 (10:38 +1200)]
Merge pull request #20103 from civicrm/5.37
5.37
Seamus Lee [Mon, 19 Apr 2021 22:38:29 +0000 (08:38 +1000)]
Merge pull request #20104 from seamuslee001/regen_grant_dao
[NFC] Regenerate Grant DAO
Seamus Lee [Mon, 19 Apr 2021 21:10:05 +0000 (07:10 +1000)]
[NFC] Regenerate Grant DAO
Eileen McNaughton [Mon, 19 Apr 2021 19:42:50 +0000 (07:42 +1200)]
Merge pull request #20002 from jaapjansma/dev_53_2
dev/report#53: search on relationship and case (2)
Mathieu Lu [Mon, 19 Apr 2021 19:36:33 +0000 (15:36 -0400)]
Merge pull request #20099 from eileenmcnaughton/ref
Remove unused functions
Tim Otten [Mon, 19 Apr 2021 19:36:08 +0000 (12:36 -0700)]
Merge pull request #20058 from larssandergreen/re-use-mailing
dev/mail#90 - Allow re-use mailing on draft mailings and adhoc mailings
colemanw [Mon, 19 Apr 2021 16:35:51 +0000 (12:35 -0400)]
Merge pull request #20094 from seamuslee001/fix_install_search_display_table_56
[REF] Fix installation of the search display table on MySQL 5.36 in t…
colemanw [Mon, 19 Apr 2021 15:52:26 +0000 (11:52 -0400)]
Merge pull request #20100 from eileenmcnaughton/afform
Fix the MOST out-of-date parts of the afform readme
Jaap Jansma [Mon, 19 Apr 2021 10:58:08 +0000 (12:58 +0200)]
Fixed failing test
John Kingsnorth [Mon, 19 Apr 2021 08:35:57 +0000 (09:35 +0100)]
dev/core#2549 Fix undefined index when merging websites
eileen [Mon, 19 Apr 2021 06:28:15 +0000 (18:28 +1200)]
Fix the MOST out-of-date parts of the afform readme
I was looking for afform docs and this documentation still appears to be the only
documentation there is :-(
This PR addresses some of the most out-of-date parts but I think we want to
agree how to document it & start addressing that
Eileen McNaughton [Mon, 19 Apr 2021 06:07:02 +0000 (18:07 +1200)]
Merge pull request #20091 from totten/master-ext-instclass
Extensions - Setup `<classloader>` during installation
eileen [Mon, 19 Apr 2021 03:11:31 +0000 (15:11 +1200)]
Remove unused functions
These protected functions were extracted as part of the process of testing and
transitioning to using the token compatibility subscriber - however, the
cleanup of actually removing them once we switched got missed.
As they are protected their unusedness is easy to confirm
Seamus Lee [Mon, 19 Apr 2021 01:22:15 +0000 (11:22 +1000)]
Merge pull request #20036 from eileenmcnaughton/dedupe
Alter dedupe code to call api rather than bao->save()
Seamus Lee [Sun, 18 Apr 2021 00:52:01 +0000 (10:52 +1000)]
[REF] Fix installation of the search display table on MySQL 5.36 in tests
Seamus Lee [Sat, 17 Apr 2021 21:52:53 +0000 (07:52 +1000)]
Merge pull request #20089 from demeritcowboy/approx
[NFC/Unit Test] - Help avoid problems when using assertApproxEquals with integers instead of fractions
Tim Otten [Sat, 17 Apr 2021 20:10:07 +0000 (13:10 -0700)]
Merge pull request #20088 from seamuslee001/nfc_test_fix
(NFC) Fix possible flacky tests by splitting the parts of the checksu…
Tim Otten [Sat, 17 Apr 2021 11:23:28 +0000 (04:23 -0700)]
Extensions - Setup `<classloader>` during installation
Lars SG [Sat, 17 Apr 2021 03:06:30 +0000 (21:06 -0600)]
Change Re-use to Copy
demeritcowboy [Sat, 17 Apr 2021 02:31:14 +0000 (22:31 -0400)]
avoid problems
Tim Otten [Sat, 17 Apr 2021 02:07:40 +0000 (19:07 -0700)]
Update CRM/Mailing/Controller/Send.php
Seamus Lee [Fri, 16 Apr 2021 23:28:44 +0000 (09:28 +1000)]
(NFC) Fix possible flacky tests by splitting the parts of the checksum up so that the timestamp part can be tested using ApproxEquals assertion
Update test as per Dave D
Seamus Lee [Sat, 17 Apr 2021 00:41:32 +0000 (10:41 +1000)]
Merge pull request #20086 from civicrm/5.37
5.37
Seamus Lee [Fri, 16 Apr 2021 22:01:28 +0000 (08:01 +1000)]
Merge pull request #20076 from eileenmcnaughton/token
Simplify mailing check
Seamus Lee [Fri, 16 Apr 2021 21:57:59 +0000 (07:57 +1000)]
Merge pull request #20083 from mlutfy/dev2543on537
dev/core#2543 Fix Membership Edit PHP fatal when no recorded payment
Seamus Lee [Fri, 16 Apr 2021 21:56:37 +0000 (07:56 +1000)]
Merge pull request #20084 from agh1/5.37.0-releasenotes-initial
5.37.0 release notes initial run
Lars SG [Fri, 16 Apr 2021 21:54:21 +0000 (15:54 -0600)]
Changed " - Copy" append to "Copy of " prepend for consistency
Lars SG [Fri, 16 Apr 2021 21:51:26 +0000 (15:51 -0600)]
Add " - Copy" to the end of the new mailing name when cloning
eileen [Thu, 15 Apr 2021 23:53:30 +0000 (11:53 +1200)]
Simplify mailing check
This should do the same thing - note org is never defined so replaceOrgTokens does
nothing (& is not used anywhere else)
Andrew Hunt [Fri, 16 Apr 2021 17:40:00 +0000 (13:40 -0400)]
5.37.0 release notes: added boilerplate
Andrew Hunt [Fri, 16 Apr 2021 17:36:48 +0000 (13:36 -0400)]
5.37.0 release notes: raw from script
Mathieu Lutfy [Fri, 16 Apr 2021 12:51:48 +0000 (08:51 -0400)]
dev/core#2543 Fix Membership Edit PHP fatal when no recorded payment
colemanw [Fri, 16 Apr 2021 12:38:29 +0000 (08:38 -0400)]
Merge pull request #20018 from seamuslee001/dev_core_2522
dev/core#2522 Add in Submit Action and redirect handling post form su…
Seamus Lee [Fri, 16 Apr 2021 05:46:48 +0000 (15:46 +1000)]
Merge pull request #20079 from totten/master-logmgr
community/feature-request#12 - Allow named logging channels
Eileen McNaughton [Fri, 16 Apr 2021 04:27:28 +0000 (16:27 +1200)]
Merge pull request #20080 from seamuslee001/dev_core_403
dev/core#403 Fix Petition Confirmation Email template by removing the…
Seamus Lee [Fri, 9 Apr 2021 08:21:05 +0000 (18:21 +1000)]
dev/core#2522 Add in Submit Action and redirect handling post form submit
Move fields to the bottom of the config form and also rework the submission code as per suggestion from coleman and also ensure that the submit_action and redirect are exposed in the front end metadata
Remove debugging
Revmoe submit action field as no longer required
Make improvements as per Coleman's review
Update text as per Coleamn and fix regex to allos for ? = # & options in urls
Fix Regex to do some wildcard matching
colemanw [Fri, 16 Apr 2021 03:12:10 +0000 (23:12 -0400)]
Merge pull request #20064 from eileenmcnaughton/info
dev/core#2536 Trim strings from info.xml in extensions
Seamus Lee [Fri, 16 Apr 2021 02:17:44 +0000 (12:17 +1000)]
Merge pull request #20067 from civicrm/5.37
5.37
Seamus Lee [Fri, 16 Apr 2021 02:05:34 +0000 (12:05 +1000)]
dev/core#403 Fix Petition Confirmation Email template by removing the trailing space on the confirmation url from the href tag
Tim Otten [Fri, 16 Apr 2021 01:49:27 +0000 (18:49 -0700)]
community/feature-request#12 - Allow named logging channels
Overview
----------------------------------------
Make it easier to route log messages based on their topic (e.g. CiviContribute-related logs vs CiviMail-related logs).
Before
------
`Civi::log()` always returns the same instance of `LoggerInterface`, with no
clear way to differentiate logs of different business subsystems.
After
-----
`Civi::log(...)` allows you to optionally request a `LoggerInterface` for a specific theme, e.g.
```php
Civi::log('mail')->error('Failed to connect to SMTP server');
Civi::log('ipn')->warning('Transaction rejected by payment processor');
```
Technical Details
-----------------
A few things going on here:
* Extensions may start using their own logs (`Civi::log('myext')`) without any special effort.
* It is possible to replace or customize specific logs by defining a service `log.CHANNEL_NAME`.
* The `psr_log_manager` is a service. An extension like https://lab.civicrm.org/extensions/monolog/
can replace the `psr_log_manager` and use the channel-name in its own way.
There is a limitation here in that the list of channels is open-ended. It
will be impossible to (eg) detect that a log-user has made a typo in the
channel-name. However, this seems like the better trade-off if the
alternative is that extensions face races during
installation/uninstallation.
Seamus Lee [Fri, 16 Apr 2021 01:44:36 +0000 (11:44 +1000)]
Merge pull request #19886 from eileenmcnaughton/import
Fix for importing preferred language (and other fields) by label
Seamus Lee [Fri, 16 Apr 2021 00:35:19 +0000 (10:35 +1000)]
Merge pull request #20071 from eileenmcnaughton/537d
dev/core#2498 dedupe rule saving fix
Tim Otten [Thu, 15 Apr 2021 23:56:37 +0000 (16:56 -0700)]
Merge pull request #20055 from davidjosephhayes/fix-authx-setting-display
Fix AuthX Setting Labels
Seamus Lee [Thu, 15 Apr 2021 23:29:58 +0000 (09:29 +1000)]
Merge pull request #20074 from seamuslee001/fix_format_money
REF Ensure that getAmount includes 0s in decimal places up to 2 places
colemanw [Thu, 15 Apr 2021 23:23:03 +0000 (19:23 -0400)]
Merge pull request #20041 from eileenmcnaughton/mem_cont_switch
Switch to Call contribution api
Seamus Lee [Thu, 15 Apr 2021 23:15:31 +0000 (09:15 +1000)]
Merge pull request #20073 from seamuslee001/dev_event_53
dev/event#53 Fix issue where by Sold out option was not being properl…
colemanw [Thu, 15 Apr 2021 23:14:57 +0000 (19:14 -0400)]
Merge pull request #20014 from eileenmcnaughton/mem_params
[Ref] Simplify getMembershipParameters
Eileen McNaughton [Thu, 15 Apr 2021 22:16:57 +0000 (10:16 +1200)]
Merge pull request #20072 from colemanw/apiv4SettingFix
APIv4 - Fix Setting api to work with index param
Seamus Lee [Thu, 15 Apr 2021 22:01:23 +0000 (08:01 +1000)]
REF Ensure that getAmount includes 0s in decimal places up to 2 places
Seamus Lee [Thu, 15 Apr 2021 21:33:23 +0000 (07:33 +1000)]
dev/event#53 Fix issue where by Sold out option was not being properly frozen
Coleman Watts [Thu, 15 Apr 2021 19:36:55 +0000 (15:36 -0400)]
APIv4 - Fix Setting api to work with index param
The api tries to force index params into the "Select" clause
which doesn't make sense for the oddball "Setting" api.
eileen [Thu, 15 Apr 2021 19:37:48 +0000 (07:37 +1200)]
dev/core#2498 dedupe rule saving fix
Lars SG [Thu, 15 Apr 2021 13:48:35 +0000 (07:48 -0600)]
Fixed bad bracket indent
Eileen McNaughton [Thu, 15 Apr 2021 05:24:32 +0000 (17:24 +1200)]
Merge pull request #20069 from larssandergreen/Remove-group-limit-for-mailings
Removed limit of 25 groups and past mailings
Lars SG [Thu, 15 Apr 2021 04:05:23 +0000 (22:05 -0600)]
Removed limit of 25 groups and past mailings
Before: Saving a mailing with more than 25 groups or past mailing recipients caused the number of groups to be reduced to 25.
After: As many groups as desired can be added.
colemanw [Thu, 15 Apr 2021 04:04:27 +0000 (00:04 -0400)]
Merge pull request #20040 from eileenmcnaughton/537
dev/core#2493 Stop attempting to format money in the processor class
Seamus Lee [Thu, 15 Apr 2021 04:00:47 +0000 (14:00 +1000)]
Merge pull request #20066 from seamuslee001/dev_core_2528
dev/core#2528 Set Modified date to be current timestamp in civicrm_co…
Seamus Lee [Thu, 15 Apr 2021 01:34:44 +0000 (11:34 +1000)]
Add in deprecated warning if amount is not numeric and use filter var to return appropriate amount in that case otherwise just return amount
Seamus Lee [Thu, 15 Apr 2021 01:28:55 +0000 (11:28 +1000)]
dev/core#2528 Set Modified date to be current timestamp in civicrm_contribution_recur if it is null before setting the field to NOT NULL
Seamus Lee [Thu, 15 Apr 2021 01:18:33 +0000 (11:18 +1000)]
Merge pull request #20043 from seamuslee001/payflow_pro_core_ext
(REF) Payflow Pro - Migrate code into a core extension
eileen [Wed, 14 Apr 2021 22:43:01 +0000 (10:43 +1200)]
Trim strings from info.xml in extensions
Eileen McNaughton [Wed, 14 Apr 2021 22:06:43 +0000 (10:06 +1200)]
Merge pull request #20051 from civicrm/5.37
5.37
Eileen McNaughton [Wed, 14 Apr 2021 19:29:00 +0000 (07:29 +1200)]
Merge pull request #20056 from colemanw/api4GetApiFix
APIv4 - Improve entity name lookup
Eileen McNaughton [Wed, 14 Apr 2021 19:19:16 +0000 (07:19 +1200)]
Merge pull request #20061 from larssandergreen/contribution-page-pager
Add pager to bottom of Manage Contribution Pages
Eileen McNaughton [Wed, 14 Apr 2021 19:18:34 +0000 (07:18 +1200)]
Merge pull request #20054 from highfalutin/patch-5
When generating boilerplate code from xml, make error text more helpful and spelt correckly
colemanw [Wed, 14 Apr 2021 19:05:29 +0000 (15:05 -0400)]
Merge pull request #20060 from demeritcowboy/grantview
dev/core#2509 - Search kit display link for grant view is wrong
Eileen McNaughton [Wed, 14 Apr 2021 18:59:47 +0000 (06:59 +1200)]
Merge pull request #20057 from christianwach/lab-wp-82
Fix issues with "Create User Record" process
Eileen McNaughton [Wed, 14 Apr 2021 18:52:10 +0000 (06:52 +1200)]
Merge pull request #20062 from civicrm/revert-19975-dev/core#2512
Revert "dev/core#2512 Set membership's status properly when recording the payment"
Eileen McNaughton [Wed, 14 Apr 2021 18:51:47 +0000 (06:51 +1200)]
Revert "dev/core#2512 Set membership's status properly when recording the payment"
Eileen McNaughton [Wed, 14 Apr 2021 18:51:37 +0000 (06:51 +1200)]
Merge pull request #19975 from ahed-compucorp/dev/core#2512
dev/core#2512 Set membership's status properly when recording the payment
Lars SG [Wed, 14 Apr 2021 17:02:55 +0000 (11:02 -0600)]
Add pager to bottom of Manage Contribution Pages
There was no pager at the bottom of the page, now there is.
demeritcowboy [Wed, 14 Apr 2021 16:40:21 +0000 (12:40 -0400)]
wrong link
David Hayes [Wed, 14 Apr 2021 16:32:23 +0000 (09:32 -0700)]
fix styling per checks
Lars SG [Wed, 14 Apr 2021 16:24:01 +0000 (10:24 -0600)]
Allow re-use mailing on draft mailings
Before, re-use was shown only on scheduled/sent and archived mailings pages, now shown on draft/unscheduled as well (i.e. on all mailings pages).
Also re-ordered options to put Re-use after Continue.
Christian Wach [Wed, 14 Apr 2021 13:31:03 +0000 (14:31 +0100)]
Fix issues with "Create User Record" process
Coleman Watts [Wed, 14 Apr 2021 12:35:58 +0000 (08:35 -0400)]
APIv4 - Improve entity name lookup & add test
Ahed [Tue, 6 Apr 2021 09:26:11 +0000 (12:26 +0300)]
dev/core#2512 Set membership's status properly when recording the payment
David Hayes [Wed, 14 Apr 2021 07:03:50 +0000 (00:03 -0700)]
consistent spacing
David Hayes [Wed, 14 Apr 2021 06:38:04 +0000 (23:38 -0700)]
set flow in setting title
highfalutin [Wed, 14 Apr 2021 05:59:41 +0000 (22:59 -0700)]
Make error text more helpful and spelt correckly
Provide a bit more context when possible.
eileen [Wed, 14 Apr 2021 04:19:58 +0000 (16:19 +1200)]
dev/core#2505 Fix formatLocaleNumeric
With the back & forth over formatting this function lost it's original intent and became unused.
I think this gives back the original intent - ie provide a formatted number
with no currency symbol that reflects the locale.
I think this would be usable for https://lab.civicrm.org/dev/core/-/issues/2505
since formatting numbers should be more or less the same as formatting currencies
when only the number is being formatted.
Seamus Lee [Fri, 26 Mar 2021 08:40:28 +0000 (19:40 +1100)]
[REF] Fix Creating of Recurring Contribution using PayFlow Pro Processor
Seamus Lee [Tue, 13 Apr 2021 23:36:09 +0000 (09:36 +1000)]
Flesh out readme, info.xml and remove Payflow Pro Payment Processor Type from install data and add in upgrade step to enable extension appropriately as needed and add in civicrm managed file
Mark Processor as supporting recurring
Eileen McNaughton [Wed, 14 Apr 2021 02:11:51 +0000 (14:11 +1200)]
Merge pull request #20050 from colemanw/fixEntityRef37
Fix entity-ref search by id & update search prompt
Coleman Watts [Tue, 13 Apr 2021 20:39:36 +0000 (16:39 -0400)]
Fix entity-ref search by id & update search prompt
Fixes a bug where searching by id wasn't working.
Also updates search prompt to indicate that searching by id is possible.
Eileen McNaughton [Tue, 13 Apr 2021 21:35:30 +0000 (09:35 +1200)]
Merge pull request #20045 from colemanw/fixWpPermissionPage
Update WP permission page for new string array keys
Seamus Lee [Tue, 13 Apr 2021 20:55:26 +0000 (06:55 +1000)]
Merge pull request #20042 from colemanw/afformContactLayout
Afform - Improve integration with ContactLayout editor
Eileen McNaughton [Tue, 13 Apr 2021 19:16:50 +0000 (07:16 +1200)]
Merge pull request #20048 from colemanw/fixApi4Setting
APIv4 - Fix unserialize settings
Coleman Watts [Tue, 13 Apr 2021 15:43:12 +0000 (11:43 -0400)]
APIv4 - Fix unserialize settings
Coleman Watts [Tue, 13 Apr 2021 12:49:16 +0000 (08:49 -0400)]
Update WP permission page for new string array keys
This fixes an undefined index notice for permissions that use the new-style
'label' and 'description' array keys instead of numeric keys.
Coleman Watts [Mon, 12 Apr 2021 22:15:49 +0000 (18:15 -0400)]
Afform - Improve integration with ContactLayout editor
- Adds a separate category of ContactLayout block per afform-type
- Adds a helper function to getFields so non-dao entities can load options from an optionGroup
- Renames search display afforms to "Search Form" to distinguish them from actual search displays
Seamus Lee [Tue, 13 Apr 2021 01:35:28 +0000 (11:35 +1000)]
REF migrate Payflow Pro code into a core Extension
Seamus Lee [Mon, 12 Apr 2021 23:49:16 +0000 (09:49 +1000)]
Merge pull request #20029 from mattwire/dummydopayment
Convert Dummy payment processor to use doPayment function
eileen [Sun, 11 Apr 2021 21:36:30 +0000 (09:36 +1200)]
Alter dedupe code to call api rather than bao->save()
This achieves 2 things
1) hooks are no longer bypassed
2) it leverages core handling for is_primary rather than this
somewhat unreliable attempt
Seamus Lee [Mon, 12 Apr 2021 22:17:02 +0000 (08:17 +1000)]
Merge pull request #20038 from mattwire/suppresswarnings
Suppress legacy warnings by default in propertyBag to allow transition to propertyBag without hitting legacy warnings on unconverted payment processors
Matthew Wire [Sun, 11 Apr 2021 20:38:41 +0000 (21:38 +0100)]
Test fixes to support moving dummy payment processor to doPayment