civicrm-core.git
4 years agoMerge pull request #17293 from agh1/sr-wrenches
colemanw [Tue, 12 May 2020 22:15:03 +0000 (18:15 -0400)]
Merge pull request #17293 from agh1/sr-wrenches

Screen reader text for wrenches

4 years agoMerge pull request #17294 from agh1/sr-rel-perms
colemanw [Tue, 12 May 2020 22:08:37 +0000 (18:08 -0400)]
Merge pull request #17294 from agh1/sr-rel-perms

sr-only text for relationship permissions

4 years agoUpdate CRM/Core/Form/Renderer.php
Andrew Hunt [Tue, 12 May 2020 13:58:48 +0000 (09:58 -0400)]
Update CRM/Core/Form/Renderer.php

Adopting @colemanw's suggestion since it's more of a concern that the label be blank than undefined.

Co-authored-by: colemanw <coleman@civicrm.org>
4 years agoMerge pull request #17301 from eileenmcnaughton/recur
colemanw [Tue, 12 May 2020 13:37:21 +0000 (09:37 -0400)]
Merge pull request #17301 from eileenmcnaughton/recur

dev/core#1728 Ensure that custom fields that extend specified financi…

4 years agoMerge pull request #17302 from eileenmcnaughton/mem
colemanw [Tue, 12 May 2020 13:36:36 +0000 (09:36 -0400)]
Merge pull request #17302 from eileenmcnaughton/mem

[REF] Minor tidy up

4 years agoMerge pull request #17246 from agh1/review-contrib
colemanw [Tue, 12 May 2020 12:51:10 +0000 (08:51 -0400)]
Merge pull request #17246 from agh1/review-contrib

Proceeding to confirmation page should be a "next" button not a check

4 years ago[REF] Minor tidy up
eileen [Tue, 12 May 2020 07:30:04 +0000 (19:30 +1200)]
[REF] Minor tidy up

Removes a few old constructs like the value() function

4 years agoAlternate to #17156
eileen [Tue, 12 May 2020 07:11:37 +0000 (19:11 +1200)]
Alternate to #17156

4 years agoMerge pull request #17299 from eileenmcnaughton/recur
Seamus Lee [Tue, 12 May 2020 05:44:24 +0000 (15:44 +1000)]
Merge pull request #17299 from eileenmcnaughton/recur

Add ContributionRecur crud api

4 years agoMerge pull request #17295 from agh1/fa-more
colemanw [Tue, 12 May 2020 02:46:33 +0000 (22:46 -0400)]
Merge pull request #17295 from agh1/fa-more

Replaced more> icon with Font Awesome

4 years agoAdd ContributionRecur crud api
eileen [Tue, 12 May 2020 01:58:53 +0000 (13:58 +1200)]
Add ContributionRecur crud api

4 years agoMerge pull request #17289 from agh1/icon-title-escape
colemanw [Tue, 12 May 2020 00:00:29 +0000 (20:00 -0400)]
Merge pull request #17289 from agh1/icon-title-escape

Icon helper: replace quotes in html title.

4 years agoReplaced more> icon with Font Awesome
Andrew Hunt [Sat, 9 May 2020 02:58:41 +0000 (22:58 -0400)]
Replaced more> icon with Font Awesome

4 years agosr-only text for relationship permissions
Andrew Hunt [Sat, 9 May 2020 00:07:56 +0000 (20:07 -0400)]
sr-only text for relationship permissions

4 years agosr-only text for wrenches
Andrew Hunt [Fri, 8 May 2020 23:15:48 +0000 (19:15 -0400)]
sr-only text for wrenches

4 years agoProceeding to confirmation page should be a "next" button not a check
Andrew Hunt [Mon, 11 May 2020 23:03:20 +0000 (19:03 -0400)]
Proceeding to confirmation page should be a "next" button not a check

4 years agoMerge pull request #17273 from mattwire/phpnoticeisoverride
Yashodha Chaku [Mon, 11 May 2020 15:21:21 +0000 (20:51 +0530)]
Merge pull request #17273 from mattwire/phpnoticeisoverride

Fix PHP notice when is_override is not set

4 years agoMerge pull request #16967 from wmortada/wp#46-2
Matthew Wire [Mon, 11 May 2020 14:38:31 +0000 (15:38 +0100)]
Merge pull request #16967 from wmortada/wp#46-2

dev/wp#46 - Fix overlarge select2 elements in WordPress 5.3+

4 years agoIcon helper: replace quotes in html title.
Andrew Hunt [Mon, 11 May 2020 13:40:25 +0000 (09:40 -0400)]
Icon helper: replace quotes in html title.

4 years agoMerge pull request #17284 from agh1/admin-console-only
Matthew Wire [Mon, 11 May 2020 09:39:27 +0000 (10:39 +0100)]
Merge pull request #17284 from agh1/admin-console-only

Simplify admin console and remove superfluous icons

4 years agoFix PHP notice when is_override is not set
Matthew Wire [Sun, 10 May 2020 10:44:01 +0000 (11:44 +0100)]
Fix PHP notice when is_override is not set

4 years agoMerge pull request #17283 from agh1/stop-icon-png
Matthew Wire [Mon, 11 May 2020 09:22:03 +0000 (10:22 +0100)]
Merge pull request #17283 from agh1/stop-icon-png

Replace stop-icon.png with fa-ban over a relevant icon for privacy

4 years agoMerge pull request #17286 from seamuslee001/contribution_id_search_metadata
Matthew Wire [Mon, 11 May 2020 09:21:48 +0000 (10:21 +0100)]
Merge pull request #17286 from seamuslee001/contribution_id_search_metadata

[REF] Add contribution_id field to search using metadata instead of h…

4 years agoMerge pull request #17280 from agh1/copy-png
Matthew Wire [Mon, 11 May 2020 09:21:03 +0000 (10:21 +0100)]
Merge pull request #17280 from agh1/copy-png

Replace all instances of copy.png with font awesome

4 years agoMerge pull request #17279 from agh1/check-gif
Matthew Wire [Mon, 11 May 2020 09:20:42 +0000 (10:20 +0100)]
Merge pull request #17279 from agh1/check-gif

Remove most uses of check.gif

4 years ago[REF] Add contribution_id field to search using metadata instead of hard codeded...
Seamus Lee [Sun, 10 May 2020 22:18:10 +0000 (08:18 +1000)]
[REF] Add contribution_id field to search using metadata instead of hard codeded quickform html

4 years agoMerge pull request #17275 from mattwire/mailingbackend
Seamus Lee [Sun, 10 May 2020 21:12:23 +0000 (07:12 +1000)]
Merge pull request #17275 from mattwire/mailingbackend

NFC Change hardcoded ID to constant

4 years agoMerge pull request #17281 from agh1/geotag-16-png
colemanw [Sun, 10 May 2020 20:17:53 +0000 (16:17 -0400)]
Merge pull request #17281 from agh1/geotag-16-png

Replace geotag_16.png with fa-map-marker

4 years agoAdmin console: remove superfluous code and don't hard-code sections
Andrew Hunt [Sat, 9 May 2020 03:37:50 +0000 (23:37 -0400)]
Admin console: remove superfluous code and don't hard-code sections

4 years agoAdmin console: remove old version and icons
Andrew Hunt [Thu, 7 May 2020 20:25:17 +0000 (16:25 -0400)]
Admin console: remove old version and icons

4 years agoAdmin console: produced much simpler version
Andrew Hunt [Thu, 7 May 2020 14:48:12 +0000 (10:48 -0400)]
Admin console: produced much simpler version

4 years agoReplace stop-icon.png with fa-ban over a relevant icon for privacy
Andrew Hunt [Thu, 7 May 2020 19:27:32 +0000 (15:27 -0400)]
Replace stop-icon.png with fa-ban over a relevant icon for privacy

4 years agoReplace geotag_16.png with fa-map-marker
Andrew Hunt [Thu, 7 May 2020 17:36:20 +0000 (13:36 -0400)]
Replace geotag_16.png with fa-map-marker

4 years agoReplace all instances of copy.png with font awesome
Andrew Hunt [Thu, 7 May 2020 17:29:27 +0000 (13:29 -0400)]
Replace all instances of copy.png with font awesome

4 years agoReplace all instances of check.gif appearing in listings
Andrew Hunt [Thu, 7 May 2020 16:51:42 +0000 (12:51 -0400)]
Replace all instances of check.gif appearing in listings

4 years agoCiviMail compose: replace check.gif with Font Awesome icons
Andrew Hunt [Thu, 7 May 2020 15:46:15 +0000 (11:46 -0400)]
CiviMail compose: replace check.gif with Font Awesome icons

4 years agoHardcoded ID to constant
Matthew Wire [Sun, 10 May 2020 10:56:53 +0000 (11:56 +0100)]
Hardcoded ID to constant

4 years agoMerge pull request #16484 from yashodha/dev_1580
Matthew Wire [Sun, 10 May 2020 10:33:38 +0000 (11:33 +0100)]
Merge pull request #16484 from yashodha/dev_1580

(dev/core#1580) Allow to search on contribution id

4 years agoMerge pull request #17067 from colemanw/importSubmit
Matthew Wire [Sun, 10 May 2020 10:28:00 +0000 (11:28 +0100)]
Merge pull request #17067 from colemanw/importSubmit

dev/user-interface#17 Fix popup confirmation on import forms

4 years agoMerge pull request #17072 from eileenmcnaughton/dupe
Matthew Wire [Sun, 10 May 2020 10:26:33 +0000 (11:26 +0100)]
Merge pull request #17072 from eileenmcnaughton/dupe

Merge code - remove UPDATE IGNORE+Delete & just use reliable update

4 years agoMerge pull request #17079 from yashodha/dev-1704
Matthew Wire [Sun, 10 May 2020 10:25:09 +0000 (11:25 +0100)]
Merge pull request #17079 from yashodha/dev-1704

respect file fields that have been configured as view only in profiles

4 years agoMerge pull request #17260 from demeritcowboy/csv-apostrophe
Matthew Wire [Sun, 10 May 2020 10:22:43 +0000 (11:22 +0100)]
Merge pull request #17260 from demeritcowboy/csv-apostrophe

dev/core#1743 - Fix decoding of apostrophes in csv export from CiviReports

4 years agoMerge pull request #17245 from agh1/chevrons
Matthew Wire [Sun, 10 May 2020 10:17:01 +0000 (11:17 +0100)]
Merge pull request #17245 from agh1/chevrons

Decorative chevrons should be icons not angle quotes

4 years agoMerge pull request #17257 from colemanw/tagParam
Matthew Wire [Sun, 10 May 2020 10:12:42 +0000 (11:12 +0100)]
Merge pull request #17257 from colemanw/tagParam

Tag create: respect created_date and created_id params

4 years agoMerge pull request #17268 from colemanw/getBAOClassName
Matthew Wire [Sun, 10 May 2020 10:11:02 +0000 (11:11 +0100)]
Merge pull request #17268 from colemanw/getBAOClassName

Add getBAOClassName utiltiy function

4 years agoMerge pull request #17269 from greenpeace-cee/simplify-length-test
Matthew Wire [Sun, 10 May 2020 10:10:03 +0000 (11:10 +0100)]
Merge pull request #17269 from greenpeace-cee/simplify-length-test

CRM/Logging - Remove obsolete cache static clear in test

4 years agoMerge pull request #17267 from eileenmcnaughton/bag
Matthew Wire [Sun, 10 May 2020 10:09:36 +0000 (11:09 +0100)]
Merge pull request #17267 from eileenmcnaughton/bag

Add propertyBag handling for getEmail when incoming uses email-5

4 years agoMerge pull request #17270 from totten/master-regtest
colemanw [Sat, 9 May 2020 13:06:04 +0000 (09:06 -0400)]
Merge pull request #17270 from totten/master-regtest

(NFC) RegionTest - Small cleanups

4 years ago(NFC) RegionTest - Small cleanups
Tim Otten [Sat, 9 May 2020 02:40:08 +0000 (19:40 -0700)]
(NFC) RegionTest - Small cleanups

4 years agoCRM/Logging - Remove obsolete cache static clear in test
Patrick Figel [Sat, 9 May 2020 02:20:22 +0000 (04:20 +0200)]
CRM/Logging - Remove obsolete cache static clear in test

This simplifies CRM_Logging_SchemaTest::testLengthChange() and
CRM_Logging_SchemaTest::testEnumChange() by removing a manual reset on
a cache static and a second call to
CRM_Logging_Schema::fixSchemaDifferences(). This was made obsolete by
a40a5a4875bf5caa03eaa8732c958f5c714c7b61, which has added a cache flush
to fixSchemaDifferences() via fixSchemaDifferencesForAll().

4 years agoAdd getBAOClassName utiltiy function
Coleman Watts [Sat, 9 May 2020 01:30:46 +0000 (21:30 -0400)]
Add getBAOClassName utiltiy function

4 years agoAdd propertyBag handling for getEmail when incoming uses email-5
eileen [Sat, 9 May 2020 00:11:15 +0000 (12:11 +1200)]
Add propertyBag handling for getEmail when incoming uses email-5

Calling code is often setting email-5. The property bag should iron out this inconsistency, and getEmail (and similar)
should handle the appended billing id. We can't do this in the static property map as it is a calculated variable

4 years agoMerge pull request #17263 from civicrm/5.26
Seamus Lee [Fri, 8 May 2020 22:47:02 +0000 (08:47 +1000)]
Merge pull request #17263 from civicrm/5.26

5.26

4 years agoMerge pull request #17264 from colemanw/grantCleanup
Seamus Lee [Fri, 8 May 2020 22:33:03 +0000 (08:33 +1000)]
Merge pull request #17264 from colemanw/grantCleanup

[REF] Grant BAO cleanup

4 years agoMerge pull request #17255 from agh1/sr-only
Tim Otten [Fri, 8 May 2020 21:37:56 +0000 (14:37 -0700)]
Merge pull request #17255 from agh1/sr-only

[NFC] Add sr-only class for content only for screen readers

4 years agoGrant BAO cleanup
Coleman Watts [Fri, 8 May 2020 14:11:14 +0000 (10:11 -0400)]
Grant BAO cleanup

4 years agoTag create cleanup: respect created_date and created_id params
Coleman Watts [Thu, 7 May 2020 21:11:19 +0000 (17:11 -0400)]
Tag create cleanup: respect created_date and created_id params

4 years agoMerge pull request #17262 from totten/5.26-test-sql-op
Seamus Lee [Fri, 8 May 2020 11:05:52 +0000 (21:05 +1000)]
Merge pull request #17262 from totten/5.26-test-sql-op

SyntaxConformanceTest::testSqlOperators - Fix failure on MySQL 8

4 years agoMerge pull request #17183 from eileenmcnaughton/tax_t
Seamus Lee [Fri, 8 May 2020 08:46:51 +0000 (18:46 +1000)]
Merge pull request #17183 from eileenmcnaughton/tax_t

Remove incorrect retrievals of tax-term setting

4 years agoSyntaxConformanceTest::testSqlOperators - Fix failure on MySQL 8
Tim Otten [Fri, 8 May 2020 03:53:21 +0000 (20:53 -0700)]
SyntaxConformanceTest::testSqlOperators - Fix failure on MySQL 8

Before
------

`SyntaxConformanceTest::testSqlOperators` frequently fails on the `Dedupe` entity when running on MySQL 8 (`bknix-edge`).

After
------

`SyntaxConformanceTest::testSqlOperators` repeatedly passes for all entities on my copy of MySQL 8 (`bknix-edge`).

Technical Details
-----------------

The `testSqlOperators` creates a small pool of example records
(`$entities`), then it slices/dices that pool with a few SQL operators and
asserts the number of matches.

In particular:

```php
$this->callAPISuccessGetCount($entityName, ['id' => ['>' => $entities[0]]], $totalEntities - 1);
```

The problem is that `$entities[0]` does not necessarily have the lowest ID
-- because `$entities` was not fetched in any particular order.  The default
ordering is *often* the same as the `id`, but not always.

I suspect that this problem manifests most frequently with the `Dedupe`
entity because the underlying table (`civicrm_prevnext_cache`) is highly
volatile (many writes+deletes) -- thus it's more likely to reuse old storage
slots for new rows.

4 years agoSet version to 5.27.alpha1
CiviCRM [Fri, 8 May 2020 02:45:28 +0000 (02:45 +0000)]
Set version to 5.27.alpha1

4 years agoSet version to 5.26.beta1
CiviCRM [Fri, 8 May 2020 02:35:13 +0000 (02:35 +0000)]
Set version to 5.26.beta1

4 years agoMerge pull request #17227 from eileenmcnaughton/workflow_name
Tim Otten [Fri, 8 May 2020 01:39:21 +0000 (18:39 -0700)]
Merge pull request #17227 from eileenmcnaughton/workflow_name

Add workflow_name column to civicrm_msg_template, deprecate workflow_id

4 years agoMerge pull request #17258 from demeritcowboy/fix-getfromto-workaround
Seamus Lee [Thu, 7 May 2020 23:39:14 +0000 (09:39 +1000)]
Merge pull request #17258 from demeritcowboy/fix-getfromto-workaround

[NFC/Test] - Fix typo in `if` statement that seems intended as a workaround

4 years agofix decoding of apostrophes
demeritcowboy [Thu, 7 May 2020 21:12:59 +0000 (17:12 -0400)]
fix decoding of apostrophes

4 years agoChevrons in civimail steps replaced
Andrew Hunt [Thu, 7 May 2020 22:25:52 +0000 (18:25 -0400)]
Chevrons in civimail steps replaced

4 years agofix typo in workaround
demeritcowboy [Thu, 7 May 2020 21:14:21 +0000 (17:14 -0400)]
fix typo in workaround

4 years agoMessageTemplate API - Keep the workflow_id and workflow_name sync'd
Tim Otten [Thu, 7 May 2020 09:21:07 +0000 (02:21 -0700)]
MessageTemplate API - Keep the workflow_id and workflow_name sync'd

4 years ago[NFC] Add sr-only class for content only for screen readers
Andrew Hunt [Thu, 7 May 2020 14:59:00 +0000 (10:59 -0400)]
[NFC] Add sr-only class for content only for screen readers

4 years agoMerge pull request #17252 from civicrm/5.25
Seamus Lee [Thu, 7 May 2020 09:28:42 +0000 (19:28 +1000)]
Merge pull request #17252 from civicrm/5.25

5.25

4 years agosql/civicrm_generated.mysql - Update with current message template schema
Tim Otten [Thu, 7 May 2020 07:34:15 +0000 (00:34 -0700)]
sql/civicrm_generated.mysql - Update with current message template schema

4 years agoAdd workflow_name column to civicrm_msg_template, deprecate workflow_id
eileen [Mon, 4 May 2020 00:49:48 +0000 (12:49 +1200)]
Add workflow_name column to civicrm_msg_template, deprecate workflow_id

4 years agoMerge pull request #17251 from totten/master-hooktest
Tim Otten [Thu, 7 May 2020 06:08:55 +0000 (23:08 -0700)]
Merge pull request #17251 from totten/master-hooktest

E2E_Core_HookTest - Fix test failure due to leak

4 years agoMerge pull request #17249 from totten/5.25-backdrop-install
Seamus Lee [Thu, 7 May 2020 05:43:30 +0000 (15:43 +1000)]
Merge pull request #17249 from totten/5.25-backdrop-install

install/index.php - Fix leak which breaks compatibility with current Backdrop

4 years agoE2E_Core_HookTest - Fix test failure due to leak
Tim Otten [Thu, 7 May 2020 04:51:10 +0000 (21:51 -0700)]
E2E_Core_HookTest - Fix test failure due to leak

Before
------

The `HookTest` class fails when running on WordPress.

The event-listener from `testSymfonyListener_names` leaks and remains active during `testSymfonyListener_int`.

After
-----

The `HookTest` class passes when running on WordPress.

The event-listeners from `testSymfonyListener_names` and `testSymfonyListener_int` are cleaned up.

4 years agoUpdate release-notes/5.25.0.md
Tim Otten [Thu, 7 May 2020 04:25:53 +0000 (21:25 -0700)]
Update release-notes/5.25.0.md

4 years agoinstall/index.php - Fix leak which breaks compatibility with current Backdrop
Tim Otten [Thu, 7 May 2020 04:13:22 +0000 (21:13 -0700)]
install/index.php - Fix leak which breaks compatibility with current Backdrop

4 years agoMerge pull request #17248 from seamuslee001/master
Seamus Lee [Thu, 7 May 2020 03:57:07 +0000 (13:57 +1000)]
Merge pull request #17248 from seamuslee001/master

5.25

4 years agoMerge in 5.25
Seamus Lee [Thu, 7 May 2020 03:55:55 +0000 (13:55 +1000)]
Merge in 5.25

4 years agoMerge pull request #17247 from totten/5.25-finalize
Tim Otten [Thu, 7 May 2020 03:39:38 +0000 (20:39 -0700)]
Merge pull request #17247 from totten/5.25-finalize

5.25.0 - Small finalizations

4 years agoSet version to 5.25.0
Tim Otten [Thu, 7 May 2020 03:29:09 +0000 (20:29 -0700)]
Set version to 5.25.0

4 years agorelease-notes/5.25.0.md - Small copy edits
Tim Otten [Thu, 7 May 2020 03:21:40 +0000 (20:21 -0700)]
release-notes/5.25.0.md - Small copy edits

4 years agoFinal chunk of chevrons replaced
Andrew Hunt [Wed, 6 May 2020 23:45:19 +0000 (19:45 -0400)]
Final chunk of chevrons replaced

4 years agoFinished replacing the bulk of right angle quotes for links and buttons
Andrew Hunt [Wed, 6 May 2020 23:30:09 +0000 (19:30 -0400)]
Finished replacing the bulk of right angle quotes for links and buttons

4 years agoMerge pull request #17243 from civicrm/5.25
Seamus Lee [Wed, 6 May 2020 23:04:14 +0000 (09:04 +1000)]
Merge pull request #17243 from civicrm/5.25

5.25

4 years agoFirst round of replacing `&raquo;` with chevron icon
Andrew Hunt [Wed, 6 May 2020 22:16:39 +0000 (18:16 -0400)]
First round of replacing `&raquo;` with chevron icon

4 years agoMerge pull request #17238 from seamuslee001/dev_core_1739
Seamus Lee [Wed, 6 May 2020 22:05:52 +0000 (08:05 +1000)]
Merge pull request #17238 from seamuslee001/dev_core_1739

dev/core#1739 Enable Longitude on Address editing by default (option 12)

4 years agoMerge pull request #17242 from agh1/5.25.0-releasenotes-final
Seamus Lee [Wed, 6 May 2020 21:25:02 +0000 (07:25 +1000)]
Merge pull request #17242 from agh1/5.25.0-releasenotes-final

5.25.0 release notes final edits

4 years ago5.25.0 release notes: final edits
Andrew Hunt [Wed, 6 May 2020 17:57:29 +0000 (13:57 -0400)]
5.25.0 release notes: final edits

4 years agoMerge pull request #17241 from agh1/apiv4-access-civicrm-or-ajax-api
colemanw [Wed, 6 May 2020 17:10:43 +0000 (13:10 -0400)]
Merge pull request #17241 from agh1/apiv4-access-civicrm-or-ajax-api

Api4 AJAX endpoint: allow either access CiviCRM or access AJAX API

4 years agoApi4 AJAX endpoint: allow either access CiviCRM or access AJAX API
Andrew Hunt [Wed, 6 May 2020 16:01:52 +0000 (12:01 -0400)]
Api4 AJAX endpoint: allow either access CiviCRM or access AJAX API

4 years ago5.25.0 release notes: halfway through final edits
Andrew Hunt [Wed, 6 May 2020 16:00:02 +0000 (12:00 -0400)]
5.25.0 release notes: halfway through final edits

4 years agoMerge pull request #17239 from colemanw/fixSchemaMap
colemanw [Wed, 6 May 2020 15:27:14 +0000 (11:27 -0400)]
Merge pull request #17239 from colemanw/fixSchemaMap

APIv4 - Fix schema map to use canonical field names

4 years ago5.25.0 release notes: added late changes
Andrew Hunt [Wed, 6 May 2020 14:56:38 +0000 (10:56 -0400)]
5.25.0 release notes: added late changes

4 years agoMerge pull request #17240 from totten/master-event-names
Matthew Wire [Wed, 6 May 2020 08:09:44 +0000 (09:09 +0100)]
Merge pull request #17240 from totten/master-event-names

(REF) dev/core#1744 - Cleanup event naming

4 years agodev/core#1744 - Civi/API - Simplify event naming
Tim Otten [Wed, 6 May 2020 02:37:40 +0000 (19:37 -0700)]
dev/core#1744 - Civi/API - Simplify event naming

4 years agodev/core#1744 - SystemInstallEvent - Simplify event naming
Tim Otten [Wed, 6 May 2020 02:21:59 +0000 (19:21 -0700)]
dev/core#1744 - SystemInstallEvent - Simplify event naming

4 years agodev/core#1744 - ActionSchedule - Simplify event naming
Tim Otten [Wed, 6 May 2020 02:17:03 +0000 (19:17 -0700)]
dev/core#1744 - ActionSchedule - Simplify event naming

4 years agodev/core#1744 - Civi/Token - Simplify event naming
Tim Otten [Wed, 6 May 2020 02:12:53 +0000 (19:12 -0700)]
dev/core#1744 - Civi/Token - Simplify event naming

4 years agoMerge pull request #17236 from civicrm/5.25
Eileen McNaughton [Wed, 6 May 2020 00:51:42 +0000 (12:51 +1200)]
Merge pull request #17236 from civicrm/5.25

5.25