Merge branch 'develop' into 'release/3.0.0'

Develop

See merge request Apps/ILIAS-Pegasus!46

CHANGELOG.md

@@ -1,6 +1,23 @@
 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).
 
+## [3.0.0] – 2019-06-19
+
+### Changed
+- Synchronization revised
+- User Interface completely revised
+- File Handling revised
+- Faster loading of metadata
+- Live loading of metadata
+- Favorites are offline available now
+
+### Added
+- Branding provider
+- Branding folder
+- Branded App files
+- Tile Home screen
+- Access to the repository (join courses)
+
 ## [2.0.2] – 2018-10-02
 
 ### Fixed

README.md

@@ -54,24 +54,31 @@ Install the Java 8 SDK from oracle. Java 9 and 10 are not supported at the momen
 <http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html>
 Add the path to your java runtime to the $JAVA_HOME environment variable.
 
-### Install
+### Install Dependencies
 Clone the project to your workspace.
 Change into the cloned project and install all dependencies.
 This could take several minutes.
 ```bash
 npm install
 ```
 
+### Configure your ILIAS Installation
+
+Copy and edit the template of s[server.config.json.template](../blob/master/branding/common/config/server.config.json.template)  and add the development ILIAS
+installation. 
+Save you configurationfile as server.config.json in branding/common/config. 
+Add you Installation id to the config.json file in your brand (eg. branding/brands/vanilla/config.json)
+
+### Install Brand
+[Choose your brand, following the README.md in the branding folder.](../blob/master/branding/README.md)
+
+### Install Platforms
+
 Install the both platforms.
 ```bash
 ionic cordova prepare
 ```
 
-Copy and edit the template of config.json and add the development ILIAS
-installation.
-```bash
-mv src/assets/config.json.template src/assets/config.json
-```
 
 ### Debug Build