-
Notifications
You must be signed in to change notification settings - Fork 645
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '5.0' into feature/acc-360-when-zooming-text-to-200-in-c…
…ollapsed-navigation-mode # Conflicts: # src/web/assets/cp/dist/css/cp.css # src/web/assets/cp/dist/css/cp.css.map
- Loading branch information
Showing
127 changed files
with
2,001 additions
and
792 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,41 @@ | ||
| blank_issues_enabled: false | ||
| contact_links: | ||
| - name: Feature Request | ||
| url: https://github.com/craftcms/cms/discussions/new?category=ideas | ||
| about: Start a new discussion about your idea | ||
| - name: Documentation | ||
| url: https://docs.craftcms.com/ | ||
| url: https://craftcms.com/docs | ||
| about: Read the official documentation | ||
| - name: Knowledge Base | ||
| url: https://craftcms.com/knowledge-base | ||
| about: Find answers to common problems | ||
| about: Find official answers to common problems | ||
| - name: Developer Support Services | ||
| url: https://craftcms.com/support-services | ||
| about: Priority developer support from the team that makes Craft | ||
| - name: Craft Discord | ||
| url: https://craftcms.com/discord | ||
| about: Meet the community | ||
| - name: Stack Exchange | ||
| - name: Craft Stack Exchange | ||
| url: https://craftcms.stackexchange.com/ | ||
| about: Get help and help others | ||
| - name: 'Feature Request: Craft CMS' | ||
| url: https://github.com/craftcms/cms/discussions/new?category=ideas | ||
| about: Make a feature request or enhancement for Craft CMS | ||
| - name: 'Feature Request: Craft Console / Plugin Store' | ||
| url: https://github.com/craftcms/console/discussions/new?category=ideas | ||
| about: Make a feature request or enhancement for Craft Console or the Plugin Store | ||
| - name: 'Feature Request: Craft Cloud' | ||
| url: https://github.com/craftcms/cloud/discussions/new?category=ideas | ||
| about: Make a feature request or enhancement for Craft Cloud | ||
| - name: 'Feature Request: Craft Commerce' | ||
| url: https://github.com/craftcms/commerce/discussions/new?category=ideas | ||
| about: Make a feature request or enhancement for Craft Commerce | ||
| - name: 'Bug Report: Craft CMS' | ||
| url: https://github.com/craftcms/cms/issues/new/choose | ||
| about: Create a bug report for Craft CMS | ||
| - name: 'Bug Report: Craft Console / Plugin Store' | ||
| url: https://github.com/craftcms/console/issues/new/choose | ||
| about: Create a bug report for Craft Console or the Plugin Store | ||
| - name: 'Bug Report: Craft Cloud' | ||
| url: https://craftcms.com/contact | ||
| about: Create a bug report for Craft Cloud | ||
| - name: 'Bug Report: Craft Commerce' | ||
| url: https://github.com/craftcms/commerce/issues/new/choose | ||
| about: Create a bug report for Craft Commerce |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <?php | ||
| /** | ||
| * @link https://craftcms.com/ | ||
| * @copyright Copyright (c) Pixel & Tonic, Inc. | ||
| * @license https://craftcms.github.io/license/ | ||
| */ | ||
|
|
||
| namespace craft\base; | ||
|
|
||
| /** | ||
| * CpEditable defines the common interface to be implemented by components that | ||
| * have a dedicated edit page in the control panel. | ||
| * | ||
| * @author Pixel & Tonic, Inc. <[email protected]> | ||
| * @since 5.0.0 | ||
| */ | ||
| interface CpEditable | ||
| { | ||
| /** | ||
| * Returns the URL to the component’s edit page in the control panel. | ||
| * | ||
| * @return string|null | ||
| */ | ||
| public function getCpEditUrl(): ?string; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,7 +32,13 @@ | |
| * @author Pixel & Tonic, Inc. <[email protected]> | ||
| * @since 3.0.0 | ||
| */ | ||
| interface ElementInterface extends ComponentInterface, Chippable, Thumbable, Statusable, Actionable | ||
| interface ElementInterface extends | ||
| ComponentInterface, | ||
| Chippable, | ||
| CpEditable, | ||
| Thumbable, | ||
| Statusable, | ||
| Actionable | ||
| { | ||
| /** | ||
| * Returns the lowercase version of [[displayName()]]. | ||
|
|
@@ -907,13 +913,6 @@ public function hasRevisions(): bool; | |
| */ | ||
| public function prepareEditScreen(Response $response, string $containerId): void; | ||
|
|
||
| /** | ||
| * Returns the element’s edit URL in the control panel. | ||
| * | ||
| * @return string|null | ||
| */ | ||
| public function getCpEditUrl(): ?string; | ||
|
|
||
| /** | ||
| * Returns the URL that users should be redirected to after editing the element. | ||
| * | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.