Merge pull request #663 from kbase/develop

develop -> master (1.6.10)
kbase · May 3, 2018 · 6de62e0 · 6de62e0
2 parents 0898956 + ea97a0c
commit 6de62e0
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 4 deletions.
diff --git a/config/app/dev/plugins.yml b/config/app/dev/plugins.yml
@@ -260,7 +260,7 @@ plugins:
     -
         name: narrative-info
         globalName: kbase-ui-plugin-narrative-info
-        version: 0.1.5
+        version: 1.1.1
         cwd: src/plugin
         source:
             bower: {}
@@ -271,6 +271,13 @@ plugins:
         cwd: src/plugin
         source: 
             bower: {}
+    -
+        name: report-viewer
+        globalName: kbase-ui-plugin-report-viewer
+        version: 0.1.0
+        cwd: src/plugin
+        source:
+            bower: {}
     # -
     #     name: example-clojurescript
     #     globalName: kbase-ui-plugin-example-clojurescript

diff --git a/config/app/prod/plugins.yml b/config/app/prod/plugins.yml
@@ -223,7 +223,7 @@ plugins:
     -
         name: narrative-info
         globalName: kbase-ui-plugin-narrative-info
-        version: 0.1.5
+        version: 1.1.1
         cwd: src/plugin
         source:
             bower: {}
diff --git a/config/release.yml b/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.9
+  version: 1.6.10
diff --git a/config/services.yml b/config/services.yml
@@ -47,6 +47,10 @@ services:
         aliases: ['narrative_job_service']
         url: '{{ deploy.services.urlBase }}/services/njs_wrapper'
         name: Narrative Job Service
+    KBaseDataImport:
+        aliases: ['data_import_export']
+        url: '{{ deploy.services.urlBase }}/services/data_import_export'
+        name: Data Import Export
     KBaseRelationEngine:
         aliases: ['reske']
         url: '{{ deploy.services.urlBase }}/services/reske'

diff --git a/release-notes/RELEASE_NOTES_1.6.10.md b/release-notes/RELEASE_NOTES_1.6.10.md
@@ -0,0 +1,30 @@
+# KBase kbase-ui 1.6.10 Release Notes
+
+This release brings a refresh of the new narrative-info plugin.
+
+## CHANGES
+
+### NEW
+
+none
+
+### REMOVED
+
+none
+
+### UNRELEASED
+
+- [SCT-805] narrative info ui improvements
+- [SCT-871] new report viewer landing page plugin, only in local dev build
+
+### IMPROVEMENTS
+
+none
+
+### FIXES
+
+none
+
+## Dependency Changes
+
+kbase-ui-plugin-narrative-info: 0.1.5 -> 1.1.1
diff --git a/release-notes/index.md b/release-notes/index.md
@@ -6,7 +6,8 @@
 
 | Version                           | Date       | Notes               |
 |-----------------------------------|------------|---------------------|
-| [1.6.9](RELEASE_NOTES_1.6.9.md) | 2018-04-23 |  |
+| [1.6.10](RELEASE_NOTES_1.6.10.md) | 2018-05-03 |  |
+| [1.6.9](RELEASE_NOTES_1.6.9.md) | 2018-05-02 |  |
 | [1.6.8](RELEASE_NOTES_1.6.8.md) | 2018-03-12 |  |
 | [1.6.7](RELEASE_NOTES_1.6.7.md) | 2018-03-12 |  |
 | [1.6.6](RELEASE_NOTES_1.6.6.md) | 2018-03-09 |  |