Merge pull request #399 from UoA-eResearch/rc2.8.3

Rc2.8.3

Author: cakr322

cer-graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cer-graphql",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "description": "A GraphQL server used to proxy and authorise requests to external data sources.",
   "main": "build/index.js",
   "scripts": {

hub-search-proxy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hub-search-proxy",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "description": "Serverless Framework Lambda functions to interact with AWS ElasticSearch Service.",
   "main": "handler.js",
   "scripts": {

research-hub-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "research-hub-web",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "license": "MIT",
   "scripts": {
     "ng": "ng",

research-hub-web/src/app/components/layout/navbar/navbar.component.html

@@ -31,6 +31,9 @@
     <span class="hide-small" style="flex: 1 1 auto"></span>
 
     <!--Navigation buttons-->
+    <a mat-button class="hide-small overflow-ellipsis" [routerLink]="'/researcher-development'">
+      Researcher development
+    </a>
     <a mat-button class="hide-small" [routerLink]="'/categories'">
       Categories
     </a>
@@ -42,6 +45,7 @@
     ></ng-container>
   </mat-toolbar-row>
   <mat-toolbar-row class="navbar-row-show-small">
+    <a mat-button class="overflow-ellipsis" [routerLink]="'/researcher-development'">Researcher development</a>
     <a mat-button [routerLink]="'/categories'">Categories</a>
     <a mat-button [routerLink]="'/stage'">Research stage</a>
   </mat-toolbar-row>

research-hub-web/src/app/components/layout/search-filters/search-filters.component.html

@@ -23,7 +23,7 @@
     </mat-tab>
     <mat-tab
       [label]="
-        'Activities' +
+        'Research stage' +
         (activeFilters.stage.length > 0
           ? ' (' + activeFilters.stage.length + ')'
           : '')