]> jfr.im git - irc/freenode/web-7.0.git/blob - CONTRIBUTE.md
Merge branch 'master' into template-archivelink
[irc/freenode/web-7.0.git] / CONTRIBUTE.md
1 ## Dev Requirements:
2
3 * [Myth](http://www.myth.io/)
4 * [cms7](https://github.com/edk0/cms7)
5
6 ## Git
7
8 * Master is whats on [freenode](https://freenode.net) please do only merge to this branch with permission from at least two of the following: spb, christel, mist, kloeri, edk or Swant
9 * design- prefix is for design changes of the website, ONE CHANGE PER BRANCH
10 * template- prefix is for template changes, ONE CHANGE PER BRANCH
11 * content- prefix is for new content, blogposts and faq md files, ONE ARTICLE PER BRANCH
12 * hotfix- prefix is for urgent bugs, these might be fast forwarded without deeper testing
13
14 Branches should be tested on both big and small screens.
15 No direct merges to master, use Pull Requests.
16 except for hotfix- there should be left rich with time (+3h) from PR open to PR merge for discusiion
17
18 ## Editing Rules
19
20 Do not edit static/css/style.css as it'll be overwritten on next compile, instead edit static/css/source.css and run myth static/css/source.css static/css/style.css