civicrm-core.git
3 years agoAfformMetadataInjector - Cleanup variable names & comments
Coleman Watts [Wed, 10 Feb 2021 16:20:15 +0000 (11:20 -0500)]
AfformMetadataInjector - Cleanup variable names & comments

3 years agoMerge pull request #19562 from colemanw/relationshipCacheCustom
Seamus Lee [Fri, 12 Feb 2021 08:31:41 +0000 (19:31 +1100)]
Merge pull request #19562 from colemanw/relationshipCacheCustom

APIv4 - Improve handling of joins & custom fields

3 years agoMerge pull request #19583 from demeritcowboy/system-get-info
Seamus Lee [Thu, 11 Feb 2021 20:53:36 +0000 (07:53 +1100)]
Merge pull request #19583 from demeritcowboy/system-get-info

dev/drupal#156 - system_get_info() is gone in drupal 9

3 years agoMerge pull request #19581 from seamuslee001/dao_regen
Eileen McNaughton [Thu, 11 Feb 2021 20:42:36 +0000 (09:42 +1300)]
Merge pull request #19581 from seamuslee001/dao_regen

REF Regenerate DAOs and I18n Schema Structure following merge of #19565

3 years agosystem_get_info is deprecated
demeritcowboy [Thu, 11 Feb 2021 18:35:15 +0000 (13:35 -0500)]
system_get_info is deprecated

3 years agoMerge pull request #19577 from colemanw/bootstrapDashlets
Seamus Lee [Thu, 11 Feb 2021 08:48:46 +0000 (19:48 +1100)]
Merge pull request #19577 from colemanw/bootstrapDashlets

Apply bootstrap theme to searchKit dashlets

3 years agoRegenerate DAOs and I18n Schema Structure following merge of #19565
Seamus Lee [Thu, 11 Feb 2021 06:08:23 +0000 (17:08 +1100)]
Regenerate DAOs and I18n Schema Structure following merge of #19565

3 years agoMerge pull request #19565 from ahed-compucorp/add-missing-labels
Seamus Lee [Thu, 11 Feb 2021 06:05:28 +0000 (17:05 +1100)]
Merge pull request #19565 from ahed-compucorp/add-missing-labels

Delete repeated title and fix some labels

3 years agoMerge pull request #19576 from ixiam/dev-core#2371
Eileen McNaughton [Wed, 10 Feb 2021 20:29:52 +0000 (09:29 +1300)]
Merge pull request #19576 from ixiam/dev-core#2371

serialize as boolean setting value for checkbox in CRM_Admin_Form_Gen…

3 years agoApply bootstrap theme to searchKit dashlets
Coleman Watts [Wed, 10 Feb 2021 15:09:31 +0000 (10:09 -0500)]
Apply bootstrap theme to searchKit dashlets

3 years agoAPIv4 - Fix wildcard expansion in joins
Coleman Watts [Wed, 10 Feb 2021 14:53:43 +0000 (09:53 -0500)]
APIv4 - Fix wildcard expansion in joins

Passing a fake field (e.g. related_entity.*) to autoJoinFk was triggering it to always re-attempt a join,
because it could never find a filed named "*".
Instead pass it a real field (every entity has an "id").

3 years agoMerge pull request #19575 from colemanw/angularDashletFix
colemanw [Wed, 10 Feb 2021 13:04:33 +0000 (08:04 -0500)]
Merge pull request #19575 from colemanw/angularDashletFix

Fix angular error when user is not logged in.

3 years agoserialize as boolean setting value for checkbox in CRM_Admin_Form_Generic
Luciano Spiegel [Wed, 10 Feb 2021 08:47:20 +0000 (09:47 +0100)]
serialize as boolean setting value for checkbox in CRM_Admin_Form_Generic

3 years agoFix angular error when user is not logged in.
Coleman Watts [Wed, 10 Feb 2021 01:21:57 +0000 (20:21 -0500)]
Fix angular error when user is not logged in.

3 years agoMerge pull request #19574 from civicrm/5.35
Seamus Lee [Wed, 10 Feb 2021 01:08:34 +0000 (12:08 +1100)]
Merge pull request #19574 from civicrm/5.35

5.35 to master

3 years agoMerge pull request #19573 from totten/5.35-rand37
Eileen McNaughton [Wed, 10 Feb 2021 01:07:55 +0000 (14:07 +1300)]
Merge pull request #19573 from totten/5.35-rand37

dev/core#2370 - Installer - Bump up entropy for autogenerated cred keys

3 years agoMerge pull request #19568 from totten/5.35-rand37
Seamus Lee [Tue, 9 Feb 2021 23:37:59 +0000 (10:37 +1100)]
Merge pull request #19568 from totten/5.35-rand37

dev/core#2370 - Installer - Bump up entropy for autogenerated cred keys

3 years agoSearchKit - When removing a join, cleanup related params
Coleman Watts [Tue, 9 Feb 2021 23:18:23 +0000 (18:18 -0500)]
SearchKit - When removing a join, cleanup related params

After removing an explicit join, ensure that all SELECT, WHERE, ORDER BY and HAVING clauses containing it are also removed,
plus any additional joins that relied on the join being removed.

3 years agoSearchKit - Remove old unused params
Coleman Watts [Tue, 9 Feb 2021 20:43:53 +0000 (15:43 -0500)]
SearchKit - Remove old unused params

3 years agoAdd label for fields without title and html tag
Ahed [Tue, 9 Feb 2021 17:56:19 +0000 (19:56 +0200)]
Add label for fields without title and html tag

3 years agoAdd label for fields without title
Ahed [Tue, 9 Feb 2021 17:55:18 +0000 (19:55 +0200)]
Add label for fields without title

Only for fields with html tag

3 years agoMerge pull request #19567 from eileenmcnaughton/ipn
colemanw [Tue, 9 Feb 2021 13:07:13 +0000 (08:07 -0500)]
Merge pull request #19567 from eileenmcnaughton/ipn

Remove unused code

3 years agodev/core#2370 - Installer - Bump up entropy for autogenerated cred keys
Tim Otten [Tue, 9 Feb 2021 10:51:05 +0000 (02:51 -0800)]
dev/core#2370 - Installer - Bump up entropy for autogenerated cred keys

This slightly expands the amount of entropy for certain auto-generated values.

Before
-----

~99% of generated values have >=232 bits

After
-----

~99% of generated values have >=260 bits

Technical details
--------

https://lab.civicrm.org/dev/core/-/issues/2370#note_53832

3 years agoRemove unused code
eileen [Tue, 9 Feb 2021 10:27:52 +0000 (23:27 +1300)]
Remove unused code

This value is added to input but does not make it from there to
contributionParams as it is not in the white list. It is also not used in
repeatransaction - which is the other place input is passed to
but which only uses it in a highly filtered form

3 years agoFix titles that contain entity name
Ahed [Mon, 8 Feb 2021 21:59:41 +0000 (23:59 +0200)]
Fix titles that contain entity name

Only for fields with title tag and html->label

3 years agoDelete repeated title and fix some labels
Ahed [Mon, 8 Feb 2021 21:07:02 +0000 (23:07 +0200)]
Delete repeated title and fix some labels

3 years agoMerge pull request #19564 from civicrm/5.35
Seamus Lee [Tue, 9 Feb 2021 09:07:19 +0000 (20:07 +1100)]
Merge pull request #19564 from civicrm/5.35

5.35

3 years agoMerge pull request #19563 from eileenmcnaughton/5.35
Seamus Lee [Tue, 9 Feb 2021 08:55:41 +0000 (19:55 +1100)]
Merge pull request #19563 from eileenmcnaughton/5.35

Fix unreleased regression from mistake extracting function

3 years agoFix unreleased regression from mistake extracting function
eileen [Tue, 9 Feb 2021 04:00:11 +0000 (17:00 +1300)]
Fix unreleased regression from mistake extracting function

Ports this line (merged to master) to 5.35 as the mistake turns out to affect 5.35
https://github.com/civicrm/civicrm-core/pull/19551/files#diff-447cfa0a0ec021e7cf54c6f207d94c3e3343eec930130a995355fec37a590a22R597

3 years agoAPIv4 - Support implicit joins to explicitly joined tables
Coleman Watts [Tue, 9 Feb 2021 02:55:09 +0000 (21:55 -0500)]
APIv4 - Support implicit joins to explicitly joined tables

In APIv4 you can imply a join through dot notation e.g. contact.display_name.
You can also explicity add a join with the addJoin() method.
This allows the two techniques to be combined so that e.g. an explicitly added Address join
can implicity select fields joined from Address to Country.

3 years agoAPIv4 - Add Relationship custom fields to RelationshipCache entity
Coleman Watts [Mon, 8 Feb 2021 15:11:10 +0000 (10:11 -0500)]
APIv4 - Add Relationship custom fields to RelationshipCache entity

Because the RelationshipCache entity is meant to be used without requiring a join to the Relationship table,
this permits direct access to Relationship custom fields as if they belong to the RelationshipCache table.

3 years agoMerge pull request #19560 from colemanw/fixEntityFormTrait
Matthew Wire [Mon, 8 Feb 2021 21:13:47 +0000 (21:13 +0000)]
Merge pull request #19560 from colemanw/fixEntityFormTrait

Fix 'Unsupported html-element' error on forms using EntityFormTrait

3 years agoMerge pull request #19559 from demeritcowboy/asset-more-info
Eileen McNaughton [Mon, 8 Feb 2021 20:33:00 +0000 (09:33 +1300)]
Merge pull request #19559 from demeritcowboy/asset-more-info

dev/core#2137 - Enhance log message to include the actual error

3 years agoFix 'Unsupported html-element' error on forms using EntityFormTrait
Coleman Watts [Mon, 8 Feb 2021 18:14:35 +0000 (13:14 -0500)]
Fix 'Unsupported html-element' error on forms using EntityFormTrait

3 years agoinclude the actual error in log message
demeritcowboy [Mon, 8 Feb 2021 14:31:13 +0000 (09:31 -0500)]
include the actual error in log message

3 years agoMerge pull request #19421 from eileenmcnaughton/act2
colemanw [Mon, 8 Feb 2021 14:14:36 +0000 (09:14 -0500)]
Merge pull request #19421 from eileenmcnaughton/act2

Cleanup towards dev/core#2308

3 years agoMerge pull request #19547 from eileenmcnaughton/cont_obj
Matthew Wire [Mon, 8 Feb 2021 13:50:47 +0000 (13:50 +0000)]
Merge pull request #19547 from eileenmcnaughton/cont_obj

[REF] Fully remove contribution object from repeattransaction function

3 years agoMerge pull request #19525 from eileenmcnaughton/member_soft
Yashodha Chaku [Mon, 8 Feb 2021 11:13:58 +0000 (16:43 +0530)]
Merge pull request #19525 from eileenmcnaughton/member_soft

[REF] Remove unused pcp & soft credit handling from previously shared code

3 years agoMerge pull request #19536 from totten/master-use-permlist
Seamus Lee [Mon, 8 Feb 2021 09:13:52 +0000 (20:13 +1100)]
Merge pull request #19536 from totten/master-use-permlist

Afform (et al) - Fetch more complete list of permissions via APIv4

3 years ago[REF] Fully remove contribution object from repeattransaction function
eileen [Fri, 5 Feb 2021 23:06:53 +0000 (12:06 +1300)]
[REF] Fully remove contribution object from repeattransaction function

We can now see it is no longer used & remove it

3 years agoMerge pull request #19554 from colemanw/searchFields
Eileen McNaughton [Mon, 8 Feb 2021 00:31:09 +0000 (13:31 +1300)]
Merge pull request #19554 from colemanw/searchFields

SearchKit - Add implicit joins for displaying labels of related entities

3 years agoMerge pull request #19555 from demeritcowboy/activity-import-validate
Eileen McNaughton [Mon, 8 Feb 2021 00:30:23 +0000 (13:30 +1300)]
Merge pull request #19555 from demeritcowboy/activity-import-validate

[NFC/Unit Test] dev/core#2308 - Tests for activity import

3 years agoMerge pull request #19556 from mattwire/renamevar
Seamus Lee [Sun, 7 Feb 2021 21:38:01 +0000 (08:38 +1100)]
Merge pull request #19556 from mattwire/renamevar

[REF] Rename variable to clarify it's usage

3 years agoRename variable to clarify it's usage
Matthew Wire [Tue, 2 Feb 2021 13:44:20 +0000 (13:44 +0000)]
Rename variable to clarify it's usage

3 years agoMerge pull request #19551 from eileenmcnaughton/msg_tpl_convert_test
Matthew Wire [Sun, 7 Feb 2021 15:41:27 +0000 (15:41 +0000)]
Merge pull request #19551 from eileenmcnaughton/msg_tpl_convert_test

Add unit test cover for the MessageTemplate::renderMessageTemplate function

3 years agoMerge pull request #19509 from jmcclelland/correctSmsNumbers
Matthew Wire [Sun, 7 Feb 2021 15:39:59 +0000 (15:39 +0000)]
Merge pull request #19509 from jmcclelland/correctSmsNumbers

Correct sms numbers

3 years agotests for activity import
demeritcowboy [Sat, 6 Feb 2021 19:33:43 +0000 (14:33 -0500)]
tests for activity import

3 years agoMerge pull request #19553 from demeritcowboy/activity-import-test
Eileen McNaughton [Sun, 7 Feb 2021 04:25:38 +0000 (17:25 +1300)]
Merge pull request #19553 from demeritcowboy/activity-import-test

dev/core#2308 - Fix Activity Import Parser test and convert to civi statics

3 years agofix test and convert to civi statics
demeritcowboy [Sun, 7 Feb 2021 02:47:47 +0000 (21:47 -0500)]
fix test and convert to civi statics

3 years agoAdd unit test cover for the MessageTemplate::renderMessageTemplate function
eileen [Sat, 6 Feb 2021 03:19:30 +0000 (16:19 +1300)]
Add unit test cover for the MessageTemplate::renderMessageTemplate function

This provides cover for the 4 methods
- domain tokens
- contact tokens
- smarty assigns within the function
- smarty assigns before the function

3 years agoMerge pull request #19552 from demeritcowboy/php74-notice
Eileen McNaughton [Sat, 6 Feb 2021 21:40:57 +0000 (10:40 +1300)]
Merge pull request #19552 from demeritcowboy/php74-notice

php 7.4 E_NOTICE in Contact/BAO/Query

3 years agoSearchKit - Use label_field to determine column to output as link
Coleman Watts [Sat, 6 Feb 2021 21:05:40 +0000 (16:05 -0500)]
SearchKit - Use label_field to determine column to output as link

3 years agoSearchKit - Use label_field to determine default columns
Coleman Watts [Sat, 6 Feb 2021 21:00:18 +0000 (16:00 -0500)]
SearchKit - Use label_field to determine default columns

3 years agoSearchKit - Auto-add label_field when adding a join
Coleman Watts [Sat, 6 Feb 2021 20:41:44 +0000 (15:41 -0500)]
SearchKit - Auto-add label_field when adding a join

3 years agoSearchKit - Add in FK fields for implicit joins
Coleman Watts [Sat, 6 Feb 2021 20:27:12 +0000 (15:27 -0500)]
SearchKit - Add in FK fields for implicit joins

This adds pseudo-fields to each entity that actually belong to other entities,
the API is able to automatically fetch them using implicit joins.

3 years agophp 7.4 notice
demeritcowboy [Sat, 6 Feb 2021 19:33:43 +0000 (14:33 -0500)]
php 7.4 notice

3 years agoMerge pull request #19531 from ahed-compucorp/master
colemanw [Sat, 6 Feb 2021 17:40:28 +0000 (12:40 -0500)]
Merge pull request #19531 from ahed-compucorp/master

Improve consistency of field titles, labels, types across the schema

3 years agoFix failing tests after regenerating DAO files
Ahed [Sat, 6 Feb 2021 11:37:09 +0000 (13:37 +0200)]
Fix failing tests after regenerating DAO files

3 years agoRegenerate DAO files
Ahed [Sat, 6 Feb 2021 11:36:32 +0000 (13:36 +0200)]
Regenerate DAO files

3 years agoMerge pull request #19524 from eileenmcnaughton/member
Eileen McNaughton [Sat, 6 Feb 2021 00:08:01 +0000 (13:08 +1300)]
Merge pull request #19524 from eileenmcnaughton/member

[REF] Simplify is_email_receipt handling

3 years agoMerge pull request #19545 from demeritcowboy/membership-notice-php74
Eileen McNaughton [Fri, 5 Feb 2021 23:44:14 +0000 (12:44 +1300)]
Merge pull request #19545 from demeritcowboy/membership-notice-php74

php 7.4 - E_NOTICE on membership dashboard

3 years agoMerge pull request #19548 from civicrm/5.35
Eileen McNaughton [Fri, 5 Feb 2021 23:43:20 +0000 (12:43 +1300)]
Merge pull request #19548 from civicrm/5.35

5.35 to master

3 years agoMerge pull request #19546 from colemanw/labelField
Eileen McNaughton [Fri, 5 Feb 2021 23:42:45 +0000 (12:42 +1300)]
Merge pull request #19546 from colemanw/labelField

APIv4 - Fix label_field to use underscore instead of camelCase

3 years agoFix any title or label that contain name of own entity
Ahed [Fri, 5 Feb 2021 19:34:33 +0000 (21:34 +0200)]
Fix any title or label that contain name of own entity

3 years agoEnsure field's title and html's lable attributes populated properly
Ahed [Fri, 5 Feb 2021 09:33:13 +0000 (11:33 +0200)]
Ensure field's title and html's lable attributes populated properly

3 years agoAdd html tag to all files in xml/schema
Ahed [Thu, 4 Feb 2021 19:48:41 +0000 (21:48 +0200)]
Add html tag to all files in xml/schema

3 years agoMerge pull request #18830 from adixon/asset-building-error-2137
Eileen McNaughton [Fri, 5 Feb 2021 21:40:33 +0000 (10:40 +1300)]
Merge pull request #18830 from adixon/asset-building-error-2137

put asset rendering call into a try/catch - dev/core #2137

3 years ago[REF] Simplify is_email_receipt handling
eileen [Thu, 4 Feb 2021 03:13:06 +0000 (16:13 +1300)]
[REF] Simplify is_email_receipt handling

This removes a chunk of confusing handling from the previously shared code.

Philosophically we have a lot of arrays of data being passed around. The difference
between these arrays is unclear & the array that appears to exist specifically to
how what was actually submitted (formValues) is edited rather than left intact.

Where we are not dealing with a calcuated value, but rather referring to
what was submitted the quickform function getSubmittedValue() seems
like a good pick. It's clear we are looking up the submitted value not
some calculated value & when code is moved around we know this
value is not dependent on where it is sitting in the code.

The function returns 1 or NULL - hence I cast to boolean where I'm not
sure NULL is good enough

3 years agoSort permission list by title. Make it easier to skim.
Tim Otten [Fri, 5 Feb 2021 20:49:16 +0000 (12:49 -0800)]
Sort permission list by title. Make it easier to skim.

3 years agophp 7.4 is a bit stricter
demeritcowboy [Fri, 5 Feb 2021 20:39:37 +0000 (15:39 -0500)]
php 7.4 is a bit stricter

3 years agoAPIv4 - Fix label_field to use underscore instead of camelCase
Coleman Watts [Fri, 5 Feb 2021 20:36:26 +0000 (15:36 -0500)]
APIv4 - Fix label_field to use underscore instead of camelCase

3 years agoLog unexpected missing asset during AssetBuilder::build
Alan Dixon [Wed, 21 Oct 2020 20:24:41 +0000 (20:24 +0000)]
Log unexpected missing asset during AssetBuilder::build

3 years agoput asset rendering call into a try/catch
Alan Dixon [Wed, 21 Oct 2020 20:24:41 +0000 (20:24 +0000)]
put asset rendering call into a try/catch

3 years agoMerge pull request #19538 from eileenmcnaughton/repeat
Matthew Wire [Fri, 5 Feb 2021 11:24:22 +0000 (11:24 +0000)]
Merge pull request #19538 from eileenmcnaughton/repeat

[REF] [Repeattransaction] Stop setting contribution->id

3 years agoMerge pull request #19539 from eileenmcnaughton/repeat_fin
Matthew Wire [Fri, 5 Feb 2021 11:22:04 +0000 (11:22 +0000)]
Merge pull request #19539 from eileenmcnaughton/repeat_fin

[REF] [Repeattransaction] use financial_type_id from getTemplateContribution (which already has handling)

3 years agoMerge pull request #19540 from eileenmcnaughton/cont_page_input
Matthew Wire [Fri, 5 Feb 2021 11:20:08 +0000 (11:20 +0000)]
Merge pull request #19540 from eileenmcnaughton/cont_page_input

[REF] [Repeattransaction] Remove loading contribution page id from passed in object

3 years agoMerge pull request #19530 from colemanw/searchDisplayBlocks
Seamus Lee [Fri, 5 Feb 2021 08:04:36 +0000 (19:04 +1100)]
Merge pull request #19530 from colemanw/searchDisplayBlocks

Afform Gui - Block editing enhancements

3 years agoMerge pull request #19542 from seamuslee001/afform_fix_array_access
Eileen McNaughton [Fri, 5 Feb 2021 06:12:35 +0000 (19:12 +1300)]
Merge pull request #19542 from seamuslee001/afform_fix_array_access

[REF] Fix array access on NULL error when running afform unit tests o…

3 years agoMerge pull request #19541 from totten/master-aff-mock
Eileen McNaughton [Fri, 5 Feb 2021 05:45:52 +0000 (18:45 +1300)]
Merge pull request #19541 from totten/master-aff-mock

afform_mock - Hide extension. Clearly indicate as development-only

3 years ago[REF] Fix array access on NULL error when running afform unit tests on PHP 7.4
Seamus Lee [Fri, 5 Feb 2021 04:34:32 +0000 (15:34 +1100)]
[REF] Fix array access on NULL error when running afform unit tests on PHP 7.4

3 years ago(NFC) afform_mock - Hide extension. Clearly indicate as development-only.
Tim Otten [Fri, 5 Feb 2021 04:21:47 +0000 (20:21 -0800)]
(NFC) afform_mock - Hide extension. Clearly indicate as development-only.

3 years agoMerge pull request #19537 from colemanw/aliasLength
Eileen McNaughton [Fri, 5 Feb 2021 03:52:15 +0000 (16:52 +1300)]
Merge pull request #19537 from colemanw/aliasLength

APIv4 - Increase alias max length to 256

3 years ago[REF] Remove loading contribution page id from passed in object
eileen [Fri, 5 Feb 2021 03:15:25 +0000 (16:15 +1300)]
[REF] Remove loading contribution page id from passed in object

I believe this became obsolete with this PR
https://github.com/civicrm/civicrm-core/commit/6c3e774c322267c8e4449006db9cc14202b7028f

The other 2 (paypal) IPN classes no longer set contribution_page_id deliberately so
would be relying on the same data used for getTemplateContribution

3 years ago[REF] use financial_type_id from getTemplateContribution (which already has handling)
eileen [Fri, 5 Feb 2021 02:42:57 +0000 (15:42 +1300)]
[REF] use financial_type_id from getTemplateContribution (which already has handling)

The removed code is already incorporated into getTemplateContribution
and has test cover in testRepeatTransactionPassedInFinancialType

3 years ago[REF] Stop setting contribution->id
eileen [Fri, 5 Feb 2021 02:33:11 +0000 (15:33 +1300)]
[REF] Stop setting contribution->id

This is not needed as we can otherwise get it from the contributionResult directly

3 years agoAPIv4 - Increase alias max length to 256
Coleman Watts [Fri, 5 Feb 2021 01:52:45 +0000 (20:52 -0500)]
APIv4 - Increase alias max length to 256

3 years agoCRM_Core_Permission_List - Tweak labels for `*always allow*` and `*always deny*`
Tim Otten [Fri, 5 Feb 2021 00:49:33 +0000 (16:49 -0800)]
CRM_Core_Permission_List - Tweak labels for `*always allow*` and `*always deny*`

3 years agoNav Menu Editor - Use API for listing/searching available permissions
Tim Otten [Thu, 4 Feb 2021 22:14:35 +0000 (14:14 -0800)]
Nav Menu Editor - Use API for listing/searching available permissions

3 years agoCiviReport - Use API for listing/searching available permissions. Use select2.
Tim Otten [Thu, 4 Feb 2021 22:04:51 +0000 (14:04 -0800)]
CiviReport - Use API for listing/searching available permissions. Use select2.

3 years agoAfform - Use API for listing/searching available permissions
Tim Otten [Fri, 22 Jan 2021 03:07:41 +0000 (19:07 -0800)]
Afform - Use API for listing/searching available permissions

3 years agoMerge pull request #19535 from colemanw/escapeRows
Monish Deb [Fri, 5 Feb 2021 01:11:19 +0000 (06:41 +0530)]
Merge pull request #19535 from colemanw/escapeRows

dev/core#2360 - Escape the word `rows` in sql query

3 years agoPermission.get API - Fix warning on Drupal/Backdrop
Tim Otten [Fri, 22 Jan 2021 02:58:41 +0000 (18:58 -0800)]
Permission.get API - Fix warning on Drupal/Backdrop

3 years agoMerge pull request #19508 from mattwire/loadmemlineitems
Eileen McNaughton [Fri, 5 Feb 2021 00:19:17 +0000 (13:19 +1300)]
Merge pull request #19508 from mattwire/loadmemlineitems

Fix display of membership dates on receipts when lineitems do not have a price_set_id

3 years agoMerge pull request #19534 from civicrm/5.35
Eileen McNaughton [Fri, 5 Feb 2021 00:14:53 +0000 (13:14 +1300)]
Merge pull request #19534 from civicrm/5.35

5.35

3 years agodev/core#2360 - Escape the word `rows` in sql query
Coleman Watts [Thu, 4 Feb 2021 23:10:42 +0000 (18:10 -0500)]
dev/core#2360 - Escape the word `rows` in sql query

3 years agoMerge pull request #19533 from totten/master-api4-status-code
Seamus Lee [Thu, 4 Feb 2021 23:07:52 +0000 (10:07 +1100)]
Merge pull request #19533 from totten/master-api4-status-code

APIv4 - Fix HTTP status code selection

3 years agoMerge pull request #19529 from agh1/5.35.0-releasenotes-initial
Seamus Lee [Thu, 4 Feb 2021 21:55:06 +0000 (08:55 +1100)]
Merge pull request #19529 from agh1/5.35.0-releasenotes-initial

5.35.0 release notes - initial run

3 years agoAPIv4 - Fix HTTP status code selection
Tim Otten [Thu, 4 Feb 2021 21:15:17 +0000 (13:15 -0800)]
APIv4 - Fix HTTP status code selection

This is a follow-up to #19526 which addresses a typo that causes a misbehavior in reporting the HTTP status code.

Before
------

If an API request encounters an exception, then it always returns HTTP 403.

After
-----

If an API request encounters an exception, then:

* It may return HTTP 403 (for an authorization exception)
* It may return HTTP 500 (for any other/unrecognized exception)

3 years agoMerge pull request #19463 from colemanw/removeCampaignPseudoconstant
Eileen McNaughton [Thu, 4 Feb 2021 21:15:08 +0000 (10:15 +1300)]
Merge pull request #19463 from colemanw/removeCampaignPseudoconstant

Remove campaign_id pseudoconstants

3 years agoRemove campaign pseudoconstants from tests
Coleman Watts [Sat, 30 Jan 2021 02:45:07 +0000 (21:45 -0500)]
Remove campaign pseudoconstants from tests