Merge branch 'master' into DieJudoGürtelprüfung

.gitmodules

@@ -1,7 +1,4 @@
-[submodule "homepage/materialize"]
-	path = submodules/materialize
-	url = https://github.com/materializecss/materialize.git
-[submodule "homepage/redesign2018/markdownExperiment/zopfli"]
+[submodule "submodules/zopfli"]
 	path = submodules/zopfli
 	url = https://github.com/google/zopfli.git
 [submodule "submodules/parsedown"]
@@ -13,3 +10,6 @@
 [submodule "submodules/lite-youtube-embed"]
 	path = submodules/lite-youtube-embed
 	url = https://github.com/paulirish/lite-youtube-embed.git
+[submodule "submodules/materialize"]
+	path = submodules/materialize
+	url = https://github.com/materializecss/materialize.git

findBiggies.sh

@@ -1,34 +1,34 @@
-#!/bin/bash
-#set -x 
-
-# Shows you the largest objects in your repo's pack file.
-# Written for osx.
-#
-# @see https://stubbisms.wordpress.com/2009/07/10/git-script-to-show-largest-pack-objects-and-trim-your-waist-line/
-# @author Antony Stubbs
-
-# set the internal field spereator to line break, so that we can iterate easily over the verify-pack output
-IFS=$'\n';
-
-# list all objects including their size, sort by size, take top 10
-objects=`git verify-pack -v .git/objects/pack/pack-*.idx | grep -v chain | sort -k3nr | head`
-
-echo "All sizes are in kB's. The pack column is the size of the object, compressed, inside the pack file."
-
-output="size,pack,SHA,location"
-allObjects=`git rev-list --all --objects`
-for y in $objects
-do
-    # extract the size in bytes
-    size=$((`echo $y | cut -f 5 -d ' '`/1024))
-    # extract the compressed size in bytes
-    compressedSize=$((`echo $y | cut -f 6 -d ' '`/1024))
-    # extract the SHA
-    sha=`echo $y | cut -f 1 -d ' '`
-    # find the objects location in the repository tree
-    other=`echo "${allObjects}" | grep $sha`
-    #lineBreak=`echo -e "\n"`
-    output="${output}\n${size},${compressedSize},${other}"
-done
-
-echo -e $output | column -t -s ', '
+# !/usr/bin/env bash
+#set -x 
+
+# Shows you the largest objects in your repo's pack file.
+# Written for osx.
+#
+# @see https://stubbisms.wordpress.com/2009/07/10/git-script-to-show-largest-pack-objects-and-trim-your-waist-line/
+# @author Antony Stubbs
+
+# set the internal field spereator to line break, so that we can iterate easily over the verify-pack output
+IFS=$'\n';
+
+# list all objects including their size, sort by size, take top 10
+objects=`git verify-pack -v .git/objects/pack/pack-*.idx | grep -v chain | sort -k3nr | head`
+
+echo "All sizes are in kB's. The pack column is the size of the object, compressed, inside the pack file."
+
+output="size,pack,SHA,location"
+allObjects=`git rev-list --all --objects`
+for y in $objects
+do
+    # extract the size in bytes
+    size=$((`echo $y | cut -f 5 -d ' '`/1024))
+    # extract the compressed size in bytes
+    compressedSize=$((`echo $y | cut -f 6 -d ' '`/1024))
+    # extract the SHA
+    sha=`echo $y | cut -f 1 -d ' '`
+    # find the objects location in the repository tree
+    other=`echo "${allObjects}" | grep $sha`
+    #lineBreak=`echo -e "\n"`
+    output="${output}\n${size},${compressedSize},${other}"
+done
+
+echo -e $output | column -t -s ', '

homepage/config/cwsvJudo.config.php

@@ -0,0 +1,6 @@
+<?php
+$cwsvJudoConfig["db"]["host"]     = "127.0.0.1";
+$cwsvJudoConfig["db"]["name"]     = "cwsvjudo";
+$cwsvJudoConfig["db"]["user"]     = "cwsvjudo";
+$cwsvJudoConfig["db"]["password"] = "***REMOVED***";
+?>

homepage/cwsvJudo/.gitignore

@@ -0,0 +1,2 @@
+build/*
+temp/*

homepage/cwsvJudo/config/.htaccess

@@ -0,0 +1,3 @@
+order deny,allow
+deny from all
+allow from localhost

homepage/cwsvJudo/config/phpcount.config.php

@@ -0,0 +1,10 @@
+<?php
+$phpcountConfig["db"]["host"]     = "localhost";
+$phpcountConfig["db"]["name"]     = "cwsvjudo";
+$phpcountConfig["db"]["user"]     = "cwsvjudo";
+$phpcountConfig["db"]["password"] = "***REMOVED***";
+
+$phpcountConfig["db"]["hitsTable"]     = "phpcount_hits";
+$phpcountConfig["db"]["nodupesTable"]  = "phpcount_nodupes";
+$phpcountConfig["db"]["pagehitsTable"] = "phpcount_pageHits";
+?>