mirror of
https://github.com/nextcloud/richdocuments.git
synced 2025-12-17 21:12:14 +01:00
Rename main Git development branch from master to main
Avoid using terms associated with slavery and exploitation. Signed-off-by: Jonas <jonas@freesources.org>
This commit is contained in:
parent
c4c3c5fc6f
commit
7eb7518c99
9 changed files with 13 additions and 12 deletions
2
.github/pull_request_template.md
vendored
2
.github/pull_request_template.md
vendored
|
|
@ -1,6 +1,6 @@
|
||||||
|
|
||||||
* Resolves: # <!-- related github issue -->
|
* Resolves: # <!-- related github issue -->
|
||||||
* Target version: master
|
* Target version: main
|
||||||
|
|
||||||
### Summary
|
### Summary
|
||||||
|
|
||||||
|
|
|
||||||
2
.github/workflows/cypress.yml
vendored
2
.github/workflows/cypress.yml
vendored
|
|
@ -4,7 +4,7 @@ on:
|
||||||
pull_request:
|
pull_request:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- main
|
||||||
- stable*
|
- stable*
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
|
|
|
||||||
2
.github/workflows/integration.yml
vendored
2
.github/workflows/integration.yml
vendored
|
|
@ -4,7 +4,7 @@ on:
|
||||||
pull_request:
|
pull_request:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- main
|
||||||
- stable*
|
- stable*
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
|
|
|
||||||
2
.github/workflows/lint.yml
vendored
2
.github/workflows/lint.yml
vendored
|
|
@ -3,7 +3,7 @@ on:
|
||||||
pull_request:
|
pull_request:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- main
|
||||||
- stable*
|
- stable*
|
||||||
jobs:
|
jobs:
|
||||||
php-linters:
|
php-linters:
|
||||||
|
|
|
||||||
1
.github/workflows/nodejs.yml
vendored
1
.github/workflows/nodejs.yml
vendored
|
|
@ -9,6 +9,7 @@ on:
|
||||||
pull_request:
|
pull_request:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
|
- main
|
||||||
- master
|
- master
|
||||||
- stable*
|
- stable*
|
||||||
|
|
||||||
|
|
|
||||||
2
.github/workflows/phpunit.yml
vendored
2
.github/workflows/phpunit.yml
vendored
|
|
@ -4,7 +4,7 @@ on:
|
||||||
pull_request:
|
pull_request:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- main
|
||||||
- stable*
|
- stable*
|
||||||
|
|
||||||
env:
|
env:
|
||||||
|
|
|
||||||
2
.github/workflows/update-nextcloud-ocp.yml
vendored
2
.github/workflows/update-nextcloud-ocp.yml
vendored
|
|
@ -17,7 +17,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
branches: ["master", "stable25", "stable24", "stable23"]
|
branches: ["main", "master", "stable25", "stable24", "stable23"]
|
||||||
|
|
||||||
name: update-nextcloud-ocp-${{ matrix.branches }}
|
name: update-nextcloud-ocp-${{ matrix.branches }}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
# Nextcloud Office
|
# Nextcloud Office
|
||||||
[](https://scrutinizer-ci.com/g/nextcloud/richdocuments/build-status/master)
|
[](https://scrutinizer-ci.com/g/nextcloud/richdocuments/build-status/main)
|
||||||
[](https://scrutinizer-ci.com/g/nextcloud/richdocuments/?branch=master)
|
[](https://scrutinizer-ci.com/g/nextcloud/richdocuments/?branch=main)
|
||||||
[](https://webchat.freenode.net/?channels=nextcloud)
|
[](https://webchat.freenode.net/?channels=nextcloud)
|
||||||
|
|
||||||
**A [Nextcloud](https://nextcloud.com) app integrating Collabora Online into your Nextcloud!**
|
**A [Nextcloud](https://nextcloud.com) app integrating Collabora Online into your Nextcloud!**
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
Nextcloud Office supports editing your documents in real time with multiple other editors, showing high fidelity, WYSIWYG rendering and preserving the layout and formatting of your documents.
|
Nextcloud Office supports editing your documents in real time with multiple other editors, showing high fidelity, WYSIWYG rendering and preserving the layout and formatting of your documents.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,9 +21,9 @@ You can also edit your documents off-line with the Collabora Office app from the
|
||||||
<website>https://collaboraoffice.com/</website>
|
<website>https://collaboraoffice.com/</website>
|
||||||
<bugs>https://github.com/nextcloud/richdocuments/issues</bugs>
|
<bugs>https://github.com/nextcloud/richdocuments/issues</bugs>
|
||||||
<repository type="git">https://github.com/nextcloud/richdocuments.git</repository>
|
<repository type="git">https://github.com/nextcloud/richdocuments.git</repository>
|
||||||
<screenshot>https://github.com/nextcloud/richdocuments/raw/master/screenshots/Nextcloud-writer.png</screenshot>
|
<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-writer.png</screenshot>
|
||||||
<screenshot>https://github.com/nextcloud/richdocuments/raw/master/screenshots/Nextcloud-spreadsheet.png</screenshot>
|
<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-spreadsheet.png</screenshot>
|
||||||
<screenshot>https://github.com/nextcloud/richdocuments/raw/master/screenshots/Nextcloud-presentation.png</screenshot>
|
<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-presentation.png</screenshot>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<nextcloud min-version="26" max-version="26"/>
|
<nextcloud min-version="26" max-version="26"/>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue