Merge branch 'release-5.14.1'

WISE-Community · Jul 16, 2020 · addf6ca · addf6ca
2 parents 62a2354 + eb1cf09
commit addf6ca
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wise",
-  "version": "5.14.0",
+  "version": "5.14.1",
   "description": "Web-based Inquiry Science Environment",
   "main": "app.js",
   "browserslist": [

diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,7 @@
   <artifactId>wise</artifactId>
   <packaging>war</packaging>
   <name>Web-based Inquiry Science Environment</name>
-  <version>5.14.0</version>
+  <version>5.14.1</version>
   <url>http://wise5.org</url>
   <licenses>
     <license>

diff --git a/src/main/resources/version.txt b/src/main/resources/version.txt
@@ -1 +1 @@
-5.14.0
+5.14.1
diff --git a/src/main/webapp/site/src/app/services/projectAssetService.ts b/src/main/webapp/site/src/app/services/projectAssetService.ts
@@ -74,7 +74,7 @@ export class ProjectAssetService {
   uploadAssets(files: any[]) {
     const url = this.ConfigService.getConfigParam('projectAssetURL');
     const formData = new FormData();
-    files.forEach((file: any) => formData.append('files', file));
+    files.forEach((file: any) => formData.append('files', file, file.name));
     return this.http.post(url, formData).pipe(
       map((data: any) => {
         this.setProjectAssets(data.assetDirectoryInfo);

diff --git a/src/main/webapp/wise5/components/discussion/discussionAuthoringController.ts b/src/main/webapp/wise5/components/discussion/discussionAuthoringController.ts
@@ -20,7 +20,6 @@ class DiscussionAuthoringController extends DiscussionController {
     'ProjectService',
     'StudentAssetService',
     'StudentDataService',
-    'StudentWebSocketService',
     'UtilService',
     '$mdMedia'
   ];
@@ -40,7 +39,6 @@ class DiscussionAuthoringController extends DiscussionController {
     ProjectService,
     StudentAssetService,
     StudentDataService,
-    StudentWebSocketService,
     UtilService,
     $mdMedia
   ) {
@@ -59,7 +57,6 @@ class DiscussionAuthoringController extends DiscussionController {
       ProjectService,
       StudentAssetService,
       StudentDataService,
-      StudentWebSocketService,
       UtilService,
       $mdMedia
     );

diff --git a/src/main/webapp/wise5/components/discussion/discussionController.ts b/src/main/webapp/wise5/components/discussion/discussionController.ts
@@ -2,15 +2,13 @@
 
 import ComponentController from '../componentController';
 import DiscussionService from './discussionService';
-import { StudentWebSocketService } from '../../services/studentWebSocketService';
 import NotificationService from '../../services/notificationService';
 
 class DiscussionController extends ComponentController {
   $mdMedia: any;
   $q: any;
   DiscussionService: DiscussionService;
   NotificationService: NotificationService;
-  StudentWebSocketService: StudentWebSocketService;
   studentResponse: string;
   newResponse: string;
   classResponses: any[];
@@ -36,7 +34,6 @@ class DiscussionController extends ComponentController {
     'ProjectService',
     'StudentAssetService',
     'StudentDataService',
-    'StudentWebSocketService',
     'UtilService',
     '$mdMedia'
   ];
@@ -56,7 +53,6 @@ class DiscussionController extends ComponentController {
     ProjectService,
     StudentAssetService,
     StudentDataService,
-    StudentWebSocketService,
     UtilService,
     $mdMedia
   ) {
@@ -78,7 +74,6 @@ class DiscussionController extends ComponentController {
     this.$q = $q;
     this.DiscussionService = DiscussionService;
     this.NotificationService = NotificationService;
-    this.StudentWebSocketService = StudentWebSocketService;
     this.$mdMedia = $mdMedia;
     this.studentResponse = '';
     this.newResponse = '';