|
|
|
@ -9,13 +9,11 @@
|
|
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
|
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="카카오 소셜로그인 수정-">
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/social_login_common.ftl" afterDir="false" />
|
|
|
|
|
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아이디 저장기능 적용">
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/kakaoLogin_callback.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/kakaoLogin_callback.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/nhnLogin_callback.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/nhnLogin_callback.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl" afterDir="false" />
|
|
|
|
|
</list>
|
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
|
@ -644,4 +642,15 @@
|
|
|
|
|
<MESSAGE value="카카오 소셜로그인 수정" />
|
|
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="카카오 소셜로그인 수정" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="XDebuggerManager">
|
|
|
|
|
<breakpoint-manager>
|
|
|
|
|
<breakpoints>
|
|
|
|
|
<line-breakpoint enabled="true" type="java-line">
|
|
|
|
|
<url>file://$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java</url>
|
|
|
|
|
<line>179</line>
|
|
|
|
|
<option name="timeStamp" value="1" />
|
|
|
|
|
</line-breakpoint>
|
|
|
|
|
</breakpoints>
|
|
|
|
|
</breakpoint-manager>
|
|
|
|
|
</component>
|
|
|
|
|
</project>
|