Skip to content

Commit 0388f0f

Browse files
Merge branch 'main' into fix-filter-i18n
2 parents 70c0576 + b5a7de0 commit 0388f0f

File tree

47 files changed

+429
-129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+429
-129
lines changed

.github/workflows/sponsors.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Automatically updates the README with our GitHub Sponsors.
2+
# Fetches sponsor data from GitHub and adds their avatars to the README file.
3+
# Runs weekly on Sundays at midnight UTC and can be triggered manually.
4+
5+
name: Generate Sponsors README
6+
on:
7+
workflow_dispatch:
8+
schedule:
9+
- cron: 0 0 * * 0
10+
permissions:
11+
contents: write
12+
jobs:
13+
deploy:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v2
18+
19+
- name: Generate Sponsors
20+
uses: JamesIves/github-sponsors-readme-action@v1
21+
with:
22+
token: ${{ secrets.GITHUB_TOKEN }}
23+
file: 'README.md'
24+
organization: true
25+
active-only: false
26+
template: '<a href="https://github.com/{{{ login }}}"><img src="https://github.com/{{{ login }}}.png" width="48px" alt="{{{ login }}}" style="border-radius:50%" /></a> &nbsp; '
27+
28+
- name: Deploy
29+
uses: JamesIves/github-pages-deploy-action@v4
30+
with:
31+
branch: readme-sponsors
32+
folder: '.'

README.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44

55
[decapcms.org](https://www.decapcms.org/)
66

7-
A CMS for static site generators. Give users a simple way to edit
8-
and add content to any site built with a static site generator.
7+
A CMS for static site generators. Give users a simple way to edit and add content to any site built with a static site generator.
98

109
_Decap CMS is the new name of Netlify CMS [since February 2023](https://www.netlify.com/blog/netlify-cms-to-become-decap-cms/)._
1110

12-
## Community Chat
13-
14-
<a href="https://decapcms.org/chat">Join us on Discord</a>
11+
<a href="https://decapcms.org/chat">Join us on Discord</a> for community chat.
1512

1613
## How It Works
1714

@@ -35,7 +32,20 @@ The Decap CMS can be used in two different ways.
3532
To learn more about this installation method, refer to the [Quick Start Guide](https://www.decapcms.org/docs/quick-start/)
3633
* A complete, more complex install, that gives you more flexibility but requires that you use a static site builder with a build system that supports npm packages.
3734

38-
## Contributing
35+
## Sponsor
36+
37+
Help support Decap CMS development by becoming a sponsor! Your contributions help us maintain and improve this open-source project.
38+
39+
[![GitHub Sponsors](https://img.shields.io/badge/Sponsor-GitHub-ea4aaa?style=for-the-badge&logo=github)](https://github.com/sponsors/decaporg)
40+
[![Open Collective](https://img.shields.io/badge/Sponsor-Open%20Collective-blue?style=for-the-badge&logo=opencollective)](https://opencollective.com/decap)
41+
42+
These are our sponsors on both platforms. Thank you for your support!
43+
44+
![Open Collective Backers](https://opencollective.com/decap/backers.svg?limit=30&button=false&avatarHeight=48&width=400)
45+
46+
<!-- sponsors --><a href="https://github.com/Zwyx"><img src="https://github.com/Zwyx.png" width="48px" alt="Zwyx" style="border-radius:50%" /></a> &nbsp;<a href="https://github.com/smolcodes"><img src="https://github.com/smolcodes.png" width="48px" alt="smolcodes" style="border-radius:50%" /></a> &nbsp;<a href="https://github.com/shizik"><img src="https://github.com/shizik.png" width="48px" alt="shizik" style="border-radius:50%" /></a> &nbsp;<a href="https://github.com/JacquesRaoult"><img src="https://github.com/JacquesRaoult.png" width="48px" alt="JacquesRaoult" style="border-radius:50%" /></a> &nbsp;<!-- sponsors -->
47+
48+
## Contribute
3949

4050
New contributors are always welcome! Check out [CONTRIBUTING.md](https://github.com/decaporg/decap-cms/blob/main/CONTRIBUTING.md) to get involved.
4151

cypress/support/commands.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ Cypress.Commands.add('insertEditorComponent', title => {
271271
['clickUnorderedListButton', 'Bulleted List'],
272272
['clickCodeButton', 'Code'],
273273
['clickItalicButton', 'Italic'],
274+
['clickStrikethroughButton', 'Strikethrough'],
274275
['clickQuoteButton', 'Quote'],
275276
['clickLinkButton', 'Link'],
276277
].forEach(([commandName, toolbarButtonName]) => {

0 commit comments

Comments
 (0)