Nicol [Wed, 6 Dec 2023 18:05:09 +0000 (18:05 +0000)]
Merge branch 'civicrm:master' into accordion-css
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
Nicol [Wed, 6 Dec 2023 15:22:45 +0000 (15:22 +0000)]
Jenkins error fixes
'superfluous spaces'
Nicol [Wed, 6 Dec 2023 14:31:02 +0000 (14:31 +0000)]
accordion css fixes
Removes double icon from safari, simple nested accordion handling.
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.
Nicol [Wed, 6 Dec 2023 14:02:06 +0000 (14:02 +0000)]
Adds hover state for 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.
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.
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
Tim Otten [Tue, 5 Dec 2023 22:20:27 +0000 (22:20 +0000)]
standaloneusers - Fix tokens+docblocks for password-reset email
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
Eileen McNaughton [Wed, 6 Dec 2023 03:27:49 +0000 (16:27 +1300)]
Test-notice-fix
Eileen McNaughton [Wed, 6 Dec 2023 01:38:31 +0000 (14:38 +1300)]
Merge pull request #28531 from civicrm/5.68
5.68
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
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
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
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
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
Matthew Wire [Wed, 6 Dec 2023 00:26:33 +0000 (00:26 +0000)]
Merge pull request #28493 from eileenmcnaughton/invoice
Consolidate invoice determination
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
Matthew Wire [Wed, 6 Dec 2023 00:25:28 +0000 (00:25 +0000)]
Merge pull request #28483 from pradpnayak/dateprefAfform
Added DatePreference admin UI
Matthew Wire [Wed, 6 Dec 2023 00:24:38 +0000 (00:24 +0000)]
Merge pull request #28482 from pradpnayak/datePrefAPI
Adding PreferencesDate API
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
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
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
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
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
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
Matthew Wire [Wed, 6 Dec 2023 00:07:39 +0000 (00:07 +0000)]
Merge pull request #28396 from colemanw/contactTypeSearchSegments
SearchKit - Fix Search Segments for contact type entities
Matthew Wire [Wed, 6 Dec 2023 00:06:05 +0000 (00:06 +0000)]
Merge pull request #28438 from colemanw/civiGrantCleanup
Civi grant cleanup
Matthew Wire [Wed, 6 Dec 2023 00:04:24 +0000 (00:04 +0000)]
Merge pull request #28515 from MegaphoneJon/sk-undefined-array-key
SearchKit: Don't assume a comparison value when none exists
Seamus Lee [Wed, 6 Dec 2023 00:03:14 +0000 (11:03 +1100)]
Merge pull request #28524 from totten/master-exception
TemplateTrait - Fix references to CRM_Core_Exception
Seamus Lee [Wed, 6 Dec 2023 00:02:54 +0000 (11:02 +1100)]
Merge pull request #28522 from totten/5.68-msgtpl
(dev/core#4839) WorkflowMessage - Send email. Don't overwrite $to.
Seamus Lee [Tue, 5 Dec 2023 23:39:12 +0000 (10:39 +1100)]
Merge pull request #28526 from 19ATF72/mailing-component-edit-page-link
Fix ID retrieval for MailingComponent edit page
Seamus Lee [Tue, 5 Dec 2023 23:36:04 +0000 (10:36 +1100)]
Merge pull request #28472 from 19ATF72/mailing-component-searchkit
Add MailingComponent.php
William Mortada [Tue, 5 Dec 2023 23:01:04 +0000 (23:01 +0000)]
Standalone - Improve administer user screen
19ATF72 [Tue, 5 Dec 2023 22:38:07 +0000 (14:38 -0800)]
Fix ID retrieval for MailingComponent edit page
colemanw [Tue, 5 Dec 2023 22:40:20 +0000 (22:40 +0000)]
Merge pull request #28500 from pradpnayak/urlChange
Changed the URL path for DatePreference screen
Tim Otten [Tue, 5 Dec 2023 22:21:19 +0000 (22:21 +0000)]
TemplateTrait - Fix references to CRM_Core_Exception
There are a few places where this class throws exceptions. It's quite uncommon. But if it happens, then it won't work right.
Tim Otten [Tue, 5 Dec 2023 21:56:15 +0000 (21:56 +0000)]
(dev/core#4839) WorkflowMessage - Send email. Don't overwrite $to.
Rich Lott [Tue, 5 Dec 2023 21:46:06 +0000 (21:46 +0000)]
Merge pull request #28441 from vingle/a11y-accordions-ang
Applies accessible accordion to SearchKit, adds fallbacks
Eileen McNaughton [Tue, 5 Dec 2023 20:33:31 +0000 (09:33 +1300)]
Merge pull request #28490 from mattwire/dorefund
Clarify doRefund() signature
Eileen McNaughton [Tue, 5 Dec 2023 20:29:05 +0000 (09:29 +1300)]
Merge pull request #28516 from demeritcowboy/regen
Regen
Matthew Wire [Tue, 5 Dec 2023 18:38:19 +0000 (18:38 +0000)]
Merge pull request #28452 from colemanw/autocompleteValues
APIv4 - Pass form values to autocomplete field
Matthew Wire [Tue, 5 Dec 2023 00:19:36 +0000 (00:19 +0000)]
Clarify doRefund() signature
colemanw [Tue, 5 Dec 2023 17:11:11 +0000 (17:11 +0000)]
Merge pull request #28510 from pradpnayak/providerapi
Add SMS provider API 4 Support
demeritcowboy [Tue, 5 Dec 2023 17:05:23 +0000 (12:05 -0500)]
regen
Rich Lott [Tue, 5 Dec 2023 16:42:38 +0000 (16:42 +0000)]
Merge pull request #28507 from artfulrobot/artfulrobot-e2e-errortest-1
Standalone: fix e2e error message test(s)
demeritcowboy [Tue, 5 Dec 2023 16:33:59 +0000 (11:33 -0500)]
Merge pull request #27162 from eileenmcnaughton/text
Add userEnteredText as generic workflow template smarty variable
Jon Goldberg [Tue, 5 Dec 2023 16:33:53 +0000 (11:33 -0500)]
SearchKit: Don't assume a comparison value when none exists
Pradeep Nayak [Tue, 5 Dec 2023 14:32:46 +0000 (14:32 +0000)]
Added Export Mapping search kit UI
Pradeep Nayak [Mon, 4 Dec 2023 21:02:38 +0000 (21:02 +0000)]
Added DatePreference admin UI
colemanw [Tue, 5 Dec 2023 15:34:26 +0000 (15:34 +0000)]
Merge pull request #28499 from ufundo/afform-json-php
convert .aff.json to .aff.php and add ts()
Pradeep Nayak [Tue, 5 Dec 2023 14:44:22 +0000 (14:44 +0000)]
Add SMS provider API 4 Support
Rich Lott / Artful Robot [Tue, 5 Dec 2023 14:15:19 +0000 (14:15 +0000)]
standalone: fix test, cleanup unnecessary javascript
Pradeep Nayak [Tue, 5 Dec 2023 14:19:28 +0000 (14:19 +0000)]
make Mapping entity available on searchkit
Tim Otten [Tue, 5 Dec 2023 13:48:50 +0000 (13:48 +0000)]
Merge pull request #28475 from artfulrobot/artfulrobot-testPaths_getUrl-fix
standalone: fix failing E2E test due to getting resource base URL
Rich Lott / Artful Robot [Mon, 4 Dec 2023 18:54:39 +0000 (18:54 +0000)]
standalone: fix failing E2E test due to getting resource base URL
Fixes E2E\Core\PathUrlTest::testPaths_getUrl
19ATF72 [Tue, 5 Dec 2023 12:24:08 +0000 (12:24 +0000)]
Update ext/civi_mail/Civi/Api4/MailingComponent.php
Co-authored-by: colemanw <coleman@civicrm.org>
Rich Lott [Tue, 5 Dec 2023 12:16:44 +0000 (12:16 +0000)]
Merge pull request #28478 from wmortada/standalone-fields
Standalone - Make active field required and labelled enabled
19ATF72 [Tue, 5 Dec 2023 11:53:10 +0000 (03:53 -0800)]
Fix string parameter being passed non string variable
benjamin [Tue, 5 Dec 2023 10:45:08 +0000 (10:45 +0000)]
convert .aff.json to .aff.php and add ts()
Pradeep Nayak [Tue, 5 Dec 2023 11:16:25 +0000 (11:16 +0000)]
Changed the URL path for DatePreference screen
Pradeep Nayak [Mon, 4 Dec 2023 20:55:46 +0000 (20:55 +0000)]
Adding PreferencesDate API
Eileen McNaughton [Tue, 5 Dec 2023 09:14:46 +0000 (22:14 +1300)]
Merge pull request #28494 from eileenmcnaughton/crazy_param
Cleanup return on processContact
Eileen McNaughton [Tue, 5 Dec 2023 04:26:35 +0000 (17:26 +1300)]
Cleanup return on processContact
Eileen McNaughton [Tue, 5 Dec 2023 08:20:14 +0000 (21:20 +1300)]
Remove notice from main donate page
auto_renew is added to the form after allowAutoRenewMembership is assigned, and only if it
is true - so the check for cj('auto_renew') is not enhanced by the check for the variable
- but it DOES lead to notices on the other pages
Eileen McNaughton [Tue, 5 Dec 2023 02:54:03 +0000 (15:54 +1300)]
Consolidate invoice determination
Eileen McNaughton [Tue, 5 Dec 2023 02:08:09 +0000 (15:08 +1300)]
Update CustomField default_value to NULL instead of '' for floats
Eileen McNaughton [Tue, 5 Dec 2023 00:03:38 +0000 (13:03 +1300)]
Partial standardisation of MembershipType::Add
Eileen McNaughton [Mon, 4 Dec 2023 23:29:40 +0000 (12:29 +1300)]
Add a warning about price fields where non_deductible amount potentially misconfigured
Eileen McNaughton [Mon, 4 Dec 2023 22:32:52 +0000 (11:32 +1300)]
Merge pull request #28486 from 19ATF72/contributor-update
Update contributor-key.yml
Eileen McNaughton [Mon, 4 Dec 2023 21:41:26 +0000 (10:41 +1300)]
Merge pull request #28398 from MegaphoneJon/better-ajax-error-handling
ensure exception class supports getErrorData
19ATF72 [Mon, 4 Dec 2023 21:38:33 +0000 (21:38 +0000)]
Update contributor-key.yml
Eileen McNaughton [Mon, 4 Dec 2023 21:15:00 +0000 (10:15 +1300)]
Add deprecation to transition components
Deprecate transitionComponents
Tim Otten [Mon, 4 Dec 2023 21:09:31 +0000 (21:09 +0000)]
Merge pull request #28425 from demeritcowboy/lang-eco
Update language download during install to use existing folder if present
Eileen McNaughton [Mon, 4 Dec 2023 20:01:24 +0000 (09:01 +1300)]
Stop passing unused invoiceID to doPayment
Matthew Wire [Mon, 4 Dec 2023 20:59:14 +0000 (20:59 +0000)]
Merge pull request #26227 from eileenmcnaughton/payment
Use payment create rather than transitionComponents
Eileen McNaughton [Mon, 4 Dec 2023 01:00:37 +0000 (14:00 +1300)]
Clean up payment create
William Mortada [Sun, 3 Dec 2023 12:05:07 +0000 (12:05 +0000)]
Make active flag required and labelled enabled
19ATF72 [Mon, 4 Dec 2023 19:24:12 +0000 (11:24 -0800)]
Add MailingComponent.php
Jon Goldberg [Fri, 1 Dec 2023 20:11:17 +0000 (15:11 -0500)]
ensure this exception class supports getErrorData
Rich Lott [Mon, 4 Dec 2023 18:46:24 +0000 (18:46 +0000)]
Merge pull request #28419 from ufundo/standalone-url-test
Standalone PathUrlTest
colemanw [Mon, 4 Dec 2023 18:08:21 +0000 (18:08 +0000)]
Merge pull request #28470 from demeritcowboy/not4
Use buttons instead of buttons, but only when not 4, but also if it's 4
benjamin [Sat, 2 Dec 2023 15:54:21 +0000 (15:54 +0000)]
test Standalone urls (use drupal format)
benjamin [Sat, 2 Dec 2023 15:53:43 +0000 (15:53 +0000)]
pat => pattern
benjamin [Mon, 4 Dec 2023 17:11:26 +0000 (17:11 +0000)]
typo in joomla path
colemanw [Mon, 4 Dec 2023 16:15:07 +0000 (16:15 +0000)]
Merge pull request #28449 from vingle/a11y-fbuilder
Applies accessible accordion to FormBuilder's 'collapsible' output
Matthew Wire [Mon, 4 Dec 2023 14:57:28 +0000 (14:57 +0000)]
Merge pull request #28469 from jaapjansma/language_clean_up
dev/core#4411: follow up PR of the language pr, this cleans up an unused functions
Matthew Wire [Mon, 4 Dec 2023 14:56:48 +0000 (14:56 +0000)]
Merge pull request #28463 from eileenmcnaughton/processAmount
Add warnings to processAmount
Matthew Wire [Mon, 4 Dec 2023 14:53:26 +0000 (14:53 +0000)]
Merge pull request #28459 from eileenmcnaughton/deprecate
Stop using & deprectate `getSalesTaxTerm`
Matthew Wire [Mon, 4 Dec 2023 14:52:32 +0000 (14:52 +0000)]
Merge pull request #28461 from eileenmcnaughton/add_payment
Fix tests calling AdditionalPayment form to use full flow, add standard ID get functions
demeritcowboy [Mon, 4 Dec 2023 13:44:25 +0000 (08:44 -0500)]
Merge pull request #27496 from eileenmcnaughton/activity_view
Fix activity view bug where an activity type id in the url overrides …
demeritcowboy [Mon, 4 Dec 2023 05:37:45 +0000 (00:37 -0500)]
use buttons instead of buttons, but only when not 4, but also if it's 4
demeritcowboy [Mon, 4 Dec 2023 12:57:26 +0000 (07:57 -0500)]
Merge pull request #28462 from eileenmcnaughton/notice_mem
Notice fix in membership_online_receipt
Rich Lott [Mon, 4 Dec 2023 12:49:04 +0000 (12:49 +0000)]
Merge pull request #28448 from colemanw/summaryStyle
Greenwich - Fix styling of summary collapsible element
Jaap Jansma [Mon, 4 Dec 2023 12:24:23 +0000 (13:24 +0100)]
dev/core#4411: follow up PR of the language pr, this cleans up an unused function
Rich Lott [Mon, 4 Dec 2023 11:56:11 +0000 (11:56 +0000)]
Merge pull request #28420 from wmortada/standalone-roles2
Standalone - add name and delete en/disable actions for roles
colemanw [Mon, 4 Dec 2023 11:04:01 +0000 (11:04 +0000)]
FormBuilder - Use summary/details instead of af-collapsible
Rich Lott [Mon, 4 Dec 2023 11:19:14 +0000 (11:19 +0000)]
Merge pull request #28429 from wmortada/standalone-roles3
Standalone - remove role from users on deletion
projects / civicrm-core.git / log