Merge branch 'develop' into feature/#216-infobox

.github/CONTRIBUTING.md

@@ -1,33 +1,30 @@
 # How to Contribute?
 
 ## Project members
-
 - Create an issue
 - Create a branch for that issue with the naming: 
   `feature/{ticket-no}-{description-separated-by-dashes}`
 - Develop your code
 - Commit and push in regular intervalls
 - Run the tests locally
-- Add a line to the [CHANGELOG.md](https://github.com/h-da/geli/blob/develop/CHANGELOG.md) under the "NEXT" section
+- Add a line to the [CHANGELOG.md](https://github.com/h-da/geli/blob/develop/CHANGELOG.md) under the "NEXT" section in the form `- a short text to describe [#123](https://github.com/h-da/geli/issues/123)`
 - Open a Pull-Request
 - If CI/Coverage give their OK we can merge
 - The PR gets merged to `develop`, which will push a new Docker-Image-Version with the tag `develop` and `latest`
 - The staging-system will then be updated to the latest Image from Docker-Hub
 - If we have enough features we will merge the `develop` into the `master` branch, which will add 
-  a new 'stable' image on Docker-Hub. 
+  a new 'stable' image on Docker-Hub. Before we do this, the new version needs to be updated in several `package.json`s and the `CHANGELOG.md`.
   The livesysten then pulls that new image and starts up with the latest stable version
 
-If we have a small bugfixes we create a `bugfix/{descriptive-name}` and open a PR, issues are not required 
+If we have small bugfixes we create a `bugfix/{descriptive-name}` and open a PR, issues are not required 
 for that. But it's important to have a good description of the bugfix in the PR-Comment.
-If it is not small please create a issue for it so we can decide the importance of it.
+If it is not a small bug please create a issue for it so we can decide the importance of it.
 
 
 ## Branching model
-
 We are using a slightly modified [GitFlow](https://datasift.github.io/gitflow/IntroducingGitFlow.html) branching strategy.
 
 
 ## Commit messages
-
 Please adhere to the principles described [here](https://chris.beams.io/posts/git-commit/) for 
 writing commit messages.

.travis.yml

@@ -62,6 +62,8 @@ install:
   - cd ..
 
 script:
+  # check for change in changelog
+  - .travis/changelog.sh
   # check for versions
   - .travis/check-version.sh
   # run license checker and write license.json / dependencies.ts

.travis/changelog.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# Path to this file
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+# Path the script was called from
+IPWD="$(pwd)"
+# Import shared vars
+. ${DIR}/_shared-vars.sh
+
+echo
+echo "+++ Check if changelog was updated +++"
+echo
+
+
+if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_BRANCH" == "develop" ]; then
+  echo "+ detected pull request from ($TRAVIS_PULL_REQUEST_BRANCH) to $TRAVIS_BRANCH"
+  curl --silent https://raw.githubusercontent.com/h-da/geli/$TRAVIS_BRANCH/CHANGELOG.md \
+  | diff CHANGELOG.md - \
+  | grep -P '^< - .{8,}' - -q
+
+  if [[ $? == 0 ]]; then
+    echo -e "${GREEN}+ Update in CHANGELOG.md found, exit${NC}"
+  else
+    echo -e "${RED}+ ERROR: No Update in CHANGELOG.md found!"
+    echo -e "+ Please check if a line was added in the CHANGELOG.md.${NC}"
+    exit 1
+  fi
+elif [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
+  echo "+ detected pull request from ($TRAVIS_PULL_REQUEST_BRANCH) to $TRAVIS_BRANCH"
+  curl --silent https://raw.githubusercontent.com/h-da/geli/$TRAVIS_BRANCH/CHANGELOG.md \
+  | diff CHANGELOG.md - \
+  | grep -P '^< ## \[\d{1,3}\.\d{1,3}\.\d{1,3}\] - \d{4}-\d{2}-\d{2} - .{10,}' - -q
+
+  if [[ $? == 0 ]]; then
+    echo -e "${GREEN}+ Update in CHANGELOG.md found, exit${NC}"
+  else
+    echo -e "${RED}+ ERROR: No Update in CHANGELOG.md found!"
+    echo -e "+ Please check if a new version was added in the CHANGELOG.md."
+    echo -e "+ Or a new section for the next release was added${NC}"
+    exit 1
+  fi
+else
+  echo -e "${YELLOW}+ WARNING: No Pull Request agiainst Develop or Master -> skipping automate changelog checking${NC}";
+fi

.travis/check-version.sh

@@ -10,7 +10,7 @@ IPWD="$(pwd)"
 PATHS_TO_CHECK=("api" "app/webFrontend")
 
 echo
-echo "+++ Check if current version already used"
+echo "+++ Check if current version already used +++"
 echo
 
 # If is PR against master

CHANGELOG.md

@@ -0,0 +1,70 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [NEXT] 
+
+
+## [0.6.0] - 2018-03-31 - Introduces MediaManager and some minor changes
+### Added
+- MediaManager for file management in courses
+
+
+## [0.5.0] - 2018-03-24 - WS 17/18 intermediate Release
+### Added
+- selective download of the course
+- progress dashboard for teacher
+- translateable frontend with i18n
+- notification system added
+- introduces new error message system
+- dark theme option
+- introducing an api documentation
+- courses are ordered by last visit
+- user password edit
+- adds imprint
+
+
+## [0.4.0] - 2017-12-04 - WS 17/18 Second feature release
+### Added
+- Responsivness improved
+- leave course function
+- delete course
+- import/export course function
+- free text mail to students
+- dragging content between lectures
+- consistent save and abort btns in units
+- progress component
+- duplication of lectures
+- randomize tasks after validation
+
+
+## [0.3.1] - 2017-11-05 - Dynamic db name update
+### Added
+- The possibility to use a other database name then 'test'
+
+
+## [0.3.0] - 2017-11-02
+### Added
+- a lot of major bugfixes and optimizations
+
+
+## [0.2.2] - 2017-10-19 - Security improvements
+### Added 
+- security for free courses
+
+
+## [0.2.1] - 2017-10-03 - First Live-Ready release
+### Added
+- first live functionality
+
+
+## [0.2.0] - 2017-06-29 - Almost production ready
+### Added
+- Many new feature for production
+
+
+## [0.1.0] - 2017-05-11 - Basics implemented
+### Added
+- Many basic implementations of ground functionality

app/webFrontend/src/app/about/general-info/contributors.ts

@@ -8,6 +8,11 @@ export class ContributorsList {
       new Contributor('Thomas', 'Sauer', '16WiSe', 'Initiator', 'thomassss')
       , new Contributor('Ute', 'Trapp', '17SuSe', 'Lecturer', 'utetrapp')
       , new Contributor('David', 'Müller', '17SuSe', 'Lecturer', 'd89')
+      // Contributors
+      , new Contributor('Steffen', 'Großpersky', '17SuSe', 'Contributor', 'grosspersky')
+      , new Contributor('Alexander', 'Eimer', '17SuSe', 'Contributor', 'aeimer')
+      , new Contributor('Ken', 'Hasenbank', '17SuSe', 'Contributor', 'khase')
+
       // Students
       , new Contributor('Tobias', 'Neumann', '18SuSe', 'Student', 'Gargamil')
       , new Contributor('Armel', 'Siewe', '18SuSe', 'Student', 'armel22')
@@ -28,15 +33,12 @@ export class ContributorsList {
       , new Contributor('Henrik', 'Ochs', '17WiSe', 'Student', 'HPunktOchs')
       , new Contributor('Felix', 'Brucker', '17SuSe', 'Student', 'felixbrucker', '17WiSe')
 
+      // Old Students
       , new Contributor('Patrick', 'Schmelmer', '17WiSe', 'Student', 'shelmz', '17WiSe')
       , new Contributor('Michael', 'Pahlke', '17WiSe', 'Student', 'micpah', '17WiSe')
-      , new Contributor('Alexander', 'Eimer', '17SuSe', 'Student', 'aeimer', '17WiSe')
-      , new Contributor('Steffen', 'Großpersky', '17SuSe', 'Contributor', 'grosspersky')
-      , new Contributor('Ken', 'Hasenbank', '17SuSe', 'Student', 'khase', '17WiSe')
       , new Contributor('Lukas', 'Korte', '17SuSe', 'Student', 'lukaskorte', '17WiSe')
       , new Contributor('Oliver', 'Neff', '17SuSe', 'Student', 'OliverNeff', '17WiSe')
       , new Contributor('Alexander', 'Weinfurter', '17SuSe', 'Student', 'alexweinfurter', '17WiSe')
-      // Old Students
       , new Contributor('Bernd', 'Noetscher', '17SuSe', 'Student', 'bernd-hda', '17SuSe')
     ];
   }