Skip to content
This repository has been archived by the owner on Feb 25, 2024. It is now read-only.

Commit

Permalink
Merge branch 'release/4.0.1' into 'master'
Browse files Browse the repository at this point in the history
Release/4.0.1

See merge request Apps/ILIAS-Pegasus!78
  • Loading branch information
Jonathan Gerber committed May 6, 2020
2 parents 57d5a09 + cd828ff commit 7c49969
Show file tree
Hide file tree
Showing 2,532 changed files with 93,652 additions and 147,606 deletions.
2 changes: 2 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
MAPBOX_API_KEY=YOUR_API_KEY
PRODUCTION=false
14 changes: 11 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ log.txt
.vscode/
npm-debug.log*
server.config.json
server.config20*

.idea/
.sourcemaps/
Expand All @@ -26,16 +27,19 @@ server.config.json
coverage/
dist/
node_modules/
out-tsc/
e2e/
tmp/
temp/
hooks/
./hooks/
platforms/
plugins/
plugins/android.json
plugins/ios.json
$RECYCLE.BIN/
src/assets/*
resources
resources/
!branding/brands/*/resources/


bin/android-*-unsigned.apk
Expand All @@ -51,6 +55,10 @@ branding/common/config/server.config.json
src/assets/testinstallation_config.json
build*.sh
iq_config.xml

.env
src/environments/environment.ts
bin
simulation
.ionic/
./test/
./coverage/
47 changes: 37 additions & 10 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,43 @@
.test_browser: &test_browser
stage: test
before_script:
- npm ci
timeout: "15m"
variables:
npm_config_cache: &npm_cache_path "$CI_PROJECT_DIR/.node_cache_pegasus"
CHROME_BIN: "chromium-browser"
MAPBOX_API_KEY: "key-is-not-required"
PRODUCTION: "false"
script:
- npm run test:ci
coverage: '/All files \|\s*(\d+(\.\d+)?)/'

cache:
key: node
key: "ilias_pegasus_node_cache"
paths:
- node_modules

before_script:
- npm install
- *npm_cache_path

stages:
- lint
- test

test:
stage: test
script: npm test
tags:
- node
lint:
stage: lint
before_script:
- npm ci
timeout: "5m"
variables:
npm_config_cache: *npm_cache_path
script:
- npm run lint
allow_failure: true
image: node:lts-alpine

test:chrome_77:
<<: *test_browser
image: zenika/alpine-chrome:77-with-node

test:chrome_76:
<<: *test_browser
image: zenika/alpine-chrome:76-with-node

1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
prefer-offline=true
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12
81 changes: 20 additions & 61 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,67 +1,26 @@
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).
# Changelog
All notable changes to this project will be documented in this file.

## [3.0.0] – 2019-06-19
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).

### 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
- OnBoarding ( A bug that caused certain Android smartphones, especially Huawei & Samsung, that couldn't Skip onboarding)
- Loading spinner

### Changed
- Updated GoogleMaps
- Updated DocumentHandler for iOS

### Added
- Support for Android Oreo
- Support for iOS 12
- User Information on intial Sync

## [2.0.1] – 2018-07-08
### Added
- OnBoarding
- Information concerning EU DSGVO / GDPR
## [Unreleased]

## [2.0.0] – 2018-04-13
### Added
- Learnplace feature
- News
- ILIAS Icons
- Error handling
## [4.0.0] - 2019-11-05
### Added 👍
- MapBox support for "Learnplaces"
- Angular routing
- A changlog file
- Dynamic theming with the PegasusHelper plugin

### Changed
- File Handling updated / refactored
- New & faster way to download files
- ILIAS Links updated
- SSO Refactored
- General UI Design improvement
- Move to new Angular version
### Changed 🚀
- Angular Version
- Onboarding Layout
- ObjectList Layout
- Bump up to Ionic 4

### Removed
- Old Plugins
- Chromium Support (Crosswalk)
- Dropped Support for Android < 4.4
### Fixed 🦀
-Crash on

## [Unreleased]
### Added
### Changed
### Deprecated
### Removed
### Fixed
### Security
### Removed 👎
- GoogleMaps Support
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2018 IonicThemes

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Loading

0 comments on commit 7c49969

Please sign in to comment.