Merge pull request #1250 from geli-lms/develop

Release 0.8.6
geli-lms · May 7, 2019 · e42e7b8 · e42e7b8
2 parents 9da18cf + d3bc122
commit e42e7b8
Show file tree

Hide file tree

Showing 47 changed files with 3,960 additions and 2,356 deletions.
diff --git a/.travis/changelog.sh b/.travis/changelog.sh
@@ -41,7 +41,7 @@ if [[ ${TRAVIS_BRANCH} == "master" ]]; then
   echo "+ Pull Request from ${TRAVIS_PULL_REQUEST_BRANCH} to ${TRAVIS_BRANCH}"
   curl --silent "https://raw.githubusercontent.com/geli-lms/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
+  | grep -P '^< ## \[\d{1,3}\.\d{1,3}\.\d{1,3}\].* - \d{4}-\d{2}-\d{2} - .{10,}' - -q
   RESULT=$?;
 
   if [[ ${RESULT} -eq 0 ]]; then

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,7 +12,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-## [[0.8.5](https://github.com/geli-lms/geli/releases/tag/v0.8.5)] - 2019-03-26 - WS 18/19 🎉-Release
+## [0.8.6] - 2019-05-07 - WS 18/19 🏁-Release
+### Added
+- Add new unit type `Assignment`. [#600](https://github.com/geli-lms/geli/issues/600)
+
+### Changed
+- Bump version number to 0.8.6. [#1206](https://github.com/geli-lms/geli/pull/1206)
+- Refactor `DownloadController`. [#913](https://github.com/geli-lms/geli/issues/913)
+- Timeout for pdf export tests increased. [#1248](https://github.com/geli-lms/geli/pull/1248)
+
+### Fixed
+- Apidoc: parser plugin 'param' not found in block. [#1207](https://github.com/geli-lms/geli/pull/1207)
+
+## [0.8.5] - 2019-03-26 - WS 18/19 🎉-Release
 ### Added
 - Translatable SnackBarService. [#922](https://github.com/geli-lms/geli/issues/922)
 - `ProgressController` `GET` unit tests & access denial tests in general. [#1116](https://github.com/geli-lms/geli/issues/1116)
@@ -48,7 +60,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Close `WhitelistController` vulnerabilities. [#1192](https://github.com/geli-lms/geli/issues/1192)
 - Close `MediaController` vulnerabilities. [#1196](https://github.com/geli-lms/geli/issues/1196)
 
-## [[0.8.4](https://github.com/geli-lms/geli/releases/tag/v0.8.4)] - 2018-12-20 - WS 18/19 ❄️-Release
+## [0.8.4] - 2018-12-20 - WS 18/19 ❄️-Release
 ### Added
 - Export PDF with styled free text units. [#997](https://github.com/geli-lms/geli/issues/997) [#1047](https://github.com/geli-lms/geli/pull/1047)
 - More predefined custom containers. [#996](https://github.com/geli-lms/geli/issues/996)
@@ -57,8 +69,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Various `NotificationController` unit tests (`200`s, `400`s, `403`s, `404`s). [#1065](https://github.com/geli-lms/geli/issues/1065)
 - Two `NotificationSettingsController` unit tests for `403` & `404` `PUT` request errors. [#1072](https://github.com/geli-lms/geli/issues/1072)
 - `TestHelper` request methods for `PUT` & `DELETE`. [#1041](https://github.com/geli-lms/geli/issues/1041)
-- Code kata validation service. [#844](https://github.com/geli-lms/geli/issues/844)
-- File ↔ video unit display type switching. [#912](https://github.com/geli-lms/geli/issues/912)
+- CodeKata validation service. [#844](https://github.com/geli-lms/geli/issues/844)
+- Course: Added switch for file <-> video unit. [#912](https://github.com/geli-lms/geli/issues/912)
 
 ### Fixed
 - `bundle.scss` not available in api container. [#1052](https://github.com/geli-lms/geli/issues/1052)
@@ -99,7 +111,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Secure `{put} /api/notificationSettings/` by using the `@CurrentUser` instead of allowing arbitrary id requests. [#1072](https://github.com/geli-lms/geli/issues/1072)
 - Minimize `NotificationSettingsController` attack surface by severely simplifying its routes. [#1072](https://github.com/geli-lms/geli/issues/1072)
 
-## [[0.8.3](https://github.com/geli-lms/geli/releases/tag/v0.8.3)] - 2018-11-29 - WS 18/19 🚀-Release
+## [0.8.3] - 2018-11-29 - WS 18/19 🚀-Release
 ### Added
 - Chat system access denial unit tests. [#989](https://github.com/geli-lms/geli/issues/989)
 - `DuplicationController` access denial (`403`) unit tests. [#1016](https://github.com/geli-lms/geli/issues/1016)
@@ -142,7 +154,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fix missing `teacher` authorization checks in the `ExportController` `course`/`lecture`/`unit` routes. [#1039](https://github.com/geli-lms/geli/issues/1039)
 - Update `node` to latest LTS (Long Term Support) version. [#1019](https://github.com/geli-lms/geli/issues/1019)
 
-## [[0.8.2](https://github.com/geli-lms/geli/releases/tag/v0.8.2)] - 2018-11-08 - WS 18/19 🍪-Release
+## [0.8.2] - 2018-11-08 - WS 18/19 🍪-Release
 ### Added
 - My courses: Make title or teaser image clickable. [#904](https://github.com/geli-lms/geli/issues/904)
 - EU-DSGVO: Export Chat User Data. [#862](https://github.com/geli-lms/geli/issues/862)
@@ -171,11 +183,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Progress leak of invisible units and courses. [#735](https://github.com/geli-lms/geli/issues/735)
 - Reduce XSS attack surface by switching from `localStorage` tokens to `HttpOnly`, strict `SameSite` cookie-based JWT authentication. [#840](https://github.com/geli-lms/geli/issues/840)
 
-## [[0.8.1](https://github.com/geli-lms/geli/releases/tag/v0.8.1)] - 2018-10-31 - WS 18/19 Hotfix-Release
+## [0.8.1] - 2018-10-31 - WS 18/19 Hotfix-Release
 ### Fixed
 - People can enroll in courses again. [#942](https://github.com/geli-lms/geli/pull/942)
 
-## [[0.8.0](https://github.com/geli-lms/geli/releases/tag/v0.8.0)] - 2018-10-29 - WS 18/19 Bugfix & Tweak-Release
+## [0.8.0] - 2018-10-29 - WS 18/19 Bugfix & Tweak-Release
 ### Added
 - Cookie information banner. [#565](https://github.com/geli-lms/geli/pull/565)
 - Course progress can now be exported as a CSV-file. [#766](https://github.com/geli-lms/geli/pull/766)
@@ -275,7 +287,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Secure `DownloadController` → `getArchivedFile` → `id` input usage. [#729](https://github.com/geli-lms/geli/issues/729)
 - _(Scrapped experiment of a `@Controller`-based replacement for the static `'uploads'` route: `UploadsController`. [#729](https://github.com/geli-lms/geli/issues/729))_
 
-## [[0.7.0](https://github.com/geli-lms/geli/releases/tag/v0.7.0)] - 2018-05-05 - SS 18 intermediate Release
+## [0.7.0] - 2018-05-05 - SS 18 intermediate Release
 ### Added
 - A dedicated `FileViewComponent` and restyled the course section. [#599](https://github.com/geli-lms/geli/issues/599)
 - The possibility to sort all courses alphabetically. [#567](https://github.com/geli-lms/geli/issues/567)
@@ -338,12 +350,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fix multiple severe course related security issues. [#594](https://github.com/geli-lms/geli/issues/594) [#653](https://github.com/geli-lms/geli/issues/653) [#691](https://github.com/geli-lms/geli/issues/691)
 - Update the dependencies for security. [#661](https://github.com/geli-lms/geli/issues/661)
 
-## [[0.6.0](https://github.com/geli-lms/geli/releases/tag/v0.6.0)] - 2018-03-31 - Introduces MediaManager and some minor changes
+## [0.6.0] - 2018-03-31 - Introduces MediaManager and some minor changes
 ### Added
 - MediaManager for file management in courses
 
 
-## [[0.5.0](https://github.com/geli-lms/geli/releases/tag/v0.5.0)] - 2018-03-24 - WS 17/18 intermediate Release
+## [0.5.0] - 2018-03-24 - WS 17/18 intermediate Release
 ### Added
 - selective download of the course
 - progress dashboard for teacher
@@ -357,7 +369,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - adds imprint
 
 
-## [[0.4.0](https://github.com/geli-lms/geli/releases/tag/v0.4.0)] - 2017-12-04 - WS 17/18 Second feature release
+## [0.4.0] - 2017-12-04 - WS 17/18 Second feature release
 ### Added
 - Responsivness improved
 - leave course function
@@ -371,31 +383,50 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - randomize tasks after validation
 
 
-## [[0.3.1](https://github.com/geli-lms/geli/releases/tag/v0.3.1)] - 2017-11-05 - Dynamic db name update
+## [0.3.1] - 2017-11-05 - Dynamic db name update
 ### Added
 - The possibility to use a other database name then 'test'
 
 
-## [[0.3.0](https://github.com/geli-lms/geli/releases/tag/v0.3.0)] - 2017-11-02
+## [0.3.0] - 2017-11-02
 ### Added
 - a lot of major bugfixes and optimizations
 
 
-## [[0.2.2](https://github.com/geli-lms/geli/releases/tag/v0.2.2)] - 2017-10-19 - Security improvements
+## [0.2.2] - 2017-10-19 - Security improvements
 ### Added 
 - security for free courses
 
 
-## [[0.2.1](https://github.com/geli-lms/geli/releases/tag/v0.2.1)] - 2017-10-03 - First Live-Ready release
+## [0.2.1] - 2017-10-03 - First Live-Ready release
 ### Added
 - first live functionality
 
 
-## [[0.2.0](https://github.com/geli-lms/geli/releases/tag/v0.2.0)] - 2017-06-29 - Almost production ready
+## [0.2.0] - 2017-06-29 - Almost production ready
 ### Added
 - Many new feature for production
 
 
-## [[0.1.0](https://github.com/geli-lms/geli/releases/tag/v0.1.0)] - 2017-05-11 - Basics implemented
+## [0.1.0] - 2017-05-11 - Basics implemented
 ### Added
 - Many basic implementations of ground functionality
+
+[Unreleased]: https://github.com/geli-lms/geli/compare/v0.8.6...HEAD
+[0.8.6]: https://github.com/geli-lms/geli/compare/v0.8.5...v0.8.6
+[0.8.5]: https://github.com/geli-lms/geli/compare/v0.8.4...v0.8.5
+[0.8.4]: https://github.com/geli-lms/geli/compare/v0.8.3...v0.8.4
+[0.8.3]: https://github.com/geli-lms/geli/compare/v0.8.2...v0.8.3
+[0.8.2]: https://github.com/geli-lms/geli/compare/v0.8.1...v0.8.2
+[0.8.1]: https://github.com/geli-lms/geli/compare/v0.8.0...v0.8.1
+[0.8.0]: https://github.com/geli-lms/geli/compare/v0.7.0...v0.8.0
+[0.7.0]: https://github.com/geli-lms/geli/compare/v0.6.0...v0.7.0
+[0.6.0]: https://github.com/geli-lms/geli/compare/v0.5.0...v0.6.0
+[0.5.0]: https://github.com/geli-lms/geli/compare/v0.4.0...v0.5.0
+[0.4.0]: https://github.com/geli-lms/geli/compare/v0.3.1...v0.4.0
+[0.3.1]: https://github.com/geli-lms/geli/compare/v0.3.0...v0.3.1
+[0.3.0]: https://github.com/geli-lms/geli/compare/v0.2.2...v0.3.0
+[0.2.2]: https://github.com/geli-lms/geli/compare/v0.2.1...v0.2.2
+[0.2.1]: https://github.com/geli-lms/geli/compare/v0.2.0...v0.2.1
+[0.2.0]: https://github.com/geli-lms/geli/compare/v0.1.0...v0.2.0
+[0.1.0]: https://github.com/geli-lms/geli/releases/tag/v0.1.0
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,3 +1,15 @@
+# Upgrade from 0.8.4 to 0.8.5
+
+- MediaController vulnerabilities [#1196](https://github.com/geli-lms/geli/issues/1196) requires database migration
+
+### Production / Staging
+
+`docker-compose run --rm api node migrate.js --up 20190323-course-media`
+
+### Develop
+
+`npm run migrate -- --up 20190323-course-media`
+
 # Upgrade from 0.8.0 to 0.8.1
 
 - Invalid course chatroom [#942](https://github.com/geli-lms/geli/pull/942) requires database migration

diff --git a/api/fixtures/FixtureLoader.ts b/api/fixtures/FixtureLoader.ts
@@ -113,7 +113,7 @@ export class FixtureLoader {
     }));
 
     // import messages
-    this.loadMessages();
+    await this.loadMessages();
 
     // import files
     const fileUnits = await Unit.find({files: {$exists: true}});

diff --git a/api/fixtures/FixtureUtils.ts b/api/fixtures/FixtureUtils.ts
@@ -45,6 +45,11 @@ export class FixtureUtils {
     return await User.findById(user);
   }
 
+  public static async getRandomStudentForCourse(course: ICourse, hash?: string): Promise<IUserModel> {
+    const user = await this.getRandom<IUser>([...course.students], hash);
+    return await User.findById(user);
+  }
+
   public static async getRandomTeachers(min: number, max: number, hash?: string): Promise<IUser[]> {
     const array = await this.getTeacher();
     return this.getRandomArray<IUser>(array, min, max, hash);

diff --git a/api/fixtures/binaryData/small-image.jpg b/api/fixtures/binaryData/small-image.jpg
diff --git a/api/fixtures/courses/Computer-Graphics.json b/api/fixtures/courses/Computer-Graphics.json
@@ -76,6 +76,13 @@
           "markdown": "### Little afraid \nits eat looked now. Very ye lady girl them good me make. It hardly cousin me always. An shortly village is raising we shewing replied. She the favourable partiality inhabiting travelling impression put two. His six are entreaties instrument acceptance unsatiable her. Amongst as or on herself chapter entered carried no. Sold old ten are quit lose deal his sent. You correct how sex several far distant believe journey parties. We shyness enquire uncivil affixed it carried to. ",
           "visible": true,
           "__t": "free-text"
+        },
+        {
+          "name": "Send in your assignments",
+          "description": "---",
+          "visible": true,
+          "__t": "assignment",
+          "deadline": "2040-12-21T19:00:00.000Z"
         }
       ]
     },