diff --git a/.eslintrc.json b/.eslintrc-old.json similarity index 100% rename from .eslintrc.json rename to .eslintrc-old.json diff --git a/.gitmodules b/.gitmodules index 002bfe8fd..7719e3199 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "docs/api"] path = docs/api url = https://github.com/FlashpointProject/launcher_ApiDocs.git -[submodule "extensions/core-curation"] - path = extensions/core-curation - url = https://github.com/FlashpointProject/Sys-Extension-Core-Curation.git diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7514263f0..577897abf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,54 +1,7 @@ -Note: This is still a work in progress. Some parts of this file are not finalized and are kept outside of the project. +It's recommended to read the Documentation if you wish to contribute to Flashpoint Launcher development. -# Branch naming guidelines and Pull Requests +You'll likely find help in the #launcher channel of the discord as well. -Branches are expected to follow the git flow naming scheme: -- `feature/` -- `bugfix/` -- `hotfix/` +Documentation: https://flashpointproject.github.io/launcher -Make sure that the base for PRs is set to ``develop`` for features and ``master`` or ``develop`` for hotfixes or bugfixes. - -Maintainer Note - Make sure to merge hotfixes and bugfixes manually with `--no-ff` into both master and develop. See https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow for more detail. - -# Commit Message Guidelines - -*Note: These guidelines are based on the [guidelines used by Angular](https://github.com/angular/angular/blob/master/CONTRIBUTING.md)* - -Each commit message consists of a header, a body and a footer. The header has a special format that includes a type and a subject: - -``` -: - - - -