|
|
|
@ -9,37 +9,15 @@
|
|
|
|
|
<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/include/confirm.ftl" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_change_account_pw.ftl" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_no_result.ftl" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_result.ftl" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email_20220402.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/java/com/backoffice/api/APIMemberController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/api/APIMemberController.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/api/ApiSMSController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/api/ApiSMSController.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/api/bo/ApiSMSBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/api/bo/ApiSMSBO.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/api/bo/ApiSMSBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/api/bo/ApiSMSBOImpl.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBO.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBOImpl.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" 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/java/com/backoffice/mail/MailForPwd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/mail/MailForPwd.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.sms.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.sms.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_20220207.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_20220401.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_02.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_02.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/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_20210121.ftl" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_20220207.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_20220402.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_favorite_word_20220301.ftl" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_favorite_word_20220327.ftl" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music_20220301.ftl" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_record_order_20220301.ftl" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_name.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_name.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_pw.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_pw.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/static/js/common.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/common.js" afterDir="false" />
|
|
|
|
|
</list>
|
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
|
@ -221,7 +199,8 @@
|
|
|
|
|
<workItem from="1648554891169" duration="4461000" />
|
|
|
|
|
<workItem from="1648720402622" duration="2770000" />
|
|
|
|
|
<workItem from="1648786659469" duration="28242000" />
|
|
|
|
|
<workItem from="1648875329000" duration="22927000" />
|
|
|
|
|
<workItem from="1648875329000" duration="23079000" />
|
|
|
|
|
<workItem from="1648963023291" duration="7348000" />
|
|
|
|
|
</task>
|
|
|
|
|
<task id="LOCAL-00001" summary="최초 커밋">
|
|
|
|
|
<created>1645354476031</created>
|
|
|
|
@ -300,7 +279,14 @@
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
<updated>1648822833746</updated>
|
|
|
|
|
</task>
|
|
|
|
|
<option name="localTasksCounter" value="12" />
|
|
|
|
|
<task id="LOCAL-00012" summary="비밀번호 찾기 기능 적용 로그인 회원가입 형식 변경">
|
|
|
|
|
<created>1648908705168</created>
|
|
|
|
|
<option name="number" value="00012" />
|
|
|
|
|
<option name="presentableId" value="LOCAL-00012" />
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
<updated>1648908705168</updated>
|
|
|
|
|
</task>
|
|
|
|
|
<option name="localTasksCounter" value="13" />
|
|
|
|
|
<servers />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
|
@ -331,6 +317,7 @@
|
|
|
|
|
<MESSAGE value="추천홈메이드이유식 > 팝업 > 연관식품 삭제" />
|
|
|
|
|
<MESSAGE value="예방접종 표시 오류 수정" />
|
|
|
|
|
<MESSAGE value="음악설정 수정 부모정보 변경 삭제" />
|
|
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="음악설정 수정 부모정보 변경 삭제" />
|
|
|
|
|
<MESSAGE value="비밀번호 찾기 기능 적용 로그인 회원가입 형식 변경" />
|
|
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="비밀번호 찾기 기능 적용 로그인 회원가입 형식 변경" />
|
|
|
|
|
</component>
|
|
|
|
|
</project>
|