civicrm-core.git
3 years agoMerge pull request #20328 from mattwire/payflowprodopayment
Seamus Lee [Mon, 17 May 2021 22:21:00 +0000 (08:21 +1000)]
Merge pull request #20328 from mattwire/payflowprodopayment

Convert payflowpro to doPayment

3 years agoMerge pull request #20323 from mattwire/ewaydopayment
Eileen McNaughton [Mon, 17 May 2021 22:11:55 +0000 (10:11 +1200)]
Merge pull request #20323 from mattwire/ewaydopayment

Convert eway to doPayment

3 years agoMerge pull request #20329 from highfalutin/patch-6
Eileen McNaughton [Mon, 17 May 2021 20:41:43 +0000 (08:41 +1200)]
Merge pull request #20329 from highfalutin/patch-6

Correct copy-paste error in CustomField schema

3 years agoMerge pull request #20322 from mattwire/authnetdopayment
Eileen McNaughton [Mon, 17 May 2021 20:13:30 +0000 (08:13 +1200)]
Merge pull request #20322 from mattwire/authnetdopayment

Convert AuthorizeNet to doPayment()

3 years agoMerge pull request #20309 from jmcclelland/profile-county
Eileen McNaughton [Mon, 17 May 2021 19:36:58 +0000 (07:36 +1200)]
Merge pull request #20309 from jmcclelland/profile-county

get county fields populated via api call

3 years agoMerge pull request #20303 from totten/master-extver-xml
colemanw [Mon, 17 May 2021 19:22:43 +0000 (15:22 -0400)]
Merge pull request #20303 from totten/master-extver-xml

dev/release#17 - Synchronize version#s for core and core-extensions

3 years agoMerge pull request #20269 from colemanw/bulkSave
colemanw [Mon, 17 May 2021 18:48:22 +0000 (14:48 -0400)]
Merge pull request #20269 from colemanw/bulkSave

APIv4 - Save custom fields in bulk

3 years agoCorrect copy-paste error in CustomField schema
highfalutin [Mon, 17 May 2021 17:45:19 +0000 (10:45 -0700)]
Correct copy-paste error in CustomField schema

3 years agoConvert payflowpro to doPayment
Matthew Wire [Mon, 17 May 2021 15:23:55 +0000 (16:23 +0100)]
Convert payflowpro to doPayment

3 years agoConvert eway to doPayment
Matthew Wire [Mon, 17 May 2021 15:20:31 +0000 (16:20 +0100)]
Convert eway to doPayment

3 years agoConvert authorizenet to doPayment
Matthew Wire [Mon, 17 May 2021 15:11:25 +0000 (16:11 +0100)]
Convert authorizenet to doPayment

3 years agoMerge pull request #20273 from seamuslee001/report_default_pager
demeritcowboy [Mon, 17 May 2021 13:22:22 +0000 (09:22 -0400)]
Merge pull request #20273 from seamuslee001/report_default_pager

[REF] Make use of recently added default pager size setting in Reports

3 years agoMerge pull request #20313 from eileenmcnaughton/mem_move2
demeritcowboy [Mon, 17 May 2021 12:48:11 +0000 (08:48 -0400)]
Merge pull request #20313 from eileenmcnaughton/mem_move2

[REF] Duplicate & deprecate processMembership

3 years agoMerge pull request #20320 from eileenmcnaughton/managed
Seamus Lee [Mon, 17 May 2021 08:39:26 +0000 (18:39 +1000)]
Merge pull request #20320 from eileenmcnaughton/managed

Add unit test for #20144

3 years agoMerge pull request #19840 from MikeyMJCO/patch-7
Seamus Lee [Mon, 17 May 2021 08:00:10 +0000 (18:00 +1000)]
Merge pull request #19840 from MikeyMJCO/patch-7

Explicitly throw an error/status bounce on Edit/New if no types.

3 years ago[REF] Make use of recently added default pager size setting in Reports
Seamus Lee [Tue, 11 May 2021 23:56:09 +0000 (09:56 +1000)]
[REF] Make use of recently added default pager size setting in Reports

Update code as per feedback from Dave D

3 years agoAdd unit test for #20144
Eileen McNaughton [Mon, 17 May 2021 06:56:40 +0000 (18:56 +1200)]
Add unit test for #20144

3 years agoMerge pull request #20316 from eileenmcnaughton/ppp
Seamus Lee [Mon, 17 May 2021 04:48:41 +0000 (14:48 +1000)]
Merge pull request #20316 from eileenmcnaughton/ppp

[REF] Switch to using getContributionRecurID function, remove now unused param

3 years agoMerge pull request #20281 from colemanw/afformDragDrop
Seamus Lee [Mon, 17 May 2021 04:46:48 +0000 (14:46 +1000)]
Merge pull request #20281 from colemanw/afformDragDrop

Afform drag n drop fixes

3 years agoMerge pull request #20317 from eileenmcnaughton/pp
Seamus Lee [Mon, 17 May 2021 04:33:56 +0000 (14:33 +1000)]
Merge pull request #20317 from eileenmcnaughton/pp

[REF] Fully remove ids variable from paypal std

3 years agoMerge pull request #20302 from totten/master-extver-ui
Eileen McNaughton [Mon, 17 May 2021 03:54:37 +0000 (15:54 +1200)]
Merge pull request #20302 from totten/master-extver-ui

(dev/release#17) Extension UI - Show developmental icon for alpha/beta-stage extensions

3 years agoMerge pull request #20310 from eileenmcnaughton/group_lock
Eileen McNaughton [Mon, 17 May 2021 02:54:12 +0000 (14:54 +1200)]
Merge pull request #20310 from eileenmcnaughton/group_lock

Cleanup tracking on group.load

3 years agoMerge pull request #20081 from totten/master-authx-defaults
Eileen McNaughton [Mon, 17 May 2021 02:27:48 +0000 (14:27 +1200)]
Merge pull request #20081 from totten/master-authx-defaults

authx - Accept API keys by default

3 years agoMerge pull request #20229 from pradpnayak/usercreate
Eileen McNaughton [Mon, 17 May 2021 02:27:30 +0000 (14:27 +1200)]
Merge pull request #20229 from pradpnayak/usercreate

Activate user when no activation is required

3 years agoMerge pull request #20214 from ixiam/dev#issue_2584
Eileen McNaughton [Mon, 17 May 2021 02:15:16 +0000 (14:15 +1200)]
Merge pull request #20214 from ixiam/dev#issue_2584

Separates the default language for contacts from the site language

3 years agoAPIv4 - Use bulk method for saving custom fields
Coleman Watts [Tue, 11 May 2021 16:34:05 +0000 (12:34 -0400)]
APIv4 - Use bulk method for saving custom fields

Renames the prototype bulkSave => writeRecords to follow the convention now in APIv4 and CRM_Core_DAO

3 years agoAPIv4 - Default to saving and deleting DAO records in bulk
Coleman Watts [Tue, 11 May 2021 16:22:48 +0000 (12:22 -0400)]
APIv4 - Default to saving and deleting DAO records in bulk

This adds new writeRecords() and deleteRecords() methods
to CRM_Core_DAO which can be overridden by DAOs who wish to optimize.

3 years ago[REF] Fully remove ids variable from paypal std
Eileen McNaughton [Mon, 17 May 2021 02:04:40 +0000 (14:04 +1200)]
[REF] Fully remove ids variable from paypal std

The ids variable is no longer used - bye

3 years agoExtension page markup tweaks
Coleman Watts [Mon, 17 May 2021 01:54:55 +0000 (21:54 -0400)]
Extension page markup tweaks

3 years agoDuplicate & deprecate processMembership
Eileen McNaughton [Sun, 16 May 2021 02:01:49 +0000 (14:01 +1200)]
Duplicate & deprecate processMembership

Function only called from one place + tests. Duplicate to where it is
called & deprecated as it seems civimobile may be using this
(in an unsupported way but we shouldn't actively break it since we are aware of that)

3 years ago[REF] Switch to using getContributionRecurID function, remove now unused param
Eileen McNaughton [Mon, 17 May 2021 01:49:24 +0000 (13:49 +1200)]
[REF] Switch to using getContributionRecurID function, remove now unused param

This is a follow up to https://github.com/civicrm/civicrm-core/pull/20294
- getContributionRecurID now always has the id so we don't need to pass it around
in the ids array

3 years agoCleanup tracking on group.load
Eileen McNaughton [Sat, 15 May 2021 01:27:08 +0000 (13:27 +1200)]
Cleanup tracking on group.load

1) deprecate force parameter
2) ditch the static & let the db lookups speak for themselves

The force paramter seems to mostly be about the static & probably only exists to support tests.
The static doesn't make sense now because either they group needs loading or it doesn't.
The fact the process might have tried and succeeded or failed before doesn't need
to be recorded in the static

Cleanup up progress tracking in Group::load

Fix test to do things in a logical order so contacts exist when the group is created

3 years agoMerge pull request #20314 from mattwire/contactdetailacl
demeritcowboy [Sun, 16 May 2021 15:23:55 +0000 (11:23 -0400)]
Merge pull request #20314 from mattwire/contactdetailacl

Switch to non deprecated buildPermissionClause() for contact detail report

3 years agoMerge pull request #20209 from eileenmcnaughton/qfail
Matthew Wire [Sun, 16 May 2021 14:04:47 +0000 (15:04 +0100)]
Merge pull request #20209 from eileenmcnaughton/qfail

Do not error on view contribution recur if not displaying contributions

3 years agoMerge pull request #20300 from eileenmcnaughton/pp
Matthew Wire [Sun, 16 May 2021 14:03:51 +0000 (15:03 +0100)]
Merge pull request #20300 from eileenmcnaughton/pp

dev/core#2593 stop calling loadRelatedObjects / fix for bug

3 years agoMerge pull request #20294 from eileenmcnaughton/ppp
Matthew Wire [Sun, 16 May 2021 14:00:35 +0000 (15:00 +0100)]
Merge pull request #20294 from eileenmcnaughton/ppp

[REF] Provide standardised methods to get recurring contribution id & object

3 years agoMerge pull request #20211 from eileenmcnaughton/reorg
Matthew Wire [Sun, 16 May 2021 13:53:00 +0000 (14:53 +0100)]
Merge pull request #20211 from eileenmcnaughton/reorg

[REF] Reverse if statement

3 years agoMerge pull request #20205 from eileenmcnaughton/dep_pend
Matthew Wire [Sun, 16 May 2021 13:35:30 +0000 (14:35 +0100)]
Merge pull request #20205 from eileenmcnaughton/dep_pend

Remove deprecation of order-must-be-pending

3 years agoSwitch to non deprecated buildPermissionClause() for contact detail report
Matthew Wire [Sun, 16 May 2021 13:30:18 +0000 (14:30 +0100)]
Switch to non deprecated buildPermissionClause() for contact detail report

3 years agoSeparates the default language for contacts from the site language
Vangelis Pantazis [Sun, 16 May 2021 08:04:40 +0000 (09:04 +0100)]
Separates the default language for contacts from the site language

3 years agoMerge pull request #20312 from seamuslee001/improve_sample_data_trxn_id_payment_proce...
Seamus Lee [Sun, 16 May 2021 01:04:23 +0000 (11:04 +1000)]
Merge pull request #20312 from seamuslee001/improve_sample_data_trxn_id_payment_procesor_link

Improve Sample data by ensuring all Credit Card Contributions have a …

3 years agoMerge pull request #20304 from eileenmcnaughton/mem_move2
demeritcowboy [Sat, 15 May 2021 23:10:27 +0000 (19:10 -0400)]
Merge pull request #20304 from eileenmcnaughton/mem_move2

Remove never-passed parameter from now unshared function

3 years agoImprove Sample data by ensuring all Credit Card Contributions have a transaction...
Seamus Lee [Sat, 15 May 2021 22:45:32 +0000 (08:45 +1000)]
Improve Sample data by ensuring all Credit Card Contributions have a transaction id and tha they are shown to be linked to the test payment processor

3 years agoMerge pull request #20311 from demeritcowboy/dummy
Seamus Lee [Sat, 15 May 2021 21:46:15 +0000 (07:46 +1000)]
Merge pull request #20311 from demeritcowboy/dummy

dev/core#2614 - Sample payment processor is the wrong id in the generated sample data for demos

3 years agothe id keeps changing so look it up by name
demeritcowboy [Sat, 15 May 2021 19:27:00 +0000 (15:27 -0400)]
the id keeps changing so look it up by name

3 years agoMerge pull request #20082 from mattwire/paypalwarning
demeritcowboy [Sat, 15 May 2021 16:03:30 +0000 (12:03 -0400)]
Merge pull request #20082 from mattwire/paypalwarning

Add warning when url_site is not specified for paypal (it won't work if not set)

3 years agoMerge pull request #20139 from eileenmcnaughton/home_url
demeritcowboy [Sat, 15 May 2021 02:04:39 +0000 (22:04 -0400)]
Merge pull request #20139 from eileenmcnaughton/home_url

Remove defunct default return property

3 years agoget county fields populated via api call
Jamie McClelland [Fri, 14 May 2021 19:01:38 +0000 (15:01 -0400)]
get county fields populated via api call

Ensure that county fields are properly populated when
calling the Profile.getfields api.

3 years agoMerge pull request #20216 from colemanw/afformEntityRef
Seamus Lee [Fri, 14 May 2021 10:16:09 +0000 (20:16 +1000)]
Merge pull request #20216 from colemanw/afformEntityRef

Afform Gui - Add support for entityRef fields

3 years agoRemove never-passed parameter from now unshared parameter
Eileen McNaughton [Fri, 14 May 2021 06:17:29 +0000 (18:17 +1200)]
Remove never-passed parameter from now unshared parameter

3 years agodev/core#2593 stop calling loadRelatedObjects
Eileen McNaughton [Fri, 14 May 2021 05:58:15 +0000 (17:58 +1200)]
dev/core#2593 stop calling loadRelatedObjects

We are no longer using ids after this function so we don't need to
call that function to load them.

In addition this extacts getContribution & reflects the fact the contact_id
is only being used to warn if the contribution is not a match (in
the debug log)

3 years agoMerge pull request #20299 from eileenmcnaughton/pp
Eileen McNaughton [Fri, 14 May 2021 05:50:45 +0000 (17:50 +1200)]
Merge pull request #20299 from eileenmcnaughton/pp

Remove now-unused ids parameter from signature

3 years ago(dev/release#17) Extension UI - Show developmental icon for alpha/beta-stage extensions
Tim Otten [Fri, 14 May 2021 04:57:36 +0000 (21:57 -0700)]
(dev/release#17) Extension UI - Show developmental icon for alpha/beta-stage extensions

Extensions are published with two fields, `<version>` (e.g.  `1.1`) and `<develStage>` (e.g.  `alpha`).
Confusingly, the two fields sometimes convey redundant information - but not always. A few cases:

* For example, sometimes a `<version>` as `1.0-alpha1`, `1.2.beta2`, or `2.3dev`. This would make sense if the
developer does formal tagging/releasing for developmental versions. (In this case, you don't really need the
icon - because the version-number tells you.)

* Other times, you might have a `<version>` which simply says `1.0` or `2.0` -- and then supplemental
information where the `<develStage>` says `alpha` or `beta`.  This could make sense if the developmental
version is being continuously updated without formal tags/releases.

* Under dev/release#17, we have another case -- where the core-extensions have version#s which match the
core version# (because they are released together), but the devel-stage of the extension is only
alpha/beta (because the extension is still evolving/optional/not-fully-supported).

Before: The "Development Stage" is entirely obscure.

After: There's an icon in the table to signal the development stage.

3 years ago(REF) Extensions - Remove dead code
Tim Otten [Fri, 14 May 2021 04:52:42 +0000 (21:52 -0700)]
(REF) Extensions - Remove dead code

To see that this code is unused, simply grep the entire source-tree for `upgradable`
and `upgradeVersion`. There is nothing that would plausible set these fields.

I think this is left-over from an older UX. When there's an upgrade available in this UX, it shows
an alert box under the "Description".

3 years ago(dev/release#17) ext/*/info.xml - Update versions to match core version
Tim Otten [Fri, 14 May 2021 05:18:52 +0000 (22:18 -0700)]
(dev/release#17) ext/*/info.xml - Update versions to match core version

3 years ago(NFC) ext/*/info.xml - Normalize whitespace
Tim Otten [Fri, 14 May 2021 02:41:32 +0000 (19:41 -0700)]
(NFC) ext/*/info.xml - Normalize whitespace

3 years ago(dev/release#17) For new versions, auto-update ext/{$CORE_EXT}/info.xml
Tim Otten [Fri, 14 May 2021 02:53:59 +0000 (19:53 -0700)]
(dev/release#17) For new versions, auto-update ext/{$CORE_EXT}/info.xml

3 years ago(REF, dev/release#17) Move list of core-exts to separate file
Tim Otten [Fri, 14 May 2021 02:53:45 +0000 (19:53 -0700)]
(REF, dev/release#17) Move list of core-exts to separate file

3 years ago[REF] Add getters for contribution id & contact id
Eileen McNaughton [Fri, 14 May 2021 03:43:50 +0000 (15:43 +1200)]
[REF] Add getters for contribution id & contact id

3 years ago[REF] Provide standardised methods to get recurring contribution id & object
Eileen McNaughton [Fri, 14 May 2021 00:22:49 +0000 (12:22 +1200)]
[REF] Provide standardised methods to get recurring contribution id & object

This adds methods to get the recurring contribution id & object that work from the paypal
express and from the paypal pro flows. In the paypal express flow it is
retrieved from a known value (and this flow is only ever hit for recurrings
as evidenced by the existing getsingle) and then set on the class. For paypal pro
it is optional and will be in the cheap-to-access POST array if relevant

3 years agoRemove now-unused ids parameter from signature
Eileen McNaughton [Fri, 14 May 2021 03:39:26 +0000 (15:39 +1200)]
Remove now-unused ids parameter from signature

3 years agoMerge pull request #20293 from eileenmcnaughton/pp
Eileen McNaughton [Fri, 14 May 2021 03:35:11 +0000 (15:35 +1200)]
Merge pull request #20293 from eileenmcnaughton/pp

[REF] Use function to getContributionRecurID

3 years agoMerge pull request #20295 from eileenmcnaughton/mem_move
Eileen McNaughton [Fri, 14 May 2021 02:57:25 +0000 (14:57 +1200)]
Merge pull request #20295 from eileenmcnaughton/mem_move

[REF] Duplicate processMembership preliminary to cleanup

3 years ago[REF] Use function to getContributionRecurID
Eileen McNaughton [Thu, 13 May 2021 23:42:29 +0000 (11:42 +1200)]
[REF] Use function to getContributionRecurID

We are simply fetching it from the POST so it's cheap to fetch & we can stop passing it around
once we are using a function, not a variable. This also changes the debug logging slightly
to pass the values more correctly to log->debug().

3 years ago[REF] Duplicate processMembership preliminary to cleanup
Eileen McNaughton [Fri, 14 May 2021 01:17:51 +0000 (13:17 +1200)]
[REF] Duplicate processMembership preliminary to cleanup

This used to be shared by 3 places. We've copied & cleaned up one. This duplicates to the
second once I've done some cleaning up I'll deprecate this & also duplicate to the 3rd

3 years agoMerge pull request #20287 from mattwire/contactreportaclduplicates
demeritcowboy [Fri, 14 May 2021 00:30:08 +0000 (20:30 -0400)]
Merge pull request #20287 from mattwire/contactreportaclduplicates

Switch to non deprecated buildPermissionClause() for contact summary report

3 years agoMerge pull request #20288 from demeritcowboy/fintypeaccount
Seamus Lee [Thu, 13 May 2021 23:03:46 +0000 (09:03 +1000)]
Merge pull request #20288 from demeritcowboy/fintypeaccount

[NFC/TEST] - Add unit test enforcing automatic chaining for financial type/account creation via api

3 years agoMerge pull request #20290 from civicrm/5.38
Seamus Lee [Thu, 13 May 2021 23:02:57 +0000 (09:02 +1000)]
Merge pull request #20290 from civicrm/5.38

5.38

3 years agoMerge pull request #20246 from eileenmcnaughton/ft
Seamus Lee [Thu, 13 May 2021 22:31:26 +0000 (08:31 +1000)]
Merge pull request #20246 from eileenmcnaughton/ft

dev/core#2593 [REF] Fix function signature to actually-used variables

3 years agoSwitch to non deprecated buildPermissionClause() for contact summary report
Matthew Wire [Thu, 13 May 2021 19:31:55 +0000 (20:31 +0100)]
Switch to non deprecated buildPermissionClause() for contact summary report

3 years agoMerge pull request #20289 from seamuslee001/5.38
Seamus Lee [Thu, 13 May 2021 21:07:41 +0000 (07:07 +1000)]
Merge pull request #20289 from seamuslee001/5.38

5.37.{1|2} release notes

3 years agoAdd release-notes/5.37.2.md
Tim Otten [Thu, 13 May 2021 01:33:27 +0000 (18:33 -0700)]
Add release-notes/5.37.2.md

3 years agofixup release-notes/5.37.1.md
Tim Otten [Tue, 11 May 2021 22:02:14 +0000 (15:02 -0700)]
fixup release-notes/5.37.1.md

3 years agoAdd release-notes/5.37.1.md
Tim Otten [Tue, 11 May 2021 21:32:40 +0000 (14:32 -0700)]
Add release-notes/5.37.1.md

3 years agoMerge pull request #20286 from agh1/5.38.0-releasenotes-initial
Seamus Lee [Thu, 13 May 2021 21:03:30 +0000 (07:03 +1000)]
Merge pull request #20286 from agh1/5.38.0-releasenotes-initial

5.38.0 release notes initial run

3 years agoadd test enforcing automatic chaining for financial type/account create
demeritcowboy [Thu, 13 May 2021 20:22:57 +0000 (16:22 -0400)]
add test enforcing automatic chaining for financial type/account create

3 years ago5.38.0 release notes: added boilerplate
Andrew Hunt [Thu, 13 May 2021 19:05:13 +0000 (15:05 -0400)]
5.38.0 release notes: added boilerplate

3 years ago5.38.0 release notes: raw from script
Andrew Hunt [Thu, 13 May 2021 19:00:30 +0000 (15:00 -0400)]
5.38.0 release notes: raw from script

3 years agoAfform GUI - Scroll fieldset into view when selecting entity
Coleman Watts [Wed, 12 May 2021 23:43:59 +0000 (19:43 -0400)]
Afform GUI - Scroll fieldset into view when selecting entity

3 years agoAfform - improve drag-n-drop UI
Coleman Watts [Wed, 12 May 2021 18:19:03 +0000 (14:19 -0400)]
Afform - improve drag-n-drop UI

Fixes a number of issues with drag-n-drop on the Afform GUI palette & canvas.
Forces panels to take up full vertical space so palette never scrolls offscreen.
Compresses tabs above palette to save space.

3 years agoMerge pull request #20077 from eileenmcnaughton/mem_order
Monish Deb [Thu, 13 May 2021 15:20:00 +0000 (20:50 +0530)]
Merge pull request #20077 from eileenmcnaughton/mem_order

Use order api when creating a recurring membership from the Membershi…

3 years agoMerge pull request #20259 from agileware/CIVICRM-1734
demeritcowboy [Thu, 13 May 2021 13:18:03 +0000 (09:18 -0400)]
Merge pull request #20259 from agileware/CIVICRM-1734

Change the help text for Message Templates and Scheduled Reminders to include link to CiviCRM Token Documentation page

3 years agoAfform Gui - Add support for entityRef fields
Coleman Watts [Tue, 4 May 2021 20:58:51 +0000 (16:58 -0400)]
Afform Gui - Add support for entityRef fields

Adds a widget for EntityRef and allows it to be changed to Number (for entering ID)
or Select (for choosing another entity on a form).

3 years agoMerge pull request #20284 from civicrm/5.38
Seamus Lee [Thu, 13 May 2021 10:00:09 +0000 (20:00 +1000)]
Merge pull request #20284 from civicrm/5.38

5.38

3 years agoMerge pull request #20264 from colemanw/afformJoinSaveFix
Seamus Lee [Thu, 13 May 2021 08:28:05 +0000 (18:28 +1000)]
Merge pull request #20264 from colemanw/afformJoinSaveFix

Afform - Fix saving joined entities (email, address, phone, etc)

3 years agoMerge pull request #20283 from colemanw/afformEnabledEntities
Seamus Lee [Thu, 13 May 2021 08:26:27 +0000 (18:26 +1000)]
Merge pull request #20283 from colemanw/afformEnabledEntities

Afform - hide disabled contact types & entities from disabled components/extensions

3 years agoAfform - hide disabled contact types & entities from disabled components/extensions
Coleman Watts [Thu, 13 May 2021 04:07:01 +0000 (00:07 -0400)]
Afform - hide disabled contact types & entities from disabled components/extensions

3 years agoMerge pull request #20280 from civicrm/5.38
Seamus Lee [Thu, 13 May 2021 00:22:13 +0000 (10:22 +1000)]
Merge pull request #20280 from civicrm/5.38

5.38

3 years agoAfform - Fix saving joined entities (email, address, phone, etc)
Coleman Watts [Mon, 10 May 2021 15:18:16 +0000 (11:18 -0400)]
Afform - Fix saving joined entities (email, address, phone, etc)

3 years agoMerge pull request #20276 from demeritcowboy/help-pre
Seamus Lee [Thu, 13 May 2021 00:03:41 +0000 (10:03 +1000)]
Merge pull request #20276 from demeritcowboy/help-pre

Typo when retrieving help_pre textarea attributes for price field

3 years agoMerge pull request #20208 from seamuslee001/move_acl_test_trait
Eileen McNaughton [Wed, 12 May 2021 23:57:37 +0000 (11:57 +1200)]
Merge pull request #20208 from seamuslee001/move_acl_test_trait

[REF] Move ACLPermission Trait into Civi Folder so that it can be acc…

3 years agoMerge pull request #20277 from eileenmcnaughton/538
Seamus Lee [Wed, 12 May 2021 22:52:43 +0000 (08:52 +1000)]
Merge pull request #20277 from eileenmcnaughton/538

Fix money formatting opps

3 years agoMerge pull request #20275 from demeritcowboy/big-c
Eileen McNaughton [Wed, 12 May 2021 19:40:30 +0000 (07:40 +1200)]
Merge pull request #20275 from demeritcowboy/big-c

dev/core#2606 - Typo in rowCount variable in pager

3 years agoFix money formatting opps
Eileen McNaughton [Wed, 12 May 2021 19:34:44 +0000 (07:34 +1200)]
Fix money formatting opps

As Matt points out we regressed this when adding 2 decimal places

https://github.com/civicrm/civicrm-core/commit/78b338e07464becd1555a2c7d2d04ac0e4e9180c#diff-3d2a990f0b1960f0b3e6671c645e18033883e6d1eaf535b8d19d085b67dde00bR1171

3 years agoletter needs to be bigger
demeritcowboy [Wed, 12 May 2021 14:18:00 +0000 (10:18 -0400)]
letter needs to be bigger

3 years agoancient latin
demeritcowboy [Wed, 12 May 2021 14:14:51 +0000 (10:14 -0400)]
ancient latin

3 years agoMerge pull request #20270 from demeritcowboy/relative
Eileen McNaughton [Wed, 12 May 2021 04:51:27 +0000 (16:51 +1200)]
Merge pull request #20270 from demeritcowboy/relative

dev/core#2590 - Remove unused function CRM_Utils_File::relativeDirectory

3 years agoMerge pull request #20263 from colemanw/afformDragFix
Seamus Lee [Wed, 12 May 2021 03:26:50 +0000 (13:26 +1000)]
Merge pull request #20263 from colemanw/afformDragFix

Afform - Drag & drop fixes

3 years agoMerge pull request #20271 from totten/5.38ormaster-perm-cleanup
Eileen McNaughton [Wed, 12 May 2021 03:17:36 +0000 (15:17 +1200)]
Merge pull request #20271 from totten/5.38ormaster-perm-cleanup

(REF) dev/core#2601 - Cleanup stale parameter

3 years agoMerge pull request #20258 from eileenmcnaughton/tear
Eileen McNaughton [Wed, 12 May 2021 03:16:44 +0000 (15:16 +1200)]
Merge pull request #20258 from eileenmcnaughton/tear

[NFC] Test - Improve tearDown cleanup of domain contacts