Index: reference/gebo_admin_1.8.1/js/jquery-migrate.min.js
===================================================================
diff -u -rd9d0b06a382ed8e6db92c2a7add764e66d906b54 -r451f824cb6183fb3100b9bc32a6e781ffd61020e
--- reference/gebo_admin_1.8.1/js/jquery-migrate.min.js (.../jquery-migrate.min.js) (revision d9d0b06a382ed8e6db92c2a7add764e66d906b54)
+++ reference/gebo_admin_1.8.1/js/jquery-migrate.min.js (.../jquery-migrate.min.js) (revision 451f824cb6183fb3100b9bc32a6e781ffd61020e)
@@ -1,6 +1,4 @@
-// AdminLTE Gruntfile
module.exports = function (grunt) {
- // jshint ignore:line
"use strict";
grunt.initConfig({
@@ -9,9 +7,9 @@
server: {
options: {
//외부에서 개발
- port: 80,
+ //port: 80,
//내부에서 개발
- // port: 9999,
+ port: 9999,
hostname: "0.0.0.0",
middleware: function (connect, options, defaultMiddleware) {
defaultMiddleware.unshift(function (req, res, next) {
@@ -30,42 +28,42 @@
}
},
//로컬 개발 및 테스트용
- // proxies: [
- // {
- // context: ['/auth-anon', '/auth-user', '/auth-admin', '/auth-check', '/sso', '/dwr', '/logout', '/login', '/oauth2', '/arms-check',
- // '/swagger-ui.html', '/swagger-ui', '/webjars', '/swagger-resources', '/v2'],
- // host: '127.0.0.1',
- // port: 13131,
- // https: false,
- // changeOrigin: true
- // }
- // ]
- // 외부에서 개발
proxies: [
- {
- context: [
- "/auth-anon",
- "/auth-user",
- "/auth-admin",
- "/auth-check",
- "/sso",
- "/dwr",
- "/logout",
- "/login",
- "/oauth2",
- "/arms-check",
- "/swagger-ui.html",
- "/swagger-ui",
- "/webjars",
- "/swagger-resources",
- "/v2"
- ],
- host: "www.313.co.kr",
- port: 80,
- https: false,
- changeOrigin: true
- }
+ {
+ context: ['/auth-`anon', '/auth-user', '/auth-admin', '/auth-check', '/sso', '/dwr', '/logout', '/login', '/oauth2', '/arms-check',
+ '/swagger-ui.html', '/swagger-ui', '/webjars', '/swagger-resources', '/v2'],
+ host: '127.0.0.1',
+ port: 13131,
+ https: false,
+ changeOrigin: true
+ }
]
+ // 외부에서 개발
+ // proxies: [
+ // {
+ // context: [
+ // "/auth-anon",
+ // "/auth-user",
+ // "/auth-admin",
+ // "/auth-check",
+ // "/sso",
+ // "/dwr",
+ // "/logout",
+ // "/login",
+ // "/oauth2",
+ // "/arms-check",
+ // "/swagger-ui.html",
+ // "/swagger-ui",
+ // "/webjars",
+ // "/swagger-resources",
+ // "/v2"
+ // ],
+ // host: "www.313.co.kr",
+ // port: 80,
+ // https: false,
+ // changeOrigin: true
+ // }
+ // ]
}
},
watch: {
FishEye: Tag bc70f1f15ccafd91403b5bee3364fc19ddcabf5a refers to a dead (removed) revision in file `arms/html/dashboard/content-container.html'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag bc70f1f15ccafd91403b5bee3364fc19ddcabf5a refers to a dead (removed) revision in file `arms/html/dashboard/content-header.html'.
FishEye: No comparison available. Pass `N' to diff?
Index: arms/html/template/page-sidebar.html
===================================================================
diff -u -r74de6df651f26570833fc55a872c7922131b6419 -r451f824cb6183fb3100b9bc32a6e781ffd61020e
--- arms/html/template/page-sidebar.html (.../page-sidebar.html) (revision 74de6df651f26570833fc55a872c7922131b6419)
+++ arms/html/template/page-sidebar.html (.../page-sidebar.html) (revision 451f824cb6183fb3100b9bc32a6e781ffd61020e)
@@ -2,6 +2,20 @@
id="side-nav"
class="side-nav">
+
+
+
+
+