Merge branch 'release-5.20.4'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wise",
-  "version": "5.20.3",
+  "version": "5.20.4",
   "description": "Web-based Inquiry Science Environment",
   "main": "app.js",
   "browserslist": [

pom.xml

@@ -34,7 +34,7 @@
   <artifactId>wise</artifactId>
   <packaging>war</packaging>
   <name>Web-based Inquiry Science Environment</name>
-  <version>5.20.3</version>
+  <version>5.20.4</version>
   <url>http://wise5.org</url>
   <licenses>
     <license>

src/main/resources/version.txt

@@ -1 +1 @@
-5.20.3
+5.20.4

src/main/webapp/site/src/app/about/about-routing.module.ts

@@ -1,13 +1,11 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AboutComponent } from "./about.component";
+import { AboutComponent } from './about.component';
 
-const aboutRoutes: Routes = [
-  { path: '', component: AboutComponent }
-];
+const aboutRoutes: Routes = [{ path: '', component: AboutComponent }];
 
 @NgModule({
-  imports: [ RouterModule.forChild(aboutRoutes) ],
-  exports: [ RouterModule ]
+  imports: [RouterModule.forChild(aboutRoutes)],
+  exports: [RouterModule]
 })
-export class AboutRoutingModule { }
+export class AboutRoutingModule {}

src/main/webapp/site/src/app/about/about.component.spec.ts

@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { NO_ERRORS_SCHEMA } from "@angular/core";
+import { NO_ERRORS_SCHEMA } from '@angular/core';
 
 import { AboutComponent } from './about.component';
 
@@ -9,10 +9,9 @@ describe('AboutComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ AboutComponent ],
-      schemas: [ NO_ERRORS_SCHEMA ]
-    })
-    .compileComponents();
+      declarations: [AboutComponent],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
   }));
 
   beforeEach(() => {

src/main/webapp/site/src/app/about/about.component.ts

@@ -6,10 +6,7 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./about.component.scss']
 })
 export class AboutComponent implements OnInit {
+  constructor() {}
 
-  constructor() { }
-
-  ngOnInit() {
-  }
-
+  ngOnInit() {}
 }

src/main/webapp/site/src/app/about/about.module.ts

@@ -3,24 +3,13 @@ import { CommonModule } from '@angular/common';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { MatIconModule } from '@angular/material/icon';
 
-import { AboutComponent } from "./about.component";
-import { AboutRoutingModule } from "./about-routing.module";
-import { SharedModule } from "../modules/shared/shared.module";
+import { AboutComponent } from './about.component';
+import { AboutRoutingModule } from './about-routing.module';
+import { SharedModule } from '../modules/shared/shared.module';
 
 @NgModule({
-  imports: [
-    CommonModule,
-    FlexLayoutModule,
-    MatIconModule,
-    AboutRoutingModule,
-    SharedModule
-  ],
-  declarations: [
-    AboutComponent
-  ],
-  exports: [
-    AboutComponent,
-    SharedModule
-  ]
+  imports: [CommonModule, FlexLayoutModule, MatIconModule, AboutRoutingModule, SharedModule],
+  declarations: [AboutComponent],
+  exports: [AboutComponent, SharedModule]
 })
-export class AboutModule { }
+export class AboutModule {}