diff --git a/CHANGELOG b/CHANGELOG index 978f6f67..cb9995da 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,9 @@ v 2.0.2 - fields autocomplete is disabled on the profile page - users are able to delete their account again - chinese and malaysian translation files are now correctly loaded - - software version in user-agent when fetching feeds is no longer hardcoded + - software version in user-agent when fetching feeds is no longer hardcoded + - admin settings page is now read only, settings are configured in config.yml + - added link to metrics on the admin settings page v 2.0.1 - the redis pool no longer throws an exception when it is unable to aquire a new connection v2.0.0 diff --git a/src/main/app/js/controllers.js b/src/main/app/js/controllers.js index 169d86bd..35e2daa3 100644 --- a/src/main/app/js/controllers.js +++ b/src/main/app/js/controllers.js @@ -1432,6 +1432,9 @@ module.controller('ManageSettingsCtrl', ['$scope', '$location', '$state', 'Admin $scope.toUsers = function() { $state.transitionTo('admin.userlist'); }; + $scope.toMetrics = function() { + $state.transitionTo('admin.metrics'); + }; }]); module.controller('HelpController', ['$scope', 'CategoryService', 'AnalyticsService', 'ServerService', diff --git a/src/main/app/templates/admin.settings.html b/src/main/app/templates/admin.settings.html index e45d153f..e9809291 100644 --- a/src/main/app/templates/admin.settings.html +++ b/src/main/app/templates/admin.settings.html @@ -1,10 +1,14 @@