civicrm-core.git
12 months agoMerge pull request #28568 from eileenmcnaughton/dao_more
colemanw [Fri, 8 Dec 2023 15:14:57 +0000 (10:14 -0500)]
Merge pull request #28568 from eileenmcnaughton/dao_more

Improve 3 way fallback of name,title, frontend_title

12 months agoMerge pull request #28473 from vingle/a11y-accordions-ext
colemanw [Fri, 8 Dec 2023 14:52:50 +0000 (09:52 -0500)]
Merge pull request #28473 from vingle/a11y-accordions-ext

Applies accessible accordion to extension table

12 months agoMerge pull request #28577 from colemanw/delGetLinks
colemanw [Fri, 8 Dec 2023 14:45:15 +0000 (09:45 -0500)]
Merge pull request #28577 from colemanw/delGetLinks

APIv4 - Delete unused Entity::getLinks action

12 months agoSet version to 5.70.alpha1
CiviCRM [Fri, 8 Dec 2023 13:38:24 +0000 (13:38 +0000)]
Set version to 5.70.alpha1

12 months agoSet version to 5.69.beta1
CiviCRM [Fri, 8 Dec 2023 13:38:12 +0000 (13:38 +0000)]
Set version to 5.69.beta1

12 months agoAPIv4 - Delete unused Entity::getLinks action
colemanw [Fri, 8 Dec 2023 02:04:05 +0000 (21:04 -0500)]
APIv4 - Delete unused Entity::getLinks action

This api action was never used outside core, and has been deprecated for a year and a half.

12 months agoMerge pull request #28555 from eileenmcnaughton/meta
colemanw [Fri, 8 Dec 2023 12:41:42 +0000 (07:41 -0500)]
Merge pull request #28555 from eileenmcnaughton/meta

Copy functions back from metadata trait to only caller

12 months agoImprove 3 way fallback of name,title, frontend_title
Eileen McNaughton [Thu, 7 Dec 2023 19:26:58 +0000 (08:26 +1300)]
Improve 3 way fallback of name,title, frontend_title

12 months agoMerge pull request #28575 from seamuslee001/dev_core_4833
Eileen McNaughton [Fri, 8 Dec 2023 04:53:12 +0000 (17:53 +1300)]
Merge pull request #28575 from seamuslee001/dev_core_4833

dev/core#4833 Add unit test for legacy invoice number format

12 months agoMerge pull request #28395 from eileenmcnaughton/membership_new
Eileen McNaughton [Fri, 8 Dec 2023 04:18:11 +0000 (17:18 +1300)]
Merge pull request #28395 from eileenmcnaughton/membership_new

dev/core#4826 Attempt at adding is_new to membership status

12 months agoMerge pull request #28301 from ixiam/dev/core#4796
demeritcowboy [Fri, 8 Dec 2023 04:15:59 +0000 (23:15 -0500)]
Merge pull request #28301 from ixiam/dev/core#4796

dev/core#4796 - Fix Cancel button on the "unsubscribe mailing"

12 months agoFix is_new sql in MembershipStatus
colemanw [Thu, 7 Dec 2023 22:00:00 +0000 (17:00 -0500)]
Fix is_new sql in MembershipStatus

12 months agoMerge pull request #28570 from eileenmcnaughton/label
Eileen McNaughton [Fri, 8 Dec 2023 03:27:46 +0000 (16:27 +1300)]
Merge pull request #28570 from eileenmcnaughton/label

Remove unused variable

12 months agoMerge pull request #28573 from eileenmcnaughton/import_ss
colemanw [Fri, 8 Dec 2023 02:05:41 +0000 (21:05 -0500)]
Merge pull request #28573 from eileenmcnaughton/import_ss

Fix duplicate instance of Spreadsheet import class

12 months agoMerge pull request #28571 from eileenmcnaughton/unused
demeritcowboy [Fri, 8 Dec 2023 01:59:31 +0000 (20:59 -0500)]
Merge pull request #28571 from eileenmcnaughton/unused

Remove unused variable

12 months agoMerge pull request #28572 from eileenmcnaughton/unused_2
demeritcowboy [Fri, 8 Dec 2023 01:45:53 +0000 (20:45 -0500)]
Merge pull request #28572 from eileenmcnaughton/unused_2

remove unused variable

12 months agoMerge pull request #28576 from eileenmcnaughton/noticey
demeritcowboy [Fri, 8 Dec 2023 01:41:45 +0000 (20:41 -0500)]
Merge pull request #28576 from eileenmcnaughton/noticey

Do not suppress appropriate notices

12 months agoremoves repeated font-size from light-accordion class
Nicol [Fri, 8 Dec 2023 01:08:29 +0000 (01:08 +0000)]
removes repeated font-size from light-accordion class

12 months agoMerge branch 'civicrm:master' into a11y-accordions-ext
Nicol [Fri, 8 Dec 2023 01:02:59 +0000 (01:02 +0000)]
Merge branch 'civicrm:master' into a11y-accordions-ext

12 months agoDo not suppress appropriate notices
Eileen McNaughton [Fri, 8 Dec 2023 00:12:42 +0000 (13:12 +1300)]
Do not suppress appropriate notices

If getVar is used to get a non-existent property then emitting
a notice is the right behaviour

12 months agoMerge pull request #28474 from twomice/4833_x_invoice_num_alphanumeric
Seamus Lee [Thu, 7 Dec 2023 23:50:58 +0000 (10:50 +1100)]
Merge pull request #28474 from twomice/4833_x_invoice_num_alphanumeric

POC: toward dev/core#4833: this does fix the problem.

12 months agoMerge pull request #28521 from eileenmcnaughton/smarty_warn
Eileen McNaughton [Thu, 7 Dec 2023 23:42:17 +0000 (12:42 +1300)]
Merge pull request #28521 from eileenmcnaughton/smarty_warn

Add system check encouraging Smarty3

12 months agodev/core#4833 Add unit test for legacy invoice number format
Seamus Lee [Thu, 7 Dec 2023 23:11:52 +0000 (10:11 +1100)]
dev/core#4833 Add unit test for legacy invoice number format

12 months agoFix duplicate instance of Spreadsheet import class
Eileen McNaughton [Thu, 7 Dec 2023 20:23:09 +0000 (09:23 +1300)]
Fix duplicate instance of Spreadsheet import class

When I revisited this code & prepared for PR I thought I had lost the Spreadsheet class,
not realising I put it in the civiimport - this consolidates the 2 versions into
the extension.

Note that I am on the fence on whether this should be in the extension
or with the others, reflected in the fact I put it in 2 different places on
2 different occasions. I got some support for the extension on chat
so consolidated there
https://chat.civicrm.org/civicrm/pl/xfp4cytepir7jk7axis7aftqye

12 months agoremove unused variable
Eileen McNaughton [Thu, 7 Dec 2023 19:45:15 +0000 (08:45 +1300)]
remove unused variable

12 months agoRemove unused variable
Eileen McNaughton [Thu, 7 Dec 2023 19:42:56 +0000 (08:42 +1300)]
Remove unused variable

12 months agoRemove unused variable
Eileen McNaughton [Thu, 7 Dec 2023 19:38:38 +0000 (08:38 +1300)]
Remove unused variable

12 months agoMerge pull request #28484 from 19ATF72/mailing-searchkit-afform
Eileen McNaughton [Thu, 7 Dec 2023 19:09:10 +0000 (08:09 +1300)]
Merge pull request #28484 from 19ATF72/mailing-searchkit-afform

Add searchkit and afform display

12 months agoTweak Smarty messaging
Tim Otten [Thu, 7 Dec 2023 17:25:29 +0000 (17:25 +0000)]
Tweak Smarty messaging

12 months agoReset <summary> font size in tables to inherit from table
Nicol [Thu, 7 Dec 2023 18:45:24 +0000 (18:45 +0000)]
Reset <summary> font size in tables to inherit from table

12 months agoMerge branch 'civicrm:master' into a11y-accordions-ext
Nicol [Thu, 7 Dec 2023 18:40:42 +0000 (18:40 +0000)]
Merge branch 'civicrm:master' into a11y-accordions-ext

12 months agoMerge pull request #28563 from artfulrobot/artfulrobot-fix-docblock
Rich Lott [Thu, 7 Dec 2023 18:39:40 +0000 (18:39 +0000)]
Merge pull request #28563 from artfulrobot/artfulrobot-fix-docblock

Fix docblock for loadUser()

12 months agoFix docblock for loadUser - parameter is a string
Rich Lott / Artful Robot [Thu, 7 Dec 2023 16:34:05 +0000 (16:34 +0000)]
Fix docblock for loadUser - parameter is a string

The dockblock says the user is an object, but it seems all implementations
provide a string, some adding explicit declarations as a string.

12 months agoFix for dev/core#4833: Old-style Authorize.net ARB webhooks failing on x_invoice_num...
Allen Shaw [Mon, 4 Dec 2023 18:38:23 +0000 (12:38 -0600)]
Fix for dev/core#4833: Old-style Authorize.net ARB webhooks failing on x_invoice_num mismatch.

12 months agoMerge pull request #28561 from kcristiano/wputfix
Matthew Wire [Thu, 7 Dec 2023 15:43:37 +0000 (15:43 +0000)]
Merge pull request #28561 from kcristiano/wputfix

add Query to AssetBuilder test to fix WP E2E test failures

12 months agoMerge pull request #28562 from vinay-osseed/typo-fixes
Matthew Wire [Thu, 7 Dec 2023 15:42:26 +0000 (15:42 +0000)]
Merge pull request #28562 from vinay-osseed/typo-fixes

[NFC] Fix typo in `Localization.tpl` file.

12 months agoMerge pull request #28538 from mattwire/ufmatch
colemanw [Thu, 7 Dec 2023 15:36:29 +0000 (10:36 -0500)]
Merge pull request #28538 from mattwire/ufmatch

Add unique constraint on ufmatch user ID+domain ID

12 months agoAdd unique constraint on ufmatch user ID
Matthew Wire [Wed, 6 Dec 2023 12:14:22 +0000 (12:14 +0000)]
Add unique constraint on ufmatch user ID

12 months agotypo fix in `Localization.tpl` file.
vinay-osseed [Thu, 7 Dec 2023 14:06:24 +0000 (19:36 +0530)]
typo fix in `Localization.tpl` file.

12 months agoAdds details/summary to 'add new' extensions page
Nicol [Thu, 7 Dec 2023 13:52:57 +0000 (13:52 +0000)]
Adds details/summary to 'add new' extensions page

12 months agoMerge branch 'civicrm:master' into a11y-accordions-ext
Nicol [Thu, 7 Dec 2023 13:50:54 +0000 (13:50 +0000)]
Merge branch 'civicrm:master' into a11y-accordions-ext

12 months agoMerge pull request #28532 from wmortada/standalone-user-delete
Rich Lott [Thu, 7 Dec 2023 11:40:42 +0000 (11:40 +0000)]
Merge pull request #28532 from wmortada/standalone-user-delete

Standalone - prevent users from deleting own user

12 months agoStandalone - prevent users from deleting own user
William Mortada [Wed, 6 Dec 2023 00:12:51 +0000 (00:12 +0000)]
Standalone - prevent users from deleting own user

12 months agoadd Query to AssetBuilder test to fix WP failures
Kevin Cristiano [Thu, 7 Dec 2023 11:36:55 +0000 (11:36 +0000)]
add Query to AssetBuilder test to fix WP failures

Signed-off-by: Kevin Cristiano <kcristiano@kcristiano.com>
12 months agoMerge pull request #28471 from artfulrobot/artfulrobot-cleanup-standalone-tpls
Rich Lott [Thu, 7 Dec 2023 09:27:04 +0000 (09:27 +0000)]
Merge pull request #28471 from artfulrobot/artfulrobot-cleanup-standalone-tpls

Standalone: clean up styling on login/reset password

12 months agostandalone: clean up styling on login/reset password
Rich Lott / Artful Robot [Mon, 4 Dec 2023 15:12:00 +0000 (15:12 +0000)]
standalone: clean up styling on login/reset password

12 months agoMerge pull request #28552 from eileenmcnaughton/uf_group_dao
Matthew Wire [Thu, 7 Dec 2023 08:07:53 +0000 (08:07 +0000)]
Merge pull request #28552 from eileenmcnaughton/uf_group_dao

Fix UFGroup add to call writeRecord

12 months agoMerge pull request #28554 from eileenmcnaughton/map_field
demeritcowboy [Thu, 7 Dec 2023 05:59:28 +0000 (00:59 -0500)]
Merge pull request #28554 from eileenmcnaughton/map_field

Fix test to not do weird form-trait sharing thing

12 months agoCopy functions back from metadata trait to only caller
Eileen McNaughton [Thu, 7 Dec 2023 03:16:46 +0000 (16:16 +1300)]
Copy functions back from metadata trait to only caller

Part of decommissioning the trait

12 months agoFix test to not do weird form-trait sharing thing
Eileen McNaughton [Thu, 7 Dec 2023 03:10:14 +0000 (16:10 +1300)]
Fix test to not do weird form-trait sharing thing

12 months agoMerge pull request #28551 from totten/master-regen
Tim Otten [Thu, 7 Dec 2023 00:22:16 +0000 (00:22 +0000)]
Merge pull request #28551 from totten/master-regen

Regen

12 months agoMerge pull request #28543 from vingle/patch-15
Eileen McNaughton [Wed, 6 Dec 2023 23:36:31 +0000 (12:36 +1300)]
Merge pull request #28543 from vingle/patch-15

Fixes Advanced Search regression in #28418

12 months agoMerge pull request #28496 from eileenmcnaughton/master_import
Tim Otten [Wed, 6 Dec 2023 23:27:57 +0000 (23:27 +0000)]
Merge pull request #28496 from eileenmcnaughton/master_import

dev/core#4447 fix inability to import to master_id

12 months agoFix UFGroup add to call writeRecord
Eileen McNaughton [Wed, 6 Dec 2023 23:18:19 +0000 (12:18 +1300)]
Fix UFGroup add to call writeRecord

12 months agoRegen
Tim Otten [Wed, 6 Dec 2023 23:16:51 +0000 (23:16 +0000)]
Regen

12 months agoMerge pull request #28546 from aydun/searchui_labelformats
Matthew Wire [Wed, 6 Dec 2023 21:56:41 +0000 (21:56 +0000)]
Merge pull request #28546 from aydun/searchui_labelformats

SearchUI - Updates to Label Format display

12 months agoMerge pull request #28541 from vingle/accordion-css
Rich Lott [Wed, 6 Dec 2023 21:51:17 +0000 (21:51 +0000)]
Merge pull request #28541 from vingle/accordion-css

Accordions css – tidies up / bug fixes / simplifies theming / adds two utility classes

12 months agoMerge pull request #28495 from eileenmcnaughton/import
Matthew Wire [Wed, 6 Dec 2023 21:48:06 +0000 (21:48 +0000)]
Merge pull request #28495 from eileenmcnaughton/import

Add support for spreadsheet format in imports

12 months agoMerge pull request #28548 from civicrm/5.68
Seamus Lee [Wed, 6 Dec 2023 21:46:24 +0000 (08:46 +1100)]
Merge pull request #28548 from civicrm/5.68

5.68

12 months agoMerge pull request #27107 from kurund/afform-email-confirmation
Matthew Wire [Wed, 6 Dec 2023 21:43:59 +0000 (21:43 +0000)]
Merge pull request #27107 from kurund/afform-email-confirmation

dev/core#4232 Afform: Allow manual processing of submission

12 months agoremoves change to common.js
Nicol [Wed, 6 Dec 2023 21:30:34 +0000 (21:30 +0000)]
removes change to common.js

12 months agoMerge branch 'civicrm:master' into patch-15
Nicol [Wed, 6 Dec 2023 21:29:26 +0000 (21:29 +0000)]
Merge branch 'civicrm:master' into patch-15

12 months agoTest-notice-fix
Eileen McNaughton [Wed, 6 Dec 2023 03:27:49 +0000 (16:27 +1300)]
Test-notice-fix

12 months agoAdapt test to still have 2 same-address & 1 different address contacts
Eileen McNaughton [Wed, 6 Dec 2023 03:01:23 +0000 (16:01 +1300)]
Adapt test to still have 2 same-address & 1 different address contacts

The BAO change meant the 2 addresses that were meant to be different,
but were shared, became the same, so I had to tweak the test
data to create the 2 same & 1 different scenario

12 months agodev/core#4447 fix inability to import to master_id
Eileen McNaughton [Tue, 5 Dec 2023 06:25:39 +0000 (19:25 +1300)]
dev/core#4447 fix inability to import to master_id

12 months agoMerge pull request #28497 from eileenmcnaughton/pledge
Eileen McNaughton [Wed, 6 Dec 2023 21:12:09 +0000 (10:12 +1300)]
Merge pull request #28497 from eileenmcnaughton/pledge

Sample data fixes for contribution pages

12 months agoRestores 'active' display script function that was lost during <details> conversion
Nicol [Wed, 6 Dec 2023 21:03:33 +0000 (21:03 +0000)]
Restores 'active' display script function that was lost during <details> conversion

12 months agoTightens targeting of AccordionToggle JS
Nicol [Wed, 6 Dec 2023 21:01:58 +0000 (21:01 +0000)]
Tightens targeting of AccordionToggle JS

12 months agoTargets the crmAccordionToggle more tightly
Nicol [Wed, 6 Dec 2023 21:00:30 +0000 (21:00 +0000)]
Targets the crmAccordionToggle more tightly

So as to not hide the <details> content.

12 months agoMerge branch 'civicrm:master' into patch-15
Nicol [Wed, 6 Dec 2023 20:59:31 +0000 (20:59 +0000)]
Merge branch 'civicrm:master' into patch-15

12 months agoMerge pull request #28547 from alifrumin/5.68rnlate
Seamus Lee [Wed, 6 Dec 2023 20:53:17 +0000 (07:53 +1100)]
Merge pull request #28547 from alifrumin/5.68rnlate

[NFC] 5.68 release note late changes

12 months agoMerge pull request #28504 from yashodha/report-fixess
Eileen McNaughton [Wed, 6 Dec 2023 20:26:14 +0000 (09:26 +1300)]
Merge pull request #28504 from yashodha/report-fixess

Add filter on archived in Mailing Summary report

12 months agoMerge pull request #28545 from aydun/labelformat_metadata
Eileen McNaughton [Wed, 6 Dec 2023 20:25:13 +0000 (09:25 +1300)]
Merge pull request #28545 from aydun/labelformat_metadata

Munge paths for labelFormats

12 months agoOpens first three regions
Nicol [Wed, 6 Dec 2023 20:18:57 +0000 (20:18 +0000)]
Opens first three regions

Matches behavior of old Advanced Search.

12 months agoKeeps main Advanced Searchd details always open
Nicol [Wed, 6 Dec 2023 20:10:30 +0000 (20:10 +0000)]
Keeps main Advanced Searchd details always open

12 months agoMerge branch 'civicrm:master' into patch-15
Nicol [Wed, 6 Dec 2023 20:09:14 +0000 (20:09 +0000)]
Merge branch 'civicrm:master' into patch-15

12 months agoMerge pull request #28544 from aydun/premiums_metadata
Eileen McNaughton [Wed, 6 Dec 2023 20:03:09 +0000 (09:03 +1300)]
Merge pull request #28544 from aydun/premiums_metadata

Premiums metadata

12 months agoMerge pull request #28534 from pradpnayak/mappingseaechkit
Eileen McNaughton [Wed, 6 Dec 2023 20:02:39 +0000 (09:02 +1300)]
Merge pull request #28534 from pradpnayak/mappingseaechkit

Use the action definded in DAO for Mapping

12 months ago[NFC] 5.68 release note late changes
Alice Frumin [Wed, 6 Dec 2023 19:54:55 +0000 (14:54 -0500)]
[NFC] 5.68 release note late changes

12 months agoUpdates to Label Format display
Aidan Saunders [Wed, 6 Dec 2023 19:03:04 +0000 (19:03 +0000)]
Updates to Label Format display

12 months agoMunge paths for labelFormats
Aidan Saunders [Wed, 6 Dec 2023 18:21:03 +0000 (18:21 +0000)]
Munge paths for labelFormats

12 months agoRemoves accordion body border when there shouldn't be one
Nicol [Wed, 6 Dec 2023 18:17:27 +0000 (18:17 +0000)]
Removes accordion body border when there shouldn't be one

Civi has two styles of accordions: with a border around it and without. This commit removes a third style – a border around half which isn't intentional and is a byproduct of the new html.

12 months agoMerge pull request #28468 from jaapjansma/timezone
demeritcowboy [Wed, 6 Dec 2023 18:07:29 +0000 (13:07 -0500)]
Merge pull request #28468 from jaapjansma/timezone

dev/core#4410: fixed timezone support for standalone

12 months agoMerge pull request #28513 from wyde22/newuiLabelFormat-dewy
Aidan Saunders [Wed, 6 Dec 2023 18:06:15 +0000 (18:06 +0000)]
Merge pull request #28513 from wyde22/newuiLabelFormat-dewy

searchui : new screen label format

12 months agoMerge branch 'civicrm:master' into accordion-css
Nicol [Wed, 6 Dec 2023 18:05:09 +0000 (18:05 +0000)]
Merge branch 'civicrm:master' into accordion-css

12 months agoRegen
Aidan Saunders [Wed, 6 Dec 2023 17:25:20 +0000 (17:25 +0000)]
Regen

12 months agoPath mangling for managePremiums
Aidan Saunders [Wed, 6 Dec 2023 17:24:07 +0000 (17:24 +0000)]
Path mangling for managePremiums

12 months agoFixes UI regression in #28418
Nicol [Wed, 6 Dec 2023 17:36:52 +0000 (17:36 +0000)]
Fixes UI regression in #28418

Some advanced search accordion regions have a close button on the right – clicking this 'deactivites' the region from the search, and with the recent changes it also makes the expanded region hidden.

This removes the line of JS responsible for that.

12 months agocontact token test fixes
Kurund Jalmi [Wed, 6 Dec 2023 16:06:58 +0000 (16:06 +0000)]
contact token test fixes

12 months agoMerge pull request #28525 from totten/master-pw-rst
Tim Otten [Wed, 6 Dec 2023 15:44:14 +0000 (15:44 +0000)]
Merge pull request #28525 from totten/master-pw-rst

standaloneusers - Fix tokens+docblocks for "Password reset" email

12 months agomanagetest fixes
Kurund Jalmi [Wed, 6 Dec 2023 15:33:37 +0000 (15:33 +0000)]
managetest fixes

12 months agoJenkins error fixes
Nicol [Wed, 6 Dec 2023 15:22:45 +0000 (15:22 +0000)]
Jenkins error fixes

'superfluous spaces'

12 months agoaccordion css fixes
Nicol [Wed, 6 Dec 2023 14:31:02 +0000 (14:31 +0000)]
accordion css fixes

Removes double icon from safari, simple nested accordion handling.

12 months agoAdds utility class: .crm-accordion-light
Nicol [Wed, 6 Dec 2023 14:10:29 +0000 (14:10 +0000)]
Adds utility class: .crm-accordion-light

A style to match Civi's transparent background, non-bold accordion header.

Commit also adds hover states and comments.

12 months agoAdds hover state for accordion-bold
Nicol [Wed, 6 Dec 2023 14:02:06 +0000 (14:02 +0000)]
Adds hover state for accordion-bold

12 months agoAdds utility class: .crm-accordion-bold
Nicol [Wed, 6 Dec 2023 13:57:44 +0000 (13:57 +0000)]
Adds utility class: .crm-accordion-bold

This allows new details/summary elements to be styled the same as the colour-bg crm-accordion-wrapper style. It also fixes a minor issue with border-radius changing on expand/collapse.

12 months agoApplies theme expand/close icon to details/summary
Nicol [Wed, 6 Dec 2023 13:23:59 +0000 (13:23 +0000)]
Applies theme expand/close icon to details/summary

Details/summary has a browser-generated expand/close caret. This PR restores Greenwich's FontAwesome caret/triangle - and provides the class names themers would need to include to make their choice of expand/close icons & animations apply to details/summary.

12 months agotypo
Nicol [Wed, 6 Dec 2023 12:40:56 +0000 (12:40 +0000)]
typo

12 months agoMerge branch 'civicrm:master' into a11y-accordions-ext
Nicol [Wed, 6 Dec 2023 12:40:08 +0000 (12:40 +0000)]
Merge branch 'civicrm:master' into a11y-accordions-ext

12 months agoMerge pull request #28528 from wmortada/standalone-users
Matthew Wire [Wed, 6 Dec 2023 12:11:41 +0000 (12:11 +0000)]
Merge pull request #28528 from wmortada/standalone-users

Standalone - Improve administer user screen