From: Marius Gavrilescu Date: Mon, 9 Feb 2015 21:02:43 +0000 (+0200) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=3e09c768b3e7c39806494d2cc6e24b845ff108f3;hp=5c6462fde5cca1c98cf481a2ba3e3245d4030403;p=plack-app-gruntmaster.git Merge branch 'master' into newmc Conflicts: tmpl/skel.en --- diff --git a/a/contribute.en b/a/contribute.en new file mode 100644 index 0000000..b7c0411 --- /dev/null +++ b/a/contribute.en @@ -0,0 +1,23 @@ +

Reporting bugs

+Please report any bugs you find to the bugtracker. + +

Source code repositories

+The Gruntmaster 6000 project has three git repositories: +
+
gruntmaster-data
+
The database interface and database editing tools
+
gruntmaster-daemon
+
The grader
+
gruntmaster-page
+
The website
+ +

Submitting patches

+Mail them to marius@ieval.ro. Please try to follow the following guidelines: + + +If you have any questions, feel free to mail them to marius@ieval.ro or to ask in #mindcoding on OFTC. diff --git a/a/contribute.en.title b/a/contribute.en.title new file mode 100644 index 0000000..9faacc4 --- /dev/null +++ b/a/contribute.en.title @@ -0,0 +1 @@ +Contribute \ No newline at end of file diff --git a/js/90-nav.js b/js/90-nav.js index 92a9d43..743595a 100644 --- a/js/90-nav.js +++ b/js/90-nav.js @@ -8,6 +8,7 @@ 'log': /^\/log\//, 'us': /^\/us\//, 'account': /^\/account$/, + 'contribute': /^\/contribute$/, }; $( document ).ready(function(){ diff --git a/tmpl/skel.en b/tmpl/skel.en index 19377d9..792da5a 100644 --- a/tmpl/skel.en +++ b/tmpl/skel.en @@ -17,6 +17,7 @@
  • Theme