PR 버그 수정

language/en-US.json

@@ -233,11 +233,7 @@
                 "wiki_port" : "Wiki port number",
                 "wiki_secret_key" : "Wiki secret key",
                 "email_required" : "Email required",
-<<<<<<< HEAD
-                "google_imap_required" : "Google IMAP configuration required",
-=======
                 "smtp_setting_required" : "Email SMTP setting required",
->>>>>>> 2347c8d... Make smtp server configuarable
                 "update_branch" : "Branch to import updates",
                 "slow_edit" : "Continuous edit limit",
                 "requires_approval" : "Requires approval for register",
@@ -257,18 +253,12 @@
                 "edit_help" : "Editing textarea phrase",
             "_comment_2.2.4_" : "Google",
                 "recaptcha" : "reCAPTCHA",
-<<<<<<< HEAD
-                "google_imap" : "Google IMAP",
-                "google_email" : "Google email address",
-                "google_app_password" : "Google APP password",
-=======
                 "smtp_setting" : "Email SMTP setting",
                 "smtp_server" : "SMTP Server address",
                 "smtp_security": "SMTP Connection security",
                 "smtp_port" : "SMTP Server port",
                 "smtp_username" : "SMTP Username",
                 "smtp_password" : "SMTP Password",
->>>>>>> 2347c8d... Make smtp server configuarable
         "_comment_2.3_" : "List",
             "open_discussion_list" : "Open discussion(s) list",
             "discussion_list" : "Discussion(s) list",

language/ko-KR.json

@@ -186,11 +186,7 @@
     "wiki_logo": "위키 로고",
     "smtp_setting_required": "이메일 SMTP 설정 필요",
     "adsense_setting": "애드센스 설정",
-<<<<<<< HEAD
-    "google_email": "Google 이메일 주소",
-=======
     "smtp_username": "SMTP 아이디",
->>>>>>> 2347c8d... Make smtp server configuarable
     "previous": "이전",
     "name_or_ip_or_regex": "사용자 이름 혹은 IP 주소 혹은 정규표현식",
     "editor": "편집자",

route/setting.py

@@ -163,15 +163,9 @@ def setting_2(conn, num):
                         <input type="checkbox" name="reg" ''' + check_box_div[0] + '''> ''' + load_lang('no_register') + '''
                         <hr>
                         <input type="checkbox" name="ip_view" ''' + check_box_div[1] + '''> ''' + load_lang('hide_ip') + '''
-<<<<<<< HEAD
-                        <hr>
-                        <input type="checkbox" name="email_have" ''' + check_box_div[2] + '''> ''' + load_lang('email_required') + ' <a href="/setting/6">(' + load_lang('google_imap_required') + ''')</a>
-                        <hr>
-=======
                         <hr class=\"main_hr\">
                         <input type="checkbox" name="email_have" ''' + check_box_div[2] + '''> ''' + load_lang('email_required') + ' <a href="/setting/6">(' + load_lang('smtp_setting_required') + ''')</a>
                         <hr class=\"main_hr\">
->>>>>>> 2347c8d... Make smtp server configuarable
                         <input type="checkbox" name="requires_approval" ''' + check_box_div[3] + '''> ''' + load_lang('requires_approval') + '''
                         <hr>
                         <span>''' + load_lang('wiki_host') + '''</span>
@@ -531,15 +525,9 @@ def setting_2(conn, num):
                         '''<hr class=\"main_hr\">
                         <span>''' + load_lang('smtp_username') + '''</span>
                         <hr class=\"main_hr\">
-<<<<<<< HEAD
-                        <input name="g_email" value="''' + html.escape(d_list[2]) + '''">
-                        <hr>
-                        <span><a href="https://security.google.com/settings/security/apppasswords">''' + load_lang('google_app_password') + '''</a></span>
-=======
                         <input name="smtp_email" value="''' + html.escape(d_list[5]) + '''">
                         <hr class=\"main_hr\">
                         <span>''' + load_lang('smtp_password') + '''</span>
->>>>>>> 2347c8d... Make smtp server configuarable
                         <hr class=\"main_hr\">
                         <input type="password" name="smtp_pass" value="''' + html.escape(d_list[6]) + '''">
                         <hr class=\"main_hr\">

route/tool/func.py

@@ -448,7 +448,7 @@ def other2(data):
         data += ['']
 
     req_list = ''
-    main_css_ver = 12
+    main_css_ver = 13
 
     if not 'main_css_load' in flask.session or not 'main_css_ver' in flask.session or flask.session['main_css_ver'] != main_css_ver:
         for i_data in os.listdir(os.path.join("views", "main_css", "css")):

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.6-master-18",
+        "r_ver" : "v3.1.6-master-19",
         "c_ver" : "400009",
         "s_ver" : "7"
     }, "stable" : {