devel 코드 merge

2019-04-07 22:58:44 +09:00
parent 9dd7d96266 9e801f9ced
commit e919ddb83c
18 changed files with 944 additions and 142 deletions
@@ -41,7 +41,7 @@
            <%} %>
            <span class="msg_time">&lt;<%e(time)%>&gt;</span>
        </div>        
-        <div class="msg_content <%invalidType%>"><%e(text)%></div>
+        <div class="msg_content <%invalidType%>"><%linkifyStr(text)%></div>
        <%if(this.option && this.option.action) {%>
        <div class="msg_prompt">
            <button type="button" class="prompt_yes btn_prompt" <%allowButton?'':'disabled="disabled"'%>>수락</button> <button type="button" class="prompt_no btn_prompt" <%allowButton?'':'disabled="disabled"'%>>거절</button>