Merge pull request #7713 from jonboiser/merge-0.14.5-to-develop

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 List of the most important changes for each release.
 
-## 0.14.4
+## 0.14.5
+
+(Note: 0.14.4 contained a critical issue and was superseded by 0.14.5)
 
 ### Changed
 
@@ -22,7 +24,7 @@ List of the most important changes for each release.
 * Numerous visual and accessibility issues
 * Facilities could not be renamed if the only changes were to the casing of the name (e.g. changing "Facility" to "FACILITY")
 
-([0.14.4 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.14.4))
+([0.14.5 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.14.5))
 
 ## 0.14.3
 

kolibri/__init__.py

@@ -15,7 +15,7 @@
 
 #: This may not be the exact version as it's subject to modification with
 #: get_version() - use ``kolibri.__version__`` for the exact version string.
-VERSION = (0, 14, 5, "alpha", 0)
+VERSION = (0, 15, 0, "alpha", 0)
 
 __author__ = "Learning Equality"
 __email__ = "[email protected]"

kolibri/plugins/device/assets/src/views/DeviceTopNav.vue

@@ -35,6 +35,7 @@
       />
     </NavbarLink>
     <NavbarLink
+      v-if="isSuperuser"
       :title="$tr('infoLabel')"
       :link="$router.getRoute('DEVICE_INFO_PAGE')"
     >
@@ -45,6 +46,7 @@
       />
     </NavbarLink>
     <NavbarLink
+      v-if="isSuperuser"
       :title="$tr('settingsLabel')"
       :link="$router.getRoute('DEVICE_SETTINGS_PAGE')"
     >