civicrm-core.git
11 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

11 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

11 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

11 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

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

11 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

11 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

11 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

11 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

11 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

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

11 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

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

11 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

11 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

11 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

11 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

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

11 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.

11 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

11 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

11 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

11 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

11 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.

11 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

11 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

11 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

11 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

11 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

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

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

11 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.

11 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

11 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

11 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

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

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

11 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.

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

11 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

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

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

'superfluous spaces'

11 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.

11 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.

11 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

11 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.

11 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.

11 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

11 months agostandaloneusers - Fix tokens+docblocks for password-reset email
Tim Otten [Tue, 5 Dec 2023 22:20:27 +0000 (22:20 +0000)]
standaloneusers - Fix tokens+docblocks for password-reset email

11 months agoMerge pull request #28535 from eileenmcnaughton/master_test
Tim Otten [Wed, 6 Dec 2023 11:01:55 +0000 (11:01 +0000)]
Merge pull request #28535 from eileenmcnaughton/master_test

Test-notice-fix affecting all tests

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

11 months agoMerge pull request #28531 from civicrm/5.68
Eileen McNaughton [Wed, 6 Dec 2023 01:38:31 +0000 (14:38 +1300)]
Merge pull request #28531 from civicrm/5.68

5.68

11 months agoSample data fixes for contribution pages
Eileen McNaughton [Tue, 5 Dec 2023 07:30:45 +0000 (20:30 +1300)]
Sample data fixes for contribution pages

11 months agoMerge pull request #28387 from eileenmcnaughton/membership_block_save
Matthew Wire [Wed, 6 Dec 2023 00:30:42 +0000 (00:30 +0000)]
Merge pull request #28387 from eileenmcnaughton/membership_block_save

dev/core#3994 Update membership block on membership type save & remove the same from the Manage form

11 months agoMerge pull request #28344 from eileenmcnaughton/move_set
Matthew Wire [Wed, 6 Dec 2023 00:29:13 +0000 (00:29 +0000)]
Merge pull request #28344 from eileenmcnaughton/move_set

Move form specific code out of shared function

11 months agoMerge pull request #28388 from asmac-org/formbuilder-textarea-support-rows-cols
Matthew Wire [Wed, 6 Dec 2023 00:28:43 +0000 (00:28 +0000)]
Merge pull request #28388 from asmac-org/formbuilder-textarea-support-rows-cols

Formbuilder: support rows and columns values for Note (textarea) custom field type

11 months agoMerge pull request #28386 from eileenmcnaughton/membership_types
Matthew Wire [Wed, 6 Dec 2023 00:28:06 +0000 (00:28 +0000)]
Merge pull request #28386 from eileenmcnaughton/membership_types

Use apv4 rather than V3 for cached membershipTypes retrieval

11 months agoMerge pull request #28487 from eileenmcnaughton/price_notice
Matthew Wire [Wed, 6 Dec 2023 00:27:08 +0000 (00:27 +0000)]
Merge pull request #28487 from eileenmcnaughton/price_notice

dev/core#3083 Add a warning about price fields where non_deductible amount potentially misconfigured

11 months agoMerge pull request #28493 from eileenmcnaughton/invoice
Matthew Wire [Wed, 6 Dec 2023 00:26:33 +0000 (00:26 +0000)]
Merge pull request #28493 from eileenmcnaughton/invoice

Consolidate invoice determination

11 months agoMerge pull request #28491 from eileenmcnaughton/dep
Matthew Wire [Wed, 6 Dec 2023 00:26:08 +0000 (00:26 +0000)]
Merge pull request #28491 from eileenmcnaughton/dep

Update CustomField default_value to NULL instead of '' for floats

11 months agoMerge pull request #28483 from pradpnayak/dateprefAfform
Matthew Wire [Wed, 6 Dec 2023 00:25:28 +0000 (00:25 +0000)]
Merge pull request #28483 from pradpnayak/dateprefAfform

Added DatePreference admin UI

11 months agoUse the action definded in DAO for Mapping
Pradeep Nayak [Wed, 6 Dec 2023 00:25:02 +0000 (00:25 +0000)]
Use the action definded in DAO for Mapping

11 months agoMerge pull request #28482 from pradpnayak/datePrefAPI
Matthew Wire [Wed, 6 Dec 2023 00:24:38 +0000 (00:24 +0000)]
Merge pull request #28482 from pradpnayak/datePrefAPI

Adding PreferencesDate API

11 months agoMerge pull request #28479 from eileenmcnaughton/add_payment_more
Matthew Wire [Wed, 6 Dec 2023 00:23:52 +0000 (00:23 +0000)]
Merge pull request #28479 from eileenmcnaughton/add_payment_more

Clean up parameters in add payment form

11 months agolets make crmAutocomplete non mandatory
Kurund Jalmi [Tue, 5 Dec 2023 12:27:54 +0000 (12:27 +0000)]
lets make crmAutocomplete non mandatory

11 months agotest fixes
Kurund Jalmi [Wed, 25 Oct 2023 22:06:49 +0000 (23:06 +0100)]
test fixes

11 months agomove token definition to token list event
Kurund Jalmi [Thu, 12 Oct 2023 13:19:39 +0000 (14:19 +0100)]
move token definition to token list event

11 months agostyle fixes
Kurund Jalmi [Thu, 12 Oct 2023 12:30:35 +0000 (13:30 +0100)]
style fixes

11 months agogenerate frontend url
Kurund Jalmi [Thu, 12 Oct 2023 12:19:10 +0000 (13:19 +0100)]
generate frontend url

11 months agogenerate encrypted link for email verification; process submission if verified
Noah Miller [Thu, 12 Oct 2023 04:35:51 +0000 (00:35 -0400)]
generate encrypted link for email verification; process submission if verified

11 months agostyle fixes
Kurund Jalmi [Mon, 2 Oct 2023 12:42:17 +0000 (13:42 +0100)]
style fixes

11 months agomove process task to afform
Kurund Jalmi [Tue, 26 Sep 2023 14:27:42 +0000 (15:27 +0100)]
move process task to afform

11 months agoupdate class visibility
Kurund Jalmi [Mon, 25 Sep 2023 18:53:25 +0000 (19:53 +0100)]
update class visibility

11 months agotest fixes
Kurund Jalmi [Tue, 19 Sep 2023 16:34:44 +0000 (17:34 +0100)]
test fixes

11 months agotypo fixes
Kurund Jalmi [Mon, 18 Sep 2023 22:23:04 +0000 (23:23 +0100)]
typo fixes

11 months agoadd submission verification functionality
Kurund Jalmi [Sun, 17 Sep 2023 18:26:00 +0000 (19:26 +0100)]
add submission verification functionality

11 months agocode cleanup
Kurund Jalmi [Sun, 17 Sep 2023 17:26:04 +0000 (18:26 +0100)]
code cleanup

11 months agoadd email sending functionality
Kurund Jalmi [Fri, 15 Sep 2023 15:05:49 +0000 (16:05 +0100)]
add email sending functionality

11 months agoadd view submission link
Kurund Jalmi [Tue, 12 Sep 2023 13:36:00 +0000 (14:36 +0100)]
add view submission link

11 months agostyle fixes
Kurund Jalmi [Tue, 22 Aug 2023 19:41:21 +0000 (20:41 +0100)]
style fixes

11 months agoremove submit button in view mode. also add validation so to prevent user processing...
Kurund Jalmi [Tue, 22 Aug 2023 19:35:48 +0000 (20:35 +0100)]
remove submit button in view mode. also add validation so to prevent user processing the processed submission

11 months agochange the saving submitted values
Kurund Jalmi [Tue, 22 Aug 2023 16:50:08 +0000 (17:50 +0100)]
change the saving submitted values

11 months agostyling fixes
Kurund Jalmi [Mon, 21 Aug 2023 20:37:47 +0000 (21:37 +0100)]
styling fixes

11 months agoadd view submission link only for Pending submissions
Kurund Jalmi [Mon, 21 Aug 2023 20:27:52 +0000 (21:27 +0100)]
add view submission link only for Pending submissions

11 months agoprocess the form after viewing, strict check for valid submission
Kurund Jalmi [Mon, 21 Aug 2023 15:31:31 +0000 (16:31 +0100)]
process the form after viewing, strict check for valid submission

11 months agohelptext cleanup
Kurund Jalmi [Mon, 21 Aug 2023 14:53:02 +0000 (15:53 +0100)]
helptext cleanup

11 months agoadd message template meta data and option to select email template
Kurund Jalmi [Mon, 21 Aug 2023 14:44:40 +0000 (15:44 +0100)]
add message template meta data and option to select email template

11 months agoadd manual processing option
Kurund Jalmi [Mon, 21 Aug 2023 13:51:25 +0000 (14:51 +0100)]
add manual processing option

11 months agoupdate submission SK
Kurund Jalmi [Fri, 18 Aug 2023 12:51:59 +0000 (13:51 +0100)]
update submission SK

11 months agoload the data from submission tableif submission id is passed
Kurund Jalmi [Fri, 18 Aug 2023 12:17:02 +0000 (13:17 +0100)]
load the data from submission tableif submission id is passed

11 months agoadd batch action for processing submissions
Kurund Jalmi [Tue, 15 Aug 2023 14:32:17 +0000 (15:32 +0100)]
add batch action for processing submissions

11 months agoadd new process api to fetch the data from submissions and save to various tables...
Kurund Jalmi [Mon, 14 Aug 2023 16:34:05 +0000 (17:34 +0100)]
add new process api to fetch the data from submissions and save to various tables in Civi

11 months agoupdate packaged SK for form submissions
Kurund Jalmi [Fri, 11 Aug 2023 13:13:16 +0000 (14:13 +0100)]
update packaged SK for form submissions

11 months agolets not process data if email confirmation is enabled.
Kurund Jalmi [Fri, 11 Aug 2023 12:34:59 +0000 (13:34 +0100)]
lets not process data if email confirmation is enabled.

11 months agoadd email verification flag in the UI and API
Kurund Jalmi [Fri, 11 Aug 2023 12:04:22 +0000 (13:04 +0100)]
add email verification flag in the UI and API

11 months agoMerge pull request #28485 from eileenmcnaughton/transaction
Matthew Wire [Wed, 6 Dec 2023 00:23:25 +0000 (00:23 +0000)]
Merge pull request #28485 from eileenmcnaughton/transaction

Add deprecation to transition components

11 months agoMerge pull request #28489 from eileenmcnaughton/membership_type_write
Matthew Wire [Wed, 6 Dec 2023 00:22:20 +0000 (00:22 +0000)]
Merge pull request #28489 from eileenmcnaughton/membership_type_write

Partial standardisation of MembershipType::Add

11 months agoMerge pull request #28498 from eileenmcnaughton/main_notice_
Matthew Wire [Wed, 6 Dec 2023 00:12:41 +0000 (00:12 +0000)]
Merge pull request #28498 from eileenmcnaughton/main_notice_

Remove notice from main donate page

11 months agoMerge pull request #28509 from pradpnayak/mappingseaechkit
Matthew Wire [Wed, 6 Dec 2023 00:11:05 +0000 (00:11 +0000)]
Merge pull request #28509 from pradpnayak/mappingseaechkit

Added Export Mapping search kit UI

11 months agoMerge pull request #28508 from pradpnayak/mappingseaech
Matthew Wire [Wed, 6 Dec 2023 00:10:12 +0000 (00:10 +0000)]
Merge pull request #28508 from pradpnayak/mappingseaech

make Mapping entity available on searchkit