Merge branch 'release/4.2.0' into 'master'

Release 4.2.0

Closes ILIASAPP-797, ZWH-96, ZWH-95, ILIASAPP-789, ILIASAPP-787, and ILIASAPP-788

See merge request Apps/ILIAS-Pegasus!109

.gitignore

@@ -14,12 +14,12 @@ log.txt
 *.keystore
 *.jks
 *_config.json
+server.config20*
 .vscode/
 npm-debug.log*
 server.config.json
 server.config20*
 
-.idea/
 .sourcemaps/
 .sass-cache/
 .tmp/
@@ -62,3 +62,95 @@ simulation
 .ionic/
 ./test/
 ./coverage/
+build.json
+
+
+# Created by https://www.toptal.com/developers/gitignore/api/webstorm+iml
+# Edit at https://www.toptal.com/developers/gitignore?templates=webstorm+iml
+
+### WebStorm+iml ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### WebStorm+iml Patch ###
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
+*.iml
+modules.xml
+.idea/misc.xml
+*.ipr
+
+# End of https://www.toptal.com/developers/gitignore/api/webstorm+iml
+./build.json
+
+src/environments/environment.generated.ts
+src/environments/features.json

.npmrc

@@ -1 +1 @@
-prefer-offline=true
+prefer-offline=false

CHANGELOG.md

@@ -4,10 +4,25 @@ 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/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [4.2.0]
+### Added
+- Icons for all known ILIAS objects
+- Overlay icon for ILIAS objects which are not supported by the app.
 
-## [4.0.2] 2020-05-26
+## [4.0.4] 
+### Added
+- Support for ILIAS Universität zu Köln
+- Mergerd PR #1, thanks to @mhilbert! 
+- Mergerd PR #2, thanks to @fneumann!  
+
+## [4.0.3] 
+### Added
+- Support for ILIAS Dresden
 
+## [4.0.2] 2020-05-26
+### Added
+- Support for ILIAS BIWE
+- Support for ILIAS BBS III
 
 ### Fixed 🦀
 - Linked Objects (globe not adjusted)