X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/3fe355234450caeae334086149b06a504af86825..edee1610a4b37f18f7a2f5881e88aa2ec484579d:/CONTRIBUTING.md?ds=sidebyside diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f7f21ed..c41c4d9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,6 +24,7 @@ view only to show the most importants files and their role. ``` . âââ admin.php : administration interface to manage links and files +âââ docker : folder containing some configuration files to run Jirafeau in docker âââ f.php : permits to download files or show the download page âââ index.php : provides a web interface to interact with API âââ script.php : API interface (all file actions happen here - upload, deletion, etc) @@ -45,10 +46,10 @@ view only to show the most importants files and their role. âââ var-xxxxxxx : the users folder containing all data (auto generated, not versionized) âââ async : chunks of uploaded files (not succressfull yet) âââ files : all files that have been uploaded successfully - âââ [hashed file name] : the original file - âââ [hashed file name]_count : count many links to this file exist + â âââ [hashed file name] : the original file + â âââ [hashed file name]_count : count many links to this file exist âââ links : all links, including meta-informations, pointing to files - âââ [link] : the link file, includes which original file should be used and some meta data like creation date, expiration time + âââ [link] : the link file, includes which original file should be used and some meta data like creation date, expiration time ``` ## Translations @@ -84,3 +85,15 @@ Quick walktrough: * Feature is reviewed * MR accepted: Reviewer checks out »next-release« branch and cherry-picks the commit ```git checkout next-release; git cherry-pick be4369641; git push``` * MR declined: Reviewer add some notes, Developer rebases his branch, adds neccessary changes, force pushes the branch, ask a reviewer to review the changes in the merge request ticket (as Gitlab recognizes them automatically) ```git checkout some-feature; git rebase upstream/next-release``` â¦[add changes]⦠```git add -A, git commit --amend; git push -f``` + +## New Releases + +* Compare the [»next-release« branch to »master«](https://gitlab.com/mojo42/Jirafeau/compare/master...next-release) +* Add a list of noteworthy features and bugfixes to the README +* Change the version, using [semantic versioning](http://semver.org/), in ```settings.php``` +* Merge »next-release« branch to »master« +* Update the demo page +* Tag the »master« with the new version +* Push branch and tag +* Build & push new docker image +* Dance a little