Eileen McNaughton [Fri, 18 Feb 2022 00:05:24 +0000 (13:05 +1300)]
Block crud for v4 api
Eileen McNaughton [Thu, 17 Feb 2022 23:40:57 +0000 (12:40 +1300)]
Move validator out of BAO into v3 api
m
m
Eileen McNaughton [Wed, 26 Jan 2022 00:32:05 +0000 (13:32 +1300)]
dev/core#2486 Add v4 Mailing api (+ MailingJob)
ro
Eileen McNaughton [Fri, 18 Feb 2022 03:22:44 +0000 (16:22 +1300)]
Merge pull request #22789 from civicrm/5.47
5.47
Seamus Lee [Fri, 18 Feb 2022 02:03:26 +0000 (13:03 +1100)]
Merge pull request #22787 from eileenmcnaughton/t
Update unit test to use exception
Seamus Lee [Fri, 18 Feb 2022 01:38:35 +0000 (12:38 +1100)]
Merge pull request #22499 from eileenmcnaughton/fin3
Follow up fix on #22685 financial acl move to extension
Eileen McNaughton [Fri, 18 Feb 2022 00:19:03 +0000 (13:19 +1300)]
Merge pull request #22785 from colemanw/mailingTemplateOptions
Mailing - Add `serialize` and `add` to `template_options` field
Eileen McNaughton [Thu, 17 Feb 2022 22:40:37 +0000 (11:40 +1300)]
Update unit test to use exception
Note that this also updates the money formatting on the contributionSoft list
Coleman Watts [Thu, 17 Feb 2022 21:28:26 +0000 (16:28 -0500)]
Mailing - Add `serialize` and `add` to `template_options` field
No need for special handling to json_encode the field, the BAO
takes care of that automatically when `serialize` is declared.
Test coverage in api_v3_MailingTest::testMailerCreateTemplateOptions
Seamus Lee [Thu, 17 Feb 2022 22:25:46 +0000 (09:25 +1100)]
Merge pull request #22784 from mattwire/recurformstests
RecurForms test fixes
colemanw [Thu, 17 Feb 2022 22:25:30 +0000 (17:25 -0500)]
Merge pull request #22753 from eileenmcnaughton/mail
BAO_Mailing::create - stop passing by reference
colemanw [Thu, 17 Feb 2022 22:19:00 +0000 (17:19 -0500)]
Merge pull request #22766 from eileenmcnaughton/mailit
Move check for mailing workflow permisisons to BAO layer
Seamus Lee [Thu, 17 Feb 2022 21:21:23 +0000 (08:21 +1100)]
Merge pull request #22782 from civicrm/5.47
5.47
Matthew Wire [Thu, 17 Feb 2022 20:59:41 +0000 (20:59 +0000)]
RecurForms test fixes
demeritcowboy [Thu, 17 Feb 2022 18:25:14 +0000 (13:25 -0500)]
Merge pull request #22781 from iswilson/patch-2
Contributor key: Add Ian Wilson
demeritcowboy [Thu, 17 Feb 2022 14:30:03 +0000 (09:30 -0500)]
Merge pull request #22778 from colemanw/noMoreSearchBuilder
Remove "Search Builder" from menubar on new installs.
Ian Wilson [Thu, 17 Feb 2022 14:28:43 +0000 (09:28 -0500)]
Contributor key: Add Ian Wilson
demeritcowboy [Thu, 17 Feb 2022 14:12:14 +0000 (09:12 -0500)]
Merge pull request #22724 from braders/feature/group-search-null-columns
Avoid null column showing on groups search page
demeritcowboy [Thu, 17 Feb 2022 14:11:54 +0000 (09:11 -0500)]
Merge pull request #22667 from braders/avoid-notices-uf-settings-page
Avoid PHP notices on the UF settings page.
Seamus Lee [Thu, 17 Feb 2022 07:06:38 +0000 (18:06 +1100)]
Merge pull request #22768 from colemanw/searchKitDedupe
SearchKit - Add 'merge contacts' task
Eileen McNaughton [Wed, 16 Feb 2022 22:38:03 +0000 (11:38 +1300)]
Merge pull request #22780 from civicrm/5.47
5.47 to master
Eileen McNaughton [Wed, 16 Feb 2022 22:37:49 +0000 (11:37 +1300)]
Merge pull request #22779 from eileenmcnaughton/pledgey
dev/core#3066 - Check CiviPledge is enabled before disconnecting pledge payments
Tim Otten [Wed, 16 Feb 2022 21:51:30 +0000 (13:51 -0800)]
Merge pull request #22754 from colemanw/extensionApi
APiv4 - Add Extension.get
Eileen McNaughton [Wed, 16 Feb 2022 21:20:40 +0000 (10:20 +1300)]
Merge pull request #22740 from colemanw/dev/core#3063
dev/core#3063 APIv3 - Fix numeric option matching
Eileen McNaughton [Wed, 16 Feb 2022 21:13:56 +0000 (10:13 +1300)]
Merge pull request #22543 from colemanw/deprecateRetrieve
[REF] - Deprecate & delegate BAO::retrieve functions
Ian Wilson [Mon, 14 Feb 2022 17:06:09 +0000 (12:06 -0500)]
dev/core#3066 - Add check for CiviPledge component
Check that component is enabled before attempting to disconnect pledge payments from Failed / Cancelled contributions.
Coleman Watts [Wed, 16 Feb 2022 19:49:18 +0000 (14:49 -0500)]
Remove "Search Builder" from menubar on new installs.
Search Builder is deprecated in favor of SearchKit, so the menubar should
stop showing both.
Matthew Wire [Wed, 16 Feb 2022 14:37:37 +0000 (14:37 +0000)]
Merge pull request #22277 from demeritcowboy/isdir2
dev/core#2927 - Avoid flooding logs with open_basedir in effect
colemanw [Wed, 16 Feb 2022 12:19:05 +0000 (07:19 -0500)]
Merge pull request #22633 from eileenmcnaughton/msg_template
dev/core#2866 Ignore preferred mail format when sending message
colemanw [Wed, 16 Feb 2022 12:08:15 +0000 (07:08 -0500)]
Merge pull request #22775 from eileenmcnaughton/pref
Follow up fix on removing preferred_mail_format
colemanw [Wed, 16 Feb 2022 12:07:26 +0000 (07:07 -0500)]
Merge pull request #22776 from colemanw/fixApi4EnttiyGet
APIv4 - Fix typo in Entity.getFields
Monish Deb [Wed, 16 Feb 2022 04:46:27 +0000 (10:16 +0530)]
Merge pull request #22749 from eileenmcnaughton/liney
Fix apiv4 Contribution delete & all line items
Coleman Watts [Wed, 16 Feb 2022 04:44:16 +0000 (23:44 -0500)]
APIv4 - Fix typo in Entity.getFields
Eileen McNaughton [Wed, 26 Jan 2022 22:59:56 +0000 (11:59 +1300)]
dev/core#2866 Ignore preferred mail format when sending message
Eileen McNaughton [Wed, 16 Feb 2022 04:29:56 +0000 (17:29 +1300)]
Follow up fix on removing preferred_mail_format
Coleman Watts [Fri, 11 Feb 2022 01:19:53 +0000 (20:19 -0500)]
APiv4 - Add Extension.get
demeritcowboy [Tue, 15 Feb 2022 15:05:17 +0000 (10:05 -0500)]
Merge pull request #22635 from eileenmcnaughton/trait
dev/core#2866 Remove preferred_mail_format from email trait
Tim Otten [Tue, 15 Feb 2022 08:52:27 +0000 (00:52 -0800)]
Merge pull request #22730 from colemanw/fixOptionValueNames
Pseudoconstants - Fix and improve handling of option callbacks
demeritcowboy [Tue, 15 Feb 2022 04:11:14 +0000 (23:11 -0500)]
Merge pull request #22773 from seamuslee001/npm_audit_fix
[REF] Results of running npm audit fix
Monish Deb [Tue, 15 Feb 2022 03:12:11 +0000 (08:42 +0530)]
Merge pull request #22770 from colemanw/searchKitEmptyText
SearchKit - Customizable "No Results" text
Seamus Lee [Tue, 15 Feb 2022 00:47:11 +0000 (11:47 +1100)]
[REF] Results of running npm audit fix
Coleman Watts [Mon, 14 Feb 2022 15:30:37 +0000 (10:30 -0500)]
SearchKit - Customizable "No Results" text
Coleman Watts [Sun, 13 Feb 2022 22:43:40 +0000 (17:43 -0500)]
DedupeMerge - Cleanup form code to fix redirects and undefined variables
Fixes undefined template variables, and does the final redirect in an ajax-friendly way.
Matthew Wire [Sun, 13 Feb 2022 23:10:08 +0000 (23:10 +0000)]
Merge pull request #21539 from mattwire/deprecaterecurtrxnid
Deprecate civicrm_contribution_recur.trxn_id
Coleman Watts [Sun, 13 Feb 2022 22:19:59 +0000 (17:19 -0500)]
SearchKit - Add 'merge contacts' task
Matthew Wire [Sun, 13 Feb 2022 18:53:25 +0000 (18:53 +0000)]
Merge pull request #22679 from mattwire/dummyreturn
Clean return values for dummy payment processor
Matthew Wire [Thu, 23 Sep 2021 15:59:18 +0000 (16:59 +0100)]
Add upgrader to update comments on civicrm_contribution_recur table
Matthew Wire [Sun, 19 Sep 2021 10:08:51 +0000 (11:08 +0100)]
Deprecate civicrm_contribution_recur.trxn_id
Seamus Lee [Sun, 13 Feb 2022 04:39:01 +0000 (15:39 +1100)]
Merge pull request #22765 from eileenmcnaughton/block_2
[REF] Simplification in Contact::getValues
Eileen McNaughton [Sun, 13 Feb 2022 01:40:39 +0000 (14:40 +1300)]
Merge pull request #22764 from colemanw/searchKitFixNonDAO
SearchKit - Fix support for non-DAO entities
Eileen McNaughton [Sun, 13 Feb 2022 01:38:18 +0000 (14:38 +1300)]
Move check for mailing workflow permisisons to BAO layer
demeritcowboy [Sat, 12 Feb 2022 15:02:02 +0000 (10:02 -0500)]
Merge pull request #22745 from eileenmcnaughton/noticey
Some more notice fixes in smarty
Eileen McNaughton [Sat, 12 Feb 2022 03:31:56 +0000 (16:31 +1300)]
[REF] Simplification in Contact::getValues
The call to location::getValues takes more lines & is
less readable than just doing the thing.
Note that
1) I could not find any evidence of 'noWebsite' being passed in so I switched to
always add
2) the signature on website:getValues is slightly different (of course).
3) I found that the others that were receiving params as a reference were
not altering it so removed those pass-by-refs
colemanw [Fri, 11 Feb 2022 19:06:23 +0000 (14:06 -0500)]
Merge pull request #22763 from demeritcowboy/classclassclass
Adjust css class for payment processor to use `-`
Coleman Watts [Fri, 11 Feb 2022 16:24:02 +0000 (11:24 -0500)]
SearchKit - Fix support for non-DAO entities
Before: SearchKit would crash if running a search on a non-DAO entity (Extension, Entity, Afform, etc)
After: Works, test added
colemanw [Fri, 11 Feb 2022 16:08:50 +0000 (11:08 -0500)]
Merge pull request #22422 from eileenmcnaughton/taxtermprice
Cleanup around taxTerm assignment
demeritcowboy [Fri, 11 Feb 2022 15:06:13 +0000 (10:06 -0500)]
class
colemanw [Fri, 11 Feb 2022 14:48:59 +0000 (09:48 -0500)]
Merge pull request #22757 from eileenmcnaughton/block_2
[REF] Simplify Location::getValues
colemanw [Fri, 11 Feb 2022 14:42:22 +0000 (09:42 -0500)]
Merge pull request #22756 from eileenmcnaughton/block
Remove unused parameter, pass-by-ref
demeritcowboy [Fri, 11 Feb 2022 14:32:05 +0000 (09:32 -0500)]
Merge pull request #22760 from seamuslee001/fix_space_in_paymentprocess_class_name
[REF] Fix issue where spaces in payment_processor_type.name field cau…
demeritcowboy [Fri, 11 Feb 2022 14:31:18 +0000 (09:31 -0500)]
Merge pull request #22758 from civicrm/dependabot/npm_and_yarn/karma-6.3.14
Bump karma from 6.3.4 to 6.3.14
dependabot[bot] [Fri, 11 Feb 2022 09:43:48 +0000 (09:43 +0000)]
Bump karma from 6.3.4 to 6.3.14
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.4 to 6.3.14.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.4...v6.3.14)
---
updated-dependencies:
- dependency-name: karma
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com>
Seamus Lee [Fri, 11 Feb 2022 09:42:37 +0000 (20:42 +1100)]
Merge pull request #22761 from civicrm/dependabot/npm_and_yarn/ajv-6.12.6
Bump ajv from 6.6.1 to 6.12.6
Seamus Lee [Fri, 11 Feb 2022 06:58:45 +0000 (17:58 +1100)]
Merge pull request #22713 from colemanw/billingBlockCleanup
[REF] Cleanup billingBlock.js
dependabot[bot] [Fri, 11 Feb 2022 06:38:45 +0000 (06:38 +0000)]
Bump ajv from 6.6.1 to 6.12.6
Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.6.1 to 6.12.6.
- [Release notes](https://github.com/ajv-validator/ajv/releases)
- [Commits](https://github.com/ajv-validator/ajv/compare/v6.6.1...v6.12.6)
---
updated-dependencies:
- dependency-name: ajv
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Seamus Lee [Fri, 11 Feb 2022 05:36:02 +0000 (16:36 +1100)]
[REF] Fix issue where spaces in payment_processor_type.name field causes issues with class output on form
Eileen McNaughton [Fri, 11 Feb 2022 04:51:09 +0000 (17:51 +1300)]
[REF] Simplify Location::getValues
Yashodha Chaku [Fri, 11 Feb 2022 04:33:10 +0000 (10:03 +0530)]
Merge pull request #22728 from eileenmcnaughton/local
Format money in custom fields once, on the tpl layer
Eileen McNaughton [Fri, 11 Feb 2022 04:17:36 +0000 (17:17 +1300)]
Remove unused parameter, pass-by-ref
Tim Otten [Fri, 11 Feb 2022 02:58:32 +0000 (18:58 -0800)]
Merge pull request #22750 from colemanw/fixProcessorPseudoconstant
Fix ContributionRecur.payment_processor_id pseudoconstant
Eileen McNaughton [Fri, 11 Feb 2022 02:31:06 +0000 (15:31 +1300)]
BAO_Mailing::create - stop passing by reference
We have been removing this pass-by-refs on an ongoing basis. CRUD calls should use
the api but I checked the core calls and none are looking for anything altered in
Coleman Watts [Thu, 10 Feb 2022 19:40:06 +0000 (14:40 -0500)]
Fix ContributionRecur.payment_processor_id pseudoconstant
Before: Pseudoconstant mistakenly uses 'name' instead of title
After: Name and title are treated correctly
Coleman Watts [Wed, 9 Feb 2022 16:35:53 +0000 (11:35 -0500)]
dev/core#3063 APIv3 - Fix numeric option matching
Before: Option matching was skipped for all FK fields if a numeric value was given
After: Only skipped for `campaign_id` field, if positive integer given
The optimization was overly broad and had unintended side-effects
Eileen McNaughton [Thu, 10 Feb 2022 04:03:43 +0000 (17:03 +1300)]
Fix apiv4 Contribution delete & all line items
Eileen McNaughton [Thu, 10 Feb 2022 02:33:48 +0000 (15:33 +1300)]
Merge pull request #22743 from civicrm/5.47
5.47
Eileen McNaughton [Thu, 10 Feb 2022 02:20:50 +0000 (15:20 +1300)]
Fix for #22685 financial acl aggression
Just realised this is required to make #22685 non-changey
Eileen McNaughton [Thu, 10 Feb 2022 02:03:29 +0000 (15:03 +1300)]
Merge pull request #22744 from eileenmcnaughton/grump
Bypass grumpy mode for contribution search totals & criteria
colemanw [Thu, 10 Feb 2022 01:16:38 +0000 (20:16 -0500)]
Merge pull request #22684 from eileenmcnaughton/contacl
Move acl check for contributionView to the extension
Seamus Lee [Thu, 10 Feb 2022 01:00:45 +0000 (12:00 +1100)]
Merge pull request #22742 from eileenmcnaughton/cust
Fix deprecated warnings, smary grumpy-mode issues in legacy searches
Eileen McNaughton [Thu, 10 Feb 2022 00:30:22 +0000 (13:30 +1300)]
Some more notice fixes in smarty
Eileen McNaughton [Thu, 10 Feb 2022 00:07:57 +0000 (13:07 +1300)]
Merge pull request #22741 from MegaphoneJon/fix-duplicate-contact-typing
enforce required fields on Contact.duplicatecheck
Eileen McNaughton [Wed, 9 Feb 2022 23:58:03 +0000 (12:58 +1300)]
Bypass grumpy mode for contribution totals
These are assigned to the template from php & have nbsp in them (for better or worse)
Eileen McNaughton [Wed, 9 Feb 2022 23:19:13 +0000 (12:19 +1300)]
Fix deprecated warnings, smary grumpy-mode issues in legacy searches
This gets rid of some deprecated warnings and also makes the pager work in smarty grumpy mode
colemanw [Wed, 9 Feb 2022 23:15:10 +0000 (18:15 -0500)]
Merge pull request #22714 from demeritcowboy/grant-searchbuilder
dev/core#3056 - Crash with search builder if civigrant not enabled and have admin rights
Jon Goldberg [Wed, 9 Feb 2022 20:56:11 +0000 (15:56 -0500)]
enforce required fields on Contact.duplicatecheck
demeritcowboy [Sun, 6 Feb 2022 01:06:48 +0000 (20:06 -0500)]
quickfix for crash if civigrant not enabled and have admin rights
Coleman Watts [Wed, 9 Feb 2022 02:53:48 +0000 (21:53 -0500)]
OptionValues - Specify id+name+label for option callbacks that use it
Previously some API calls relied on a bug which conflated name with label,
that bug has been fixed, causing some test failures. The solution is to
update the option lists with a full multidimensional array with translated labels
and untranslated names.
Eileen McNaughton [Wed, 9 Feb 2022 10:47:11 +0000 (23:47 +1300)]
Merge pull request #22738 from civicrm/5.47
5.47
Tim Otten [Wed, 9 Feb 2022 04:50:31 +0000 (20:50 -0800)]
Merge pull request #22727 from eileenmcnaughton/mod_money
dev/core#3059 Regression fix - be tolerant with smarty money
Seamus Lee [Wed, 9 Feb 2022 03:45:36 +0000 (14:45 +1100)]
Merge pull request #22735 from civicrm/5.47
5.47
colemanw [Wed, 9 Feb 2022 01:22:06 +0000 (20:22 -0500)]
Merge pull request #22733 from totten/5.47-dedupe-check
(dev/core#3055) Fix dedupe check to not require elevated permissions
Coleman Watts [Tue, 8 Feb 2022 23:35:33 +0000 (18:35 -0500)]
PseudoConstant - Allow multi-dimensionaly arrays to be returned from option callbacks
Before: Only flat arrays could be returned by a pseudoconstant callback fn.
After: Callbacks can return arrays with id/name/label/abbr.
Jon Goldberg [Fri, 4 Feb 2022 17:14:01 +0000 (12:14 -0500)]
Fix dedupe check to not require elevated permissions
Eileen McNaughton [Tue, 8 Feb 2022 22:36:48 +0000 (11:36 +1300)]
Merge pull request #22628 from colemanw/civicrm_admin_ui
Add civicrm_admin_ui extension
Coleman Watts [Tue, 8 Feb 2022 16:55:32 +0000 (11:55 -0500)]
Pseudoconstants - Use id instead of label for name
Each item in a field option list contains keys like id, name, label, color, icon, description, abbr.
But some option lists only consist of simple key/value pairs. To convert those simple associative arrays
into a full option list, the name should be derived from the id, not the label, because machine names
are expected to be stable, and labels can be translated.
Before: `name` derived from `label` when converting simple associative to an option list
After: `name` derived from `id`.
Matthew Wire [Tue, 8 Feb 2022 20:25:56 +0000 (20:25 +0000)]
Merge pull request #22731 from colemanw/customvaluefailingtest
APIv4 - Fix setting/getting a multi-record customfield with date+time
Matthew Wire [Mon, 7 Feb 2022 21:25:26 +0000 (21:25 +0000)]
APIv4 - Fix setting/getting a multi-record custom field with date+time
colemanw [Tue, 8 Feb 2022 17:14:14 +0000 (12:14 -0500)]
Merge pull request #22677 from eileenmcnaughton/aclmem
Move financial acls for membership to extension
colemanw [Tue, 8 Feb 2022 16:20:08 +0000 (11:20 -0500)]
Merge pull request #22722 from colemanw/restExplorer
APIv4 Explorer - Add REST syntax
colemanw [Tue, 8 Feb 2022 15:55:29 +0000 (10:55 -0500)]
Merge pull request #22380 from braders/core-483-show-customised-preferences-on-validation
Show customised fields on load, if customised option selected.