Merge remote-tracking branch 'origin/enterprise' into frontend-extensions

2025-02-25 18:55:37 -06:00 · 2018-10-11 09:41:57 +02:00
parent f4a9817b94 a4f90fd10d
commit 5b46c08844
35 changed files with 11839 additions and 13 deletions
--- a/public/app/routes/routes.ts
+++ b/public/app/routes/routes.ts
@@ -226,6 +226,11 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
        component: () => ServerStats,
      },
    })
+    .when('/admin/licensing', {
+      templateUrl: 'public/app/features/admin/partials/licensing.html',
+      controller: 'AdminLicensingCtrl',
+      controllerAs: 'ctrl',
+    })
    // LOGIN / SIGNUP
    .when('/login', {
      templateUrl: 'public/app/partials/login.html',