civicrm-core.git
4 years agoMerge pull request #18176 from agileware/CIVICRM-1465
Seamus Lee [Mon, 17 Aug 2020 02:48:29 +0000 (12:48 +1000)]
Merge pull request #18176 from agileware/CIVICRM-1465

{contribution.receipt_date} token does not use any CiviCRM date formatter, output in YYYY-MM-DD HH:MM:SS format and {contribution.receive_date} also uses a non-standard format

4 years agoMerge pull request #18170 from eileenmcnaughton/testc
Seamus Lee [Sun, 16 Aug 2020 22:31:46 +0000 (08:31 +1000)]
Merge pull request #18170 from eileenmcnaughton/testc

Minor cleanup in test class

4 years agoMerge pull request #18171 from demeritcowboy/unused-UTF8
Eileen McNaughton [Sun, 16 Aug 2020 21:52:05 +0000 (09:52 +1200)]
Merge pull request #18171 from demeritcowboy/unused-UTF8

[REF] Deprecate unused SQL temptable functions

4 years agoMerge pull request #18154 from highfalutin/patch-5
Eileen McNaughton [Sun, 16 Aug 2020 20:02:50 +0000 (08:02 +1200)]
Merge pull request #18154 from highfalutin/patch-5

Mass SMS: Limit group selection to mailing groups

4 years agoMerge pull request #18172 from demeritcowboy/utilsarray-isset
Matthew Wire [Sun, 16 Aug 2020 17:53:58 +0000 (18:53 +0100)]
Merge pull request #18172 from demeritcowboy/utilsarray-isset

[REF] Update recent replacement for CRM_Utils_Array::value

4 years agodeprecate unused functions
demeritcowboy [Sun, 16 Aug 2020 13:17:14 +0000 (09:17 -0400)]
deprecate unused functions

4 years agoupdate replacement for utils_array::value
demeritcowboy [Sun, 16 Aug 2020 13:25:58 +0000 (09:25 -0400)]
update replacement for utils_array::value

4 years agoMerge pull request #18165 from civicrm/5.29
Eileen McNaughton [Sun, 16 Aug 2020 06:29:18 +0000 (18:29 +1200)]
Merge pull request #18165 from civicrm/5.29

5.29

4 years agoMinor cleanup in test class
eileen [Sun, 16 Aug 2020 04:23:35 +0000 (16:23 +1200)]
Minor cleanup in test class

4 years agoMerge pull request #18157 from mattwire/utilsarraycontributionmembership
Eileen McNaughton [Sun, 16 Aug 2020 04:13:35 +0000 (16:13 +1200)]
Merge pull request #18157 from mattwire/utilsarraycontributionmembership

Replace CRM_Utils_Array::value in contribution/confirm and bao/membership

4 years agoMerge pull request #18163 from seamuslee001/5.29
Seamus Lee [Sun, 16 Aug 2020 01:28:13 +0000 (11:28 +1000)]
Merge pull request #18163 from seamuslee001/5.29

[REF] Remove unnecessary comma

4 years ago[REF] Remove unnecessary comma
Seamus Lee [Sat, 15 Aug 2020 23:31:54 +0000 (09:31 +1000)]
[REF] Remove unnecessary comma

4 years agoMerge pull request #18159 from civicrm/5.29
Seamus Lee [Sat, 15 Aug 2020 23:19:35 +0000 (09:19 +1000)]
Merge pull request #18159 from civicrm/5.29

5.29

4 years agoReplace CRM_Utils_Array::value in CRM_Member_BAO_Membership
Matthew Wire [Sat, 15 Aug 2020 13:45:57 +0000 (14:45 +0100)]
Replace CRM_Utils_Array::value in CRM_Member_BAO_Membership

4 years agoMerge pull request #18133 from eileenmcnaughton/utf529
Seamus Lee [Sat, 15 Aug 2020 20:48:05 +0000 (06:48 +1000)]
Merge pull request #18133 from eileenmcnaughton/utf529

Fix 5.29 (unreleased) regression using temp tables

4 years agoReplace CRM_Utils_Array::value in CRM_Contribute_Form_Contribution_Confirm
Matthew Wire [Sat, 15 Aug 2020 13:45:34 +0000 (14:45 +0100)]
Replace CRM_Utils_Array::value in CRM_Contribute_Form_Contribution_Confirm

4 years agoMerge pull request #18155 from eileenmcnaughton/member_order
Matthew Wire [Sat, 15 Aug 2020 09:40:43 +0000 (10:40 +0100)]
Merge pull request #18155 from eileenmcnaughton/member_order

Remove legacy handling for 'fixing' line_item.entity_id

4 years agoMerge pull request #18156 from eileenmcnaughton/renew
Matthew Wire [Sat, 15 Aug 2020 09:39:21 +0000 (10:39 +0100)]
Merge pull request #18156 from eileenmcnaughton/renew

Remove deprecated code ids['userId']

4 years agoRemove deprecated code ids['userId']
eileen [Sat, 15 Aug 2020 05:32:55 +0000 (17:32 +1200)]
Remove deprecated code ids['userId']

These lines were deprecated 7 months ago and were pretty edge case to start with

4 years agoRemove legacy handling for 'fixing' line_item.entity_id
eileen [Sat, 15 Aug 2020 04:52:40 +0000 (16:52 +1200)]
Remove legacy handling for 'fixing' line_item.entity_id

I tried to see what was happening with the test in https://github.com/civicrm/civicrm-core/pull/18113
and spotted that it wasn't using Order.api so the line items were likely wrong. However, once I set
it up to use the Order api I found the code we added back in 2018 to attempt to cope with other code
setting entity_id incorrectly was actually itself setting entity_id incorrectly. The issue
happens when there are 2 Memberships linked to one contribution & the removed code 'decides'
one is wrong and alters it. https://github.com/civicrm/civicrm-core/pull/11816

This line of code throws a deprecation notice - which has not been reported / apparently seen in the last
couple of years so I'm assuming it's not actually doing any good and without removing it this test actually
fails

4 years agoMass SMS: Limit group selection to mailing groups
highfalutin [Sat, 15 Aug 2020 04:15:23 +0000 (21:15 -0700)]
Mass SMS: Limit group selection to mailing groups

To populate the selector for mass SMS recipients, the form calls CRM_Core_PseudoConstant::nestedGroup(). However the function call was missing an argument, so all groups were being returned, not just mailing groups as intended. This PR corrects the mistake.

4 years agoMerge pull request #18142 from seamuslee001/ref_space_currency
Seamus Lee [Sat, 15 Aug 2020 02:01:43 +0000 (12:01 +1000)]
Merge pull request #18142 from seamuslee001/ref_space_currency

[REF] Remove usages of CRM_Utils_Money::format that pass in a blank s…

4 years agoMerge pull request #18148 from civicrm/5.29
Eileen McNaughton [Sat, 15 Aug 2020 01:27:52 +0000 (13:27 +1200)]
Merge pull request #18148 from civicrm/5.29

5.29

4 years agoMerge pull request #18151 from eileenmcnaughton/money
Seamus Lee [Sat, 15 Aug 2020 01:00:10 +0000 (11:00 +1000)]
Merge pull request #18151 from eileenmcnaughton/money

Use more appropriate money format function

4 years ago[REF] Remove usages of CRM_Utils_Money::format that pass in a blank space as a currency
Seamus Lee [Fri, 14 Aug 2020 02:03:50 +0000 (12:03 +1000)]
[REF] Remove usages of CRM_Utils_Money::format that pass in a blank space as a currency

Use formatLocaleNumericRoundedForDefaultCurrency instead as that achieves the same result

4 years agoMerge pull request #18149 from seamuslee001/dev_core_1952
Eileen McNaughton [Sat, 15 Aug 2020 00:56:41 +0000 (12:56 +1200)]
Merge pull request #18149 from seamuslee001/dev_core_1952

dev/core#1952 Remove uncessary component checking when exporting all …

4 years agoFix 5.29 regression using temp tables
eileen [Wed, 12 Aug 2020 04:20:38 +0000 (16:20 +1200)]
Fix 5.29 regression using temp tables

I just pushed 5.29rc through our WMF CI & it failed on a situation where it created a temp
table and that got joined on a non-temp table with a collation mix error. The issue is that the
DB default is set to utf8_general_ci (at least on our development DBs) whereas the
civicrm tables are utf8_unicode_ci. Until https://github.com/civicrm/civicrm-core/pull/18012/files
there was a list of permitted matches for db collation but now any 'utf' string matches.

From what I can tell utf8_general_ci  is a pretty common collation on drupal DBs and from my tests
it causes problems if not excluded here

4 years agoUse more appropriate money format function
eileen [Fri, 14 Aug 2020 23:51:04 +0000 (11:51 +1200)]
Use more appropriate money format function

4 years agodev/core#1952 Remove uncessary component checking when exporting all activities
Seamus Lee [Fri, 14 Aug 2020 23:22:08 +0000 (09:22 +1000)]
dev/core#1952 Remove uncessary component checking when exporting all activities

4 years agoMerge pull request #18144 from seamuslee001/dev_core_1953
Seamus Lee [Fri, 14 Aug 2020 23:04:42 +0000 (09:04 +1000)]
Merge pull request #18144 from seamuslee001/dev_core_1953

dev/core#1953 Ensure that Contribution pages do not fail validation o…

4 years agodev/core#1953 Ensure that Contribution pages do not fail validation on credit cards...
Seamus Lee [Fri, 14 Aug 2020 21:09:00 +0000 (07:09 +1000)]
dev/core#1953 Ensure that Contribution pages do not fail validation on credit cards when a zero dollar price is offered

4 years agoMerge pull request #18135 from colemanw/daoVersions
Seamus Lee [Fri, 14 Aug 2020 02:09:04 +0000 (12:09 +1000)]
Merge pull request #18135 from colemanw/daoVersions

API - Add upgrade-safe checks to ensure table exists before reading

4 years agoMerge pull request #18138 from eileenmcnaughton/dao
Seamus Lee [Fri, 14 Aug 2020 01:23:05 +0000 (11:23 +1000)]
Merge pull request #18138 from eileenmcnaughton/dao

Deprecate 'trapException' in DAO::executeQuery

4 years agoMerge pull request #18139 from totten/master-region-bits
Matthew Wire [Thu, 13 Aug 2020 17:16:07 +0000 (18:16 +0100)]
Merge pull request #18139 from totten/master-region-bits

(REF) CRM_Core_Region - Remove unused bits

4 years agoDeprecate 'trapException' inn DAO::executeQuery
eileen [Thu, 13 Aug 2020 08:54:26 +0000 (20:54 +1200)]
Deprecate 'trapException' inn DAO::executeQuery

    We are pretty heavily moving towards using exceptions so we should deprecate this. It seems the
    fillWithSql is just converting the error to an exception so we shouldn't avoid it

4 years agoSuppress errors when reading DAO version constants
Coleman Watts [Thu, 13 Aug 2020 02:01:24 +0000 (22:01 -0400)]
Suppress errors when reading DAO version constants

4 years agoDAO - only check version on fields from core tables
Coleman Watts [Wed, 12 Aug 2020 20:58:55 +0000 (16:58 -0400)]
DAO - only check version on fields from core tables

4 years agoLog warning when attempting to access nonexistant table from api
Coleman Watts [Wed, 12 Aug 2020 20:50:32 +0000 (16:50 -0400)]
Log warning when attempting to access nonexistant table from api

4 years agoCleanup CRM_Utils_Check version safeguard with APIv4
Coleman Watts [Wed, 12 Aug 2020 18:50:37 +0000 (14:50 -0400)]
Cleanup CRM_Utils_Check version safeguard with APIv4

4 years agoEarly return during APIv4::get if table doesn't exist
Coleman Watts [Wed, 12 Aug 2020 15:44:39 +0000 (11:44 -0400)]
Early return during APIv4::get if table doesn't exist

If there are pending upgrades, checks if table exists before attempting to read from it.

4 years agoRegenerate DAO files
Coleman Watts [Fri, 7 Aug 2020 20:13:08 +0000 (16:13 -0400)]
Regenerate DAO files

4 years agoCodeGen - Add EXT and TABLE_ADDED to each DAO file
Coleman Watts [Fri, 7 Aug 2020 19:27:51 +0000 (15:27 -0400)]
CodeGen - Add EXT and TABLE_ADDED to each DAO file

4 years agoMerge pull request #17956 from eileenmcnaughton/export_phone
Seamus Lee [Wed, 12 Aug 2020 23:51:57 +0000 (09:51 +1000)]
Merge pull request #17956 from eileenmcnaughton/export_phone

dev/core#1661 Allow phones with types longer than 16 chars to export

4 years agoMerge pull request #18131 from demeritcowboy/move-isssldsn
Seamus Lee [Wed, 12 Aug 2020 23:08:02 +0000 (09:08 +1000)]
Merge pull request #18131 from demeritcowboy/move-isssldsn

[REF] Move isSSLDSN() function to avoid potential problems

4 years agoMerge pull request #18134 from colemanw/deprecateCheckVersion
colemanw [Wed, 12 Aug 2020 17:45:13 +0000 (13:45 -0400)]
Merge pull request #18134 from colemanw/deprecateCheckVersion

Deprecate/remove unused checkVersion() functions

4 years agoMerge pull request #18132 from yashodha/dev-1944
colemanw [Wed, 12 Aug 2020 17:42:41 +0000 (13:42 -0400)]
Merge pull request #18132 from yashodha/dev-1944

(dev/core#1944) Add new columns to mailing summary report

4 years agoDeprecate unused CRM_Core_DAO::checkVersion() and remove unused CRM_Upgrade_Form...
Coleman Watts [Wed, 12 Aug 2020 14:21:49 +0000 (10:21 -0400)]
Deprecate unused CRM_Core_DAO::checkVersion() and remove unused CRM_Upgrade_Form::checkVersion()

4 years agomove function to avoid problems
demeritcowboy [Wed, 12 Aug 2020 03:12:41 +0000 (23:12 -0400)]
move function to avoid problems

4 years agoMerge pull request #18094 from colemanw/ets
Seamus Lee [Wed, 12 Aug 2020 04:24:27 +0000 (14:24 +1000)]
Merge pull request #18094 from colemanw/ets

CodeGen - Add use statement to extensions DAO files

4 years ago(dev/core#1944) Add new columns to mailing summary report
yashodha [Wed, 12 Aug 2020 03:24:47 +0000 (08:54 +0530)]
(dev/core#1944) Add new columns to mailing summary report

4 years agoDAO.tpl - use tsFunctionName for extension support
Coleman Watts [Wed, 12 Aug 2020 02:53:53 +0000 (22:53 -0400)]
DAO.tpl - use tsFunctionName for extension support

4 years agoMerge pull request #18128 from civicrm/5.29
Seamus Lee [Wed, 12 Aug 2020 01:32:19 +0000 (11:32 +1000)]
Merge pull request #18128 from civicrm/5.29

5.29

4 years agoMerge pull request #18126 from eileenmcnaughton/dupe529
Seamus Lee [Tue, 11 Aug 2020 23:23:36 +0000 (09:23 +1000)]
Merge pull request #18126 from eileenmcnaughton/dupe529

dev/core#1934 fix regression on merging contacts with settings using contact_id

4 years agoMerge pull request #18123 from seamuslee001/dev_core_1936_alternate
Seamus Lee [Tue, 11 Aug 2020 22:49:39 +0000 (08:49 +1000)]
Merge pull request #18123 from seamuslee001/dev_core_1936_alternate

dev/core#1936 Make the price field value label field not required

4 years agodev/core#1934 fix regression on merging contacts with settings using contact_id
eileen [Tue, 11 Aug 2020 21:38:05 +0000 (09:38 +1200)]
dev/core#1934 fix regression on merging contacts with settings using contact_id

This is an interim fix to a reported regression. I'll look at more carefully in master when time permits

4 years agodev/core#1936 Make the price field value label field not required
Seamus Lee [Tue, 11 Aug 2020 00:09:36 +0000 (10:09 +1000)]
dev/core#1936 Make the price field value label field not required

Fix test and ensure default value is NULL

4 years agoMerge pull request #18095 from demeritcowboy/no-db
Eileen McNaughton [Tue, 11 Aug 2020 08:03:17 +0000 (20:03 +1200)]
Merge pull request #18095 from demeritcowboy/no-db

dev/core#1926 - Towards supporting SSL for mysql connections - remove DB::connect that doesn't add anything

4 years agoMerge pull request #18122 from seamuslee001/master
Seamus Lee [Tue, 11 Aug 2020 00:18:06 +0000 (10:18 +1000)]
Merge pull request #18122 from seamuslee001/master

5.29

4 years agoMerge in 5.29
Seamus Lee [Tue, 11 Aug 2020 00:16:31 +0000 (10:16 +1000)]
Merge in 5.29

4 years agoMerge pull request #18116 from mattwire/phpnoticecontributionpage
Eileen McNaughton [Tue, 11 Aug 2020 00:09:35 +0000 (12:09 +1200)]
Merge pull request #18116 from mattwire/phpnoticecontributionpage

Fix PHP notice on contribution page

4 years agoMerge pull request #18119 from demeritcowboy/document-hidden-buttons
Seamus Lee [Mon, 10 Aug 2020 22:08:17 +0000 (08:08 +1000)]
Merge pull request #18119 from demeritcowboy/document-hidden-buttons

[NFC] Add code comments about hidden but still used buttons

4 years agoMerge pull request #18115 from sunilpawar/dev_1943
Seamus Lee [Mon, 10 Aug 2020 20:55:39 +0000 (06:55 +1000)]
Merge pull request #18115 from sunilpawar/dev_1943

dev/core#1943 add functionality to add civicrm log into Drupal access log

4 years agocomments about hidden but still used buttons
demeritcowboy [Sun, 9 Aug 2020 05:07:57 +0000 (01:07 -0400)]
comments about hidden but still used buttons

4 years agoMerge pull request #18117 from mattwire/529_master
Eileen McNaughton [Mon, 10 Aug 2020 19:53:31 +0000 (07:53 +1200)]
Merge pull request #18117 from mattwire/529_master

5.29 to master

4 years agoMore radical cleanup of button CSS
Andrew Hunt [Thu, 6 Aug 2020 22:17:31 +0000 (18:17 -0400)]
More radical cleanup of button CSS

4 years agoFix CSS for new buttons
Andrew Hunt [Thu, 6 Aug 2020 22:00:58 +0000 (18:00 -0400)]
Fix CSS for new buttons

4 years agoFix JS for input buttons that are now button buttons
Andrew Hunt [Thu, 6 Aug 2020 20:06:56 +0000 (16:06 -0400)]
Fix JS for input buttons that are now button buttons

4 years agoRemove deprecated submitOnce js function
Andrew Hunt [Thu, 6 Aug 2020 19:36:47 +0000 (15:36 -0400)]
Remove deprecated submitOnce js function

4 years agoNo need for crm-button wrappers for real buttons
Andrew Hunt [Thu, 6 Aug 2020 18:57:11 +0000 (14:57 -0400)]
No need for crm-button wrappers for real buttons

4 years agoGive buttons a value when the submitted value is used to identify them
Andrew Hunt [Thu, 6 Aug 2020 17:55:52 +0000 (13:55 -0400)]
Give buttons a value when the submitted value is used to identify them

4 years agoPut icons inside of button elements
Andrew Hunt [Thu, 6 Aug 2020 17:12:36 +0000 (13:12 -0400)]
Put icons inside of button elements

4 years agoSwap out button/submit inputs for button elements
Andrew Hunt [Thu, 6 Aug 2020 15:19:56 +0000 (11:19 -0400)]
Swap out button/submit inputs for button elements

4 years agoCorrection to change priority level
Sunil Pawar [Mon, 10 Aug 2020 13:30:45 +0000 (19:00 +0530)]
Correction to change priority level

4 years agoMerge pull request #18091 from agh1/xbutton-529
Matthew Wire [Mon, 10 Aug 2020 12:42:37 +0000 (13:42 +0100)]
Merge pull request #18091 from agh1/xbutton-529

Swap out button/submit inputs for button elements

4 years agoFix PHP notice on contribution page
Matthew Wire [Mon, 10 Aug 2020 12:31:07 +0000 (13:31 +0100)]
Fix PHP notice on contribution page

4 years agosmall correction
Sunil Pawar [Mon, 10 Aug 2020 12:12:20 +0000 (17:42 +0530)]
small correction

4 years agodev/core#1943 add functionality to add civicrm log into Drupal access log
Sunil Pawar [Mon, 10 Aug 2020 12:09:22 +0000 (17:39 +0530)]
dev/core#1943 add functionality to add civicrm log into Drupal access log

4 years agoMerge pull request #18112 from eileenmcnaughton/paytest
Eileen McNaughton [Mon, 10 Aug 2020 10:06:32 +0000 (22:06 +1200)]
Merge pull request #18112 from eileenmcnaughton/paytest

[NFC] [Test] Initial testing on event payment forms.

4 years ago[Ref] [Test] Update Authorize.net test to use the trait
eileen [Mon, 10 Aug 2020 05:38:30 +0000 (17:38 +1200)]
[Ref] [Test] Update Authorize.net test to use the trait

4 years ago[NFC] [Test] Intial testing on event payment forms.
eileen [Mon, 10 Aug 2020 04:12:02 +0000 (16:12 +1200)]
[NFC] [Test] Intial testing on event payment forms.

I'm trying to work on improving our testing of payment forms. I started with 3 event forms but there were
enough challenges that for this commit I'm just adding tests on one form. As noted in the code comments
it makes sense for this test to be in the extension but I want to work through the challenges on the
other forms before finalising any helper functions to the point where they are available to extensions.

This is actually a bit of a break through as it's the first time we have testing on a form flow - ie
submitting the first form and then the second. It was quite painful

4 years agoMerge pull request #18110 from eileenmcnaughton/xml
Seamus Lee [Mon, 10 Aug 2020 00:55:34 +0000 (10:55 +1000)]
Merge pull request #18110 from eileenmcnaughton/xml

Add Serialize key to payment_processor field for Event & Contribution Page

4 years agoMerge pull request #18109 from eileenmcnaughton/format
Seamus Lee [Sun, 9 Aug 2020 23:33:30 +0000 (09:33 +1000)]
Merge pull request #18109 from eileenmcnaughton/format

[NFC] Array formatting

4 years agoMerge pull request #18108 from eileenmcnaughton/paytest
Seamus Lee [Sun, 9 Aug 2020 23:33:13 +0000 (09:33 +1000)]
Merge pull request #18108 from eileenmcnaughton/paytest

Remove unused variable

4 years agoAdd Serialize key to payment_processor field for Event & ContributionPage
eileen [Sun, 9 Aug 2020 23:03:05 +0000 (11:03 +1200)]
Add Serialize key to payment_processor field for Event & ContributionPage

The DAO can handle arrays if it knows the format now...

4 years agoRemove unused variable
eileen [Sun, 9 Aug 2020 21:44:02 +0000 (09:44 +1200)]
Remove unused variable

I spotted this variable as defined but unused - let's remove

4 years ago[NFC] Array formatting
eileen [Sun, 9 Aug 2020 21:55:11 +0000 (09:55 +1200)]
[NFC] Array formatting

This is a straight up IDE reformat to get rid of old array syntax.

IDE had some whitespace thoughts with I'm neutral on - if Jenkins is too then all good IMHO

4 years agoMerge pull request #18104 from civicrm/5.29
Seamus Lee [Sat, 8 Aug 2020 07:04:10 +0000 (17:04 +1000)]
Merge pull request #18104 from civicrm/5.29

5.29

4 years agoMerge pull request #18101 from demeritcowboy/eventcart-settingcheck
Seamus Lee [Sat, 8 Aug 2020 04:27:00 +0000 (14:27 +1000)]
Merge pull request #18101 from demeritcowboy/eventcart-settingcheck

dev/event#40 - EventCart - Check legacy setting until extension is public

4 years agoMerge pull request #18100 from civicrm/5.29
Seamus Lee [Sat, 8 Aug 2020 01:35:44 +0000 (11:35 +1000)]
Merge pull request #18100 from civicrm/5.29

5.29

4 years agocheck legacy setting until extension is public
demeritcowboy [Sat, 8 Aug 2020 00:59:20 +0000 (20:59 -0400)]
check legacy setting until extension is public

4 years agoMerge pull request #18068 from seamuslee001/dev_wordpress_66
Seamus Lee [Sat, 8 Aug 2020 00:09:19 +0000 (10:09 +1000)]
Merge pull request #18068 from seamuslee001/dev_wordpress_66

dev/wordpress#66 Re-instate newer variables but with more support for…

4 years agoMerge pull request #18097 from demeritcowboy/mysqli
Seamus Lee [Sat, 8 Aug 2020 00:07:15 +0000 (10:07 +1000)]
Merge pull request #18097 from demeritcowboy/mysqli

There is no "I" in mysqli - oh wait there is

4 years agoMerge pull request #18098 from civicrm/5.29
Eileen McNaughton [Fri, 7 Aug 2020 22:59:56 +0000 (10:59 +1200)]
Merge pull request #18098 from civicrm/5.29

5.29 to master

4 years agoMerge pull request #18092 from seamuslee001/preimum_onbehalfof_fix
Eileen McNaughton [Fri, 7 Aug 2020 22:59:19 +0000 (10:59 +1200)]
Merge pull request #18092 from seamuslee001/preimum_onbehalfof_fix

[REF] Fix jquery validation for on behalf of fields when combined wit…

4 years agoMerge pull request #17919 from seamuslee001/nfc_locale_documentation
Eileen McNaughton [Fri, 7 Aug 2020 22:26:23 +0000 (10:26 +1200)]
Merge pull request #17919 from seamuslee001/nfc_locale_documentation

[NFC] Update locale over-ride documentation to mention that it is mos…

4 years agomysqli
demeritcowboy [Fri, 7 Aug 2020 22:02:54 +0000 (18:02 -0400)]
mysqli

4 years agoREF - add helper function to get codeGen tpl
Coleman Watts [Fri, 7 Aug 2020 17:05:52 +0000 (13:05 -0400)]
REF - add helper function to get codeGen tpl

4 years agounneeded connect call
demeritcowboy [Fri, 7 Aug 2020 16:05:13 +0000 (12:05 -0400)]
unneeded connect call

4 years agoMerge pull request #18093 from colemanw/expFix
Seamus Lee [Fri, 7 Aug 2020 04:18:17 +0000 (14:18 +1000)]
Merge pull request #18093 from colemanw/expFix

APIv4 Explorer - Fix possible undefined index

4 years agoCodeGen - Add use statement to extensions DAO files
Coleman Watts [Fri, 7 Aug 2020 03:59:16 +0000 (23:59 -0400)]
CodeGen - Add use statement to extensions DAO files