Merge pull request #577 from kbase/develop

Develop -> Master (1.6.1)

bower.json

@@ -28,7 +28,7 @@
         "datatables": "1.10.16",
         "file-saver": "1.3.4",
         "font-awesome": "4.7.0",
-        "google-code-prettify": "1.0.5",
+        "google-code-prettify": "1.0.5", 
         "handlebars": "4.0.11",
         "highlightjs": "9.10.0",
         "jquery": "2.2.4",

config/release.yml

@@ -6,4 +6,4 @@
 ---
 # Note that this file is merged into the master config in the release namespace.
 release:
-  version: 1.6.0
+  version: 1.6.1

package.json

@@ -50,7 +50,6 @@
         "karma-cli": "1.0.1",
         "karma-coverage": "1.1.1",
         "karma-jasmine": "1.1.1",
-        "karma-phantomjs-launcher": "1.0.4",
         "karma-requirejs": "1.1.0",
         "karma-webdriver-launcher": "1.0.5",
         "lodash": "4.17.5",
@@ -66,7 +65,6 @@
         "underscore": "1.8.3",
         "wdio-dot-reporter": "0.0.9",
         "wdio-jasmine-framework": "^0.3.1",
-        "wdio-phantomjs-service": "^0.2.2",
         "wdio-selenium-standalone-service": "0.0.9",
         "wdio-sauce-service": "0.4.8",
         "webdriverio": "4.10.2"

release-notes/RELEASE_NOTES_1.6.1.md

@@ -0,0 +1,30 @@
+# KBase kbase-ui 1.6.1 Release Notes
+
+Just a quick patch to fix the release notes file name.
+
+## CHANGES
+
+### NEW
+
+n/a
+
+### REMOVED
+
+last phantomjs dependencies removed, speeding up build
+
+
+### UNRELEASED
+
+n/a
+
+### IMPROVEMENTS
+
+n/a
+
+### FIXES
+
+release notes for 1.6.0 correctly named.
+
+## Dependency Changes
+
+many transitive node dependencies removed with the removal of phantomjs; only affects build

release-notes/index.md

@@ -6,13 +6,15 @@
 
 | Version                           | Date       | Notes               |
 |-----------------------------------|------------|---------------------|
-| [1.6.0](RELEASE_NOTES_1.6.0.html) | 2018-02-20 |  |
-| [1.5.5](RELEASE_NOTES_1.5.5.html) | 2018-02-06 |  |
-| [1.5.4](RELEASE_NOTES_1.5.4.html) | 2018-02-01 |  |
-| [1.5.3](RELEASE_NOTES_1.5.3.html) | 2018-02-01 |  |
-| [1.5.2](RELEASE_NOTES_1.5.2.html) | 2018-01-25 |  |
-| [1.5.0](RELEASE_NOTES_1.5.0.html) | 2018-01-25 | First release notes || [1.5.1](RELEASE_NOTES_1.5.1.html) | 2018-01-25 |  |
-| [1.5.0](RELEASE_NOTES_1.5.0.html) | 2018-01-25 | First release notes |
+| [1.6.1](RELEASE_NOTES_1.6.1.md) | 2018-02-20 |  |
+| [1.6.0](RELEASE_NOTES_1.6.0.md) | 2018-02-20 |  |
+| [1.5.5](RELEASE_NOTES_1.5.5.md) | 2018-02-06 |  |
+| [1.5.4](RELEASE_NOTES_1.5.4.md) | 2018-02-01 |  |
+| [1.5.3](RELEASE_NOTES_1.5.3.md) | 2018-02-01 |  |
+| [1.5.2](RELEASE_NOTES_1.5.2.md) | 2018-01-25 |  |
+| [1.5.0](RELEASE_NOTES_1.5.0.md) | 2018-01-25 | First release notes |
+| [1.5.1](RELEASE_NOTES_1.5.1.md) | 2018-01-25 |  |
+| [1.5.0](RELEASE_NOTES_1.5.0.md) | 2018-01-25 | First release notes |
 | 1.4.6                             | 2017-06-22 |  |
 | 1.4.5                             | 2017-06-17 |  |
 | 1.4.4                             | 2017-06-16 |  |