Merge branch 'release/5'

CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [Build 5] - 2018-12-01
+
+### Added
+
+- Add meta title to courses (([#814](https://github.com/serlo-org/athene2/pull/814)))
+- Add share option to exercises ([#815](https://github.com/serlo-org/athene2/pull/815))
+- Add Sentry to monitor PHP runtime errors ([#816](https://github.com/serlo-org/athene2/pull/816))
+- Add versionized privacy policies ([#821](https://github.com/serlo-org/athene2/pull/821))
+
+### Changed
+
+- Update privacy policy because of switch from Fundraisingbox to twingle ([#821](https://github.com/serlo-org/athene2/pull/821))
+
+### Fixed
+
+- Display fields in compare view correctly ([#820](https://github.com/serlo-org/athene2/pull/820))
+
 ## [Build 4] - 2018-11-22
 
 ### Added
@@ -86,7 +103,8 @@ This release uses athene2-assets@3 (blue) ([Changelog](https://github.com/serlo-
 
 ## [Build 1] - 2017-10-05
 
-[unreleased]: https://github.com/serlo-org/athene2/compare/4...HEAD
+[unreleased]: https://github.com/serlo-org/athene2/compare/5...HEAD
+[build 5]: https://github.com/serlo-org/athene2/compare/4...5
 [build 4]: https://github.com/serlo-org/athene2/compare/3...4
 [build 3]: https://github.com/serlo-org/athene2/compare/2...3
 [build 2]: https://github.com/serlo-org/athene2/compare/e485b49b632799c6011e9ddf0be1efa56325a7ab...2

README.md

@@ -106,11 +106,18 @@ $ npm run build
 # Start the docker-compose cluster.
 # ps: The database import might take some time (1-10 minutes).
 
-# If you are on Windows, run this in regular cmd.exe
+# On Linux or macOS, just run the following command in a terminal. If you are on Windows, run this in regular cmd.exe
 
 $ docker-compose up --build
 ```
 
+**Hint:** If you've updated your local code repository with `git pull`, it could be necessary to update all PHP dependencies again, before running `docker-compose up --build`:
+
+```sh
+# Update PHP dependencies
+$ php composer.phar install
+```
+
 ### Setting up hosts
 
 On Windows, please add
@@ -126,7 +133,7 @@ restart your browser.
 On macOS:
 
 ```sh
-sudo nano /etc/hosts
+$ sudo nano /etc/hosts
 
 # add lines
 127.0.0.1    de.serlo.localhost
@@ -138,7 +145,7 @@ $ sudo killall -HUP mDNSResponder
 
 Now, open [de.serlo.localhost:4567](de.serlo.localhost:4567). Happy coding!
 
-ps: `de.serlo.localhost:4567` works for me in chrome but not in FireFox. Not sure why, but if it doesn't work try
+PS: `de.serlo.localhost:4567` works for me in Chrome but not in FireFox. Not sure why, but if it doesn't work try
 a different browser.
 
 ## Development

composer.json

@@ -15,7 +15,7 @@
   "require": {
     "doctrine/doctrine-orm-module": "=0.9.0",
     "zf-commons/zfc-rbac": "=2.3",
-    "php": ">=5.5",
+    "php": ">=7.0",
     "zf-commons/zfc-base": "=0.1.2",
     "zendframework/zendframework": "=2.4.13",
     "neilime/zf2-twb-bundle": "=2.6.1",
@@ -28,8 +28,8 @@
     "twig/twig": "=v1.20.0",
     "twig/extensions": "=v1.3.0",
     "google/cloud": "^0.32.1",
-    "roave/security-advisories": "dev-master",
-    "drewm/mailchimp-api": "^2.5"
+    "drewm/mailchimp-api": "^2.5",
+    "sentry/sentry": "^1.10"
   },
   "config": {
     "vendor-dir": "src/vendor"