From cbf3895fb11b069c3ac00c5fe1fb04b4bb931567 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 28 12월 2021 10:52:30 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/resources/system_prod.properties | 2 ++
src/main/webapp/index.html | 2 +-
src/main/webapp/scripts/main.js | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/system_prod.properties b/src/main/resources/system_prod.properties
index 4f46fd6..faf1461 100644
--- a/src/main/resources/system_prod.properties
+++ b/src/main/resources/system_prod.properties
@@ -71,6 +71,8 @@
# added by zenith at 20200623
use.aws=false
+use.scheduler=false
+
# upload path
attached.file.path=/dev-upload/
profile.file.path=/dev-profile
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index 7999ff3..8c5dedf 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -40,7 +40,7 @@
<link type="text/css" rel="stylesheet" href="custom_components/js-autocomplete-single/js-autocomplete-single.css">
<link type="text/css" rel="stylesheet" href="custom_components/js-autocomplete-multi/js-autocomplete-multi.css">
<link type="text/css" rel="stylesheet" href="custom_components/js-html-diff/js-html-diff.css">
- <link type="text/css" rel="stylesheet" href="assets/styles/main.css?version=0.9.4">
+ <link type="text/css" rel="stylesheet" href="assets/styles/main.css?version=1.0.0">
<link type="text/css" rel="stylesheet" href="https://fonts.googleapis.com/css?family=Rubik:300,400,500">
<!-- google font -->
diff --git a/src/main/webapp/scripts/main.js b/src/main/webapp/scripts/main.js
index 9224480..20165a1 100644
--- a/src/main/webapp/scripts/main.js
+++ b/src/main/webapp/scripts/main.js
@@ -4,7 +4,7 @@
'use strict';
require.config({
- urlArgs : "bust=v0.9.2",
+ urlArgs : "bust=v1.0.0",
paths : {
'jquery' : '../bower_components/jquery/dist/jquery',
'jquery-ui' : '../bower_components/jquery-ui/jquery-ui',
--
Gitblit v1.8.0