diff --git a/.drone.yml b/.drone.yml index c3b82520..e00ad6cd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,8 +15,8 @@ steps: image: zosiab/eclint:latest depends_on: [ clone ] commands: - - git pull origin master - - eclint check $(git diff --name-only origin/master) + - git pull origin main + - eclint check $(git diff --name-only origin/main) # This may be used in the future, because it makes of intellij's native code inspection/formatting capabilities. # Additional information: https://www.jetbrains.com/help/idea/command-line-formatter.html @@ -54,7 +54,7 @@ trigger: event: - push branch: - - master + - main --- kind: pipeline @@ -101,4 +101,4 @@ trigger: event: - push branch: - - master + - main diff --git a/.gitea/issue_template.md b/.gitea/issue_template.md index d1307a05..727faec8 100644 --- a/.gitea/issue_template.md +++ b/.gitea/issue_template.md @@ -31,7 +31,7 @@

-- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/master/CONTRIBUTING.md). +- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/main/CONTRIBUTING.md).
#### Thank you for your time. \ No newline at end of file diff --git a/.gitea/pull_request_template.md b/.gitea/pull_request_template.md index dd43dcc3..b9a0ce9a 100644 --- a/.gitea/pull_request_template.md +++ b/.gitea/pull_request_template.md @@ -2,8 +2,8 @@

- + -- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/master/CONTRIBUTING.md). +- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/main/CONTRIBUTING.md). - [ ] I'm following the code standards as defined [here](https://codeberg.org/gitnex/GitNex/wiki/Code-Standards). -- [ ] By submitting this pull request, I permit GitNex to license my work under the [GNU General Public License v3](https://codeberg.org/GitNex/GitNex/src/branch/master/LICENSE). \ No newline at end of file +- [ ] By submitting this pull request, I permit GitNex to license my work under the [GNU General Public License v3](https://codeberg.org/GitNex/GitNex/src/branch/main/LICENSE). \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 069faff3..bae163bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ on_setup: image: tutum/curl stage: .pre only: - - master + - main - tags variables: INSTANCE: "https://codeberg.org" @@ -20,7 +20,7 @@ build: image: nextcloudci/android:android-54 stage: build only: - - master + - main - tags script: - ./gradlew assembleFreeRelease @@ -33,7 +33,7 @@ sign: image: nextcloudci/android:android-54 stage: sign only: - - master + - main - tags variables: OUTPUT: "signed.apk" @@ -50,7 +50,7 @@ latest: image: tutum/curl stage: publish only: - - master + - main - tags variables: WEBDAV_USERNAME: "GitNexBot" @@ -75,7 +75,7 @@ on_success: image: tutum/curl stage: .post only: - - master + - main - tags variables: INSTANCE: "https://codeberg.org" @@ -89,7 +89,7 @@ on_failure: image: tutum/curl stage: .post only: - - master + - main - tags variables: INSTANCE: "https://codeberg.org" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 43385f65..de3a1a9c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,7 +29,7 @@ It is documented in the Wiki: [Code-Standards](https://codeberg.org/gitnex/GitNe 2. Clone the forked repository from your namespace to your local machine. 3. Create a new branch and work on your feature, enhancement or patch. 4. Push your commits to your forked version. -5. You can now create a PR using the web interface against **master** branch. +5. You can now create a PR using the web interface against **main** branch. For more information, click [here](http://makeapullrequest.com/). diff --git a/README.md b/README.md index b0b4de81..e7f76f8d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Pipeline status](https://img.shields.io/gitlab/pipeline/opyale/gitnex/master)](https://gitlab.com/opyale/gitnex/-/pipelines) [![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://codeberg.org/api/v1/repos/gitnex/GitNex/releases&query=$[0].tag_name)](https://codeberg.org/gitnex/GitNex/releases) [![Crowdin](https://badges.crowdin.net/gitnex/localized.svg)](https://crowdin.com/project/gitnex) [![Join the Discord chat at https://discord.gg/FbSS4rf](https://img.shields.io/discord/632219664587685908.svg)](https://discord.gg/FbSS4rf) +[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Pipeline status](https://img.shields.io/gitlab/pipeline/opyale/gitnex/main)](https://gitlab.com/opyale/gitnex/-/pipelines) [![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://codeberg.org/api/v1/repos/gitnex/GitNex/releases&query=$[0].tag_name)](https://codeberg.org/gitnex/GitNex/releases) [![Crowdin](https://badges.crowdin.net/gitnex/localized.svg)](https://crowdin.com/project/gitnex) [![Join the Discord chat at https://discord.gg/FbSS4rf](https://img.shields.io/discord/632219664587685908.svg)](https://discord.gg/FbSS4rf) [Become a Patroen](https://www.patreon.com/mmarif) @@ -9,9 +9,9 @@ GitNex is a free/paid, open-source Android client for Git repository management GitNex is licensed under GPLv3 License. See the LICENSE file for the full license text. **No trackers are used** and source code is available here for anyone to audit. ## Downloads -[Get it on F-droid](https://f-droid.org/en/packages/org.mian.gitnex/) +[Get it on F-droid](https://f-droid.org/en/packages/org.mian.gitnex/) [Get it on Google Play](https://play.google.com/store/apps/details?id=org.mian.gitnex.pro) -[Download builds and releases](https://cloud.swatian.com/s/DN7E5xxtaw4fRbE) +[Download builds and releases](https://cloud.swatian.com/s/DN7E5xxtaw4fRbE) ## Note about Gitea version Please make sure that you are on latest stable release or later for better app experience. @@ -37,7 +37,7 @@ Option 2 - Open terminal(Linux) and cd to the project dir. Run `./gradlew assemb - [MANY MORE](https://codeberg.org/gitnex/GitNex/wiki/Features) ## Contributing -[CONTRIBUTING](https://codeberg.org/gitnex/GitNex/src/branch/master/CONTRIBUTING.md) +[CONTRIBUTING](https://codeberg.org/gitnex/GitNex/src/branch/main/CONTRIBUTING.md) ## Translation Help us translate GitNex to your native language. @@ -48,9 +48,9 @@ We use [Crowdin](https://crowdin.com/project/gitnex) for translation. If your la ## Screenshots: -001.png | 002.png | 003.png | 004.png +001.png | 002.png | 003.png | 004.png ---|---|---|--- -005.png | 006.png | 007.png | 008.png +005.png | 006.png | 007.png | 008.png ## Links [Website](https://gitnex.com)