Skip to content

Commit

Permalink
Merge branch 'develop' into fix/349
Browse files Browse the repository at this point in the history
  • Loading branch information
@ravinderk
ravinderk authored Sep 22, 2023
2 parents 7c7856f + bf35374 commit 12c1485
Show file tree
Hide file tree
Showing 20 changed files with 65 additions and 54 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/cypress.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ on:
push:
branches:
- develop
- develop-v1
- trunk
pull_request:
branches:
- develop
- develop-v1

jobs:
build:
name: NPM Install
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/lint.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@ on:
push:
branches:
- develop
- develop-v1
- trunk
pull_request:
branches:
- develop
- develop-v1

jobs:
eslint:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@ on:
push:
branches:
- develop
- develop-v1
- trunk
pull_request:
branches:
- develop
- develop-v1

jobs:

Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file, per [the Ke

## [Unreleased] - TBD

## [2.0.1] - 2023-09-18
### Changed
- Update from Cypress v10 to v13 (props [@dkotter](https://github.com/dkotter), [@iamdharmesh](https://github.com/iamdharmesh), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1128](https://github.com/10up/distributor/pull/1128)).
- Documentation updates (props [@jeffpaul](https://github.com/jeffpaul), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1131](https://github.com/10up/distributor/pull/1131)).

### Removed
- GitHub Actions for version 1.x releases (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@jeffpaul](https://github.com/jeffpaul) via [#1135](https://github.com/10up/distributor/pull/1135)).

### Fixed
- Invalid author IDs being set when pushing and pulling posts (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@faisal-alvi](https://github.com/faisal-alvi), [@joemcgill](https://github.com/joemcgill), [@margaretschneider](https://github.com/margaretschneider) via [#1133](https://github.com/10up/distributor/pull/1133)).
- Featured image delete push issue (props [@ravichdev](https://github.com/ravichdev), [@helen](https://github.com/helen), [@dkotter](https://github.com/dkotter), [@adamsilverstein](https://github.com/adamsilverstein), [@jeffpaul](https://github.com/jeffpaul), [@arsendovlatyan](https://github.com/arsendovlatyan), [@ravinderk](https://github.com/ravinderk), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#310](https://github.com/10up/distributor/pull/310)).
- Allow clicking on the `Save to draft` confirmation modal buttons (props [@av3nger](https://github.com/av3nger), [@peterwilsoncc](https://github.com/peterwilsoncc), [@ravinderk](https://github.com/ravinderk), [@pdewouters](https://github.com/pdewouters) via [#1042](https://github.com/10up/distributor/pull/1042)).
- Admin icon has been updated so it has the same width and height (props [@zach-adams](https://github.com/zach-adams), [@ravinderk](https://github.com/ravinderk), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1132](https://github.com/10up/distributor/pull/1132)).
- Ensure our E2E tests pass on WordPress 6.3 (props [@dkotter](https://github.com/dkotter), [@iamdharmesh](https://github.com/iamdharmesh), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1128](https://github.com/10up/distributor/pull/1128)).

## [2.0.0] - 2023-09-05
**Note that Distributor now requires PHP 7.4 or later and WordPress 5.7 or later.**

Expand Down Expand Up @@ -471,6 +486,7 @@ This adds a post type selector when viewing the Pull Content list for both exter
- Initial closed release.

[Unreleased]: https://github.com/10up/distributor/compare/trunk...develop
[2.0.1]: https://github.com/10up/distributor/compare/2.0.0...2.0.1
[2.0.0]: https://github.com/10up/distributor/compare/1.9.1...2.0.0
[1.9.1]: https://github.com/10up/distributor/compare/1.9.0...1.9.1
[1.9.0]: https://github.com/10up/distributor/compare/1.8.0...1.9.0
Expand Down
2 changes: 1 addition & 1 deletion CREDITS.md
View file

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions assets/css/gutenberg-syndicated-post.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ body.dt-linked-post {
cursor: default;
}

/* Allow clicks on confirmation dialog buttons */
.components-confirm-dialog button {
opacity: 1;
pointer-events: auto;
cursor: pointer;
}

.edit-post-welcome-guide,
.edit-post-header__settings,
.components-time-picker,
Expand All @@ -40,6 +47,7 @@ body.dt-linked-post {

.components-panel__body-toggle,
.edit-post-post-visibility__toggle,
.editor-post-switch-to-draft,
.editor-post-trash,
.editor-post-publish-button,
.edit-post-post-schedule__toggle,
Expand Down
26 changes: 3 additions & 23 deletions assets/img/icon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 5 additions & 14 deletions assets/js/components/plugin-icon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,13 @@ import { SVG, Path } from '@wordpress/primitives';

const pluginIcon = (
<SVG
width="36"
height="39"
viewBox="0 0 36 39"
width="20"
height="20"
viewBox="13.4 8.8 573.2 573.2"
xmlns="http://www.w3.org/2000/svg"
>
<Path d="M7.938 23.11c-.93 0-1.646.794-1.646 1.826 0 .953.715 1.826 1.575 1.826a12.226 12.226 0 0 0 4.152 3.968 10.2 10.2 0 0 0 4.94 1.27c4.152 0 8.161-2.54 10.166-6.984 1.36-3.016 1.503-6.35.573-9.524-1.003-3.175-3.007-5.715-5.728-7.223-5.584-3.016-12.314-.476-15.106 5.714l-.215.397h.072c-.286.635-.501 1.508.072 1.826l5.942 2.54c0 .238-.072.476-.072.714 0 2.619 1.933 4.762 4.296 4.762 2.362 0 4.295-2.143 4.295-4.762 0-2.62-1.933-4.762-4.295-4.762-1.432 0-2.72.793-3.508 1.984l-4.869-2.064c1.146-2.38 3.007-4.206 5.298-5.08 2.363-.872 4.94-.713 7.231.477 4.654 2.54 6.587 8.81 4.296 13.969-1.074 2.54-3.007 4.365-5.441 5.317-2.363.873-4.94.715-7.231-.476-1.36-.714-2.506-1.825-3.437-3.174.072-.238.144-.477.144-.715.143-.952-.645-1.825-1.504-1.825Z" />
<Path
fillRule="evenodd"
d="M12.019 30.73a12.226 12.226 0 0 1-4.152-3.968c-.86 0-1.575-.873-1.575-1.826 0-1.032.715-1.825 1.646-1.825.86 0 1.647.873 1.504 1.825 0 .238-.072.477-.144.715.931 1.349 2.077 2.46 3.437 3.174 2.29 1.19 4.868 1.35 7.23.477 2.435-.953 4.368-2.778 5.442-5.318 2.29-5.16.358-11.43-4.296-13.969-2.29-1.19-4.868-1.35-7.23-.476-2.204.84-4.01 2.56-5.165 4.81-.045.09-.09.179-.134.27l4.869 2.063c.787-1.19 2.076-1.984 3.508-1.984 2.362 0 4.295 2.143 4.295 4.762 0 2.619-1.933 4.762-4.295 4.762-2.363 0-4.296-2.143-4.296-4.762 0-.12.018-.238.036-.357.018-.12.036-.238.036-.358l-5.942-2.54c-.487-.269-.405-.94-.194-1.525a4.051 4.051 0 0 1 .122-.3H6.65l.215-.397c2.792-6.19 9.522-8.73 15.106-5.714 2.72 1.508 4.725 4.048 5.728 7.223.93 3.174.787 6.508-.573 9.524C25.12 29.46 21.111 32 16.959 32a10.2 10.2 0 0 1-4.94-1.27ZM6.595 13.85c2.858-6.323 9.765-8.952 15.518-5.845l.003.002c2.793 1.548 4.844 4.153 5.868 7.394l.002.006c.94 3.223.791 6.662-.588 9.732-2.05 4.544-6.16 7.161-10.44 7.161a10.631 10.631 0 0 1-5.085-1.307l-.004-.003a12.653 12.653 0 0 1-4.17-3.937c-.985-.103-1.708-1.103-1.708-2.117 0-1.167.822-2.125 1.947-2.125 1.04 0 1.96 1.028 1.803 2.15-.006.22-.058.439-.114.636.896 1.271 1.962 2.29 3.246 2.962 2.216 1.152 4.704 1.304 6.986.462 2.359-.924 4.23-2.69 5.271-5.154l.003-.005c2.233-5.03.338-11.123-4.163-13.582-2.215-1.15-4.703-1.303-6.984-.46-2.12.808-3.868 2.465-4.993 4.647l4.35 1.844c.845-1.149 2.155-1.913 3.616-1.913 2.556 0 4.595 2.307 4.595 5.062 0 2.755-2.039 5.062-4.595 5.062-2.557 0-4.596-2.307-4.596-5.062.001-.142.021-.283.04-.402l.002-.017.015-.104-5.76-2.461-.013-.008c-.43-.238-.533-.68-.512-1.072.014-.23.072-.48.149-.716h-.138l.45-.83Z"
/>
<Path d="M32.128 10.017c0-1.01-.733-1.788-1.685-1.788-.952 0-1.685.777-1.685 1.788 0 .933.733 1.71 1.612 1.788 2.49 4.586 2.71 10.26.513 15.08-1.832 3.886-4.909 6.762-8.718 8.083-3.81 1.4-7.912 1.089-11.502-.777C3.191 30.305.113 20.666 3.777 12.737c2.197-4.741 6.52-8.006 11.355-8.783.293.388.732.622 1.245.622.953 0 1.685-.778 1.685-1.788S17.33 1 16.377 1c-.659 0-1.172.389-1.465.933-5.494.855-10.403 4.586-12.894 9.95a19.201 19.201 0 0 0-.805 13.835c1.465 4.587 4.542 8.24 8.571 10.417C12.201 37.378 14.766 38 17.256 38c6.3 0 12.381-3.731 15.312-10.105 2.49-5.441 2.27-11.893-.586-17.1.073-.234.146-.467.146-.778Z" />
<Path
fillRule="evenodd"
d="M2.018 11.882c2.491-5.363 7.4-9.094 12.894-9.95.293-.543.806-.932 1.465-.932.953 0 1.685.777 1.685 1.788 0 1.01-.732 1.788-1.685 1.788-.512 0-.952-.234-1.245-.622-4.835.777-9.158 4.042-11.355 8.783-3.663 7.929-.586 17.568 6.886 21.454 3.59 1.866 7.692 2.177 11.502.777 3.81-1.32 6.886-4.197 8.718-8.084 2.198-4.819 1.978-10.493-.513-15.08-.88-.077-1.612-.854-1.612-1.787 0-1.01.733-1.788 1.685-1.788.952 0 1.685.777 1.685 1.788 0 .31-.073.544-.146.777 2.857 5.208 3.077 11.66.586 17.101C29.638 34.269 23.557 38 17.256 38c-2.49 0-5.055-.622-7.472-1.865-4.03-2.177-7.106-5.83-8.571-10.416a19.201 19.201 0 0 1 .805-13.837Zm30.288-1.12c.061-.207.12-.45.122-.745 0-1.16-.85-2.088-1.985-2.088-1.134 0-1.985.929-1.985 2.088 0 1.029.762 1.897 1.72 2.065 2.378 4.479 2.569 9.99.433 14.676-1.8 3.82-4.818 6.635-8.544 7.927l-.006.002c-3.727 1.37-7.742 1.066-11.26-.762C3.482 30.117.45 20.656 4.05 12.863c2.132-4.599 6.297-7.776 10.963-8.585.343.375.821.598 1.365.598 1.135 0 1.985-.929 1.985-2.088 0-1.16-.85-2.088-1.985-2.088-.735 0-1.307.405-1.653.959-5.54.913-10.468 4.693-12.978 10.097v.002a19.624 19.624 0 0 0-.82 14.052c1.49 4.66 4.618 8.375 8.715 10.588l.006.003c2.45 1.258 5.083 1.897 7.61 1.899 6.419 0 12.605-3.801 15.583-10.28 2.512-5.487 2.31-11.986-.535-17.258Z"
/>
<Path d="M19.291 2.5a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0ZM33.291 10.5a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0ZM10.291 25.5a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0Z" />
<Path d="M195.113 411.033c45.835 46.692 119.124 58.488 178.387 24.273 70.262-40.566 94.371-130.544 53.806-200.806-40.566-70.262-130.544-94.371-200.806-53.806-19.873 11.474-36.055 26.899-48.124 44.715l64.722 33.186c22.201-25.593 59.796-33.782 91.279-17.639 37.002 18.973 51.64 64.418 32.667 101.421-18.973 37.002-64.418 51.64-101.421 32.667-31.483-16.143-46.776-51.45-38.951-84.415l-81.702-41.892c-8.838-4.532-12.335-15.367-7.814-24.211 15.514-30.346 39.658-56.715 71.344-75.009 87.469-50.5 199.482-20.486 249.983 66.983 50.5 87.469 20.486 199.482-66.983 249.983-75.235 43.437-168.63 27.307-225.419-33.717-17.809 3.778-36.797-4.055-46.387-20.666-11.922-20.648-4.837-47.091 15.812-59.012 20.648-11.922 47.091-4.836 59.012 15.812 7.77 13.458 7.466 29.377.595 42.133Z" />
<Path d="M262.237 72.985C148.8 91.101 62 189.494 62 308c0 131.356 106.644 238 238 238s238-106.644 238-238c0-34.059-7.168-66.458-20.08-95.766-15.121.99-30.323-6.014-39.137-19.626-12.959-20.014-7.231-46.783 12.783-59.742 20.014-12.958 46.783-7.231 59.742 12.783 10.095 15.592 8.849 35.284-1.657 49.352C565.288 229.461 574 267.721 574 308c0 151.225-122.775 274-274 274S26 459.225 26 308C26 170.539 127.443 56.584 259.487 36.98 265.594 20.533 281.438 8.8 300 8.8c23.843 0 43.2 19.357 43.2 43.2 0 23.843-19.357 43.2-43.2 43.2-16.229 0-30.38-8.968-37.763-22.215Z" />
</SVG>
);

Expand Down
Loading

0 comments on commit 12c1485

Please sign in to comment.