|
|
|
@ -9,23 +9,20 @@
|
|
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
|
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아이디 저장기능 적용">
|
|
|
|
|
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="체크리스트 오류 수정">
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl" afterDir="false" />
|
|
|
|
|
<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/m/bf_food/M_Bf_foodBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBO.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBOImpl.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.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/memory/M_MemoryBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryBO.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryController.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryImpl.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" 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/resources/sqlmap/m/index/com.backoffice.m.index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_cart_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_cart_popup.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline_share.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline_share.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/개발참고.txt" beforeDir="false" afterPath="$PROJECT_DIR$/개발참고.txt" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/native_login.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/native_login.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/native_logout.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/native_logout.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/member_env/setting.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_record_order.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_record_order.ftl" afterDir="false" />
|
|
|
|
|
</list>
|
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
|
@ -71,7 +68,7 @@
|
|
|
|
|
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
|
|
|
|
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
|
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index" />
|
|
|
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env" />
|
|
|
|
|
<property name="project.structure.last.edited" value="프로젝트" />
|
|
|
|
|
<property name="project.structure.proportion" value="0.0" />
|
|
|
|
|
<property name="project.structure.side.proportion" value="0.0" />
|
|
|
|
@ -80,8 +77,8 @@
|
|
|
|
|
</component>
|
|
|
|
|
<component name="RecentsManager">
|
|
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
|
|
<recent name="C:\project\bf\src\main\webapp\WEB-INF\views\ftl\m\index" />
|
|
|
|
|
<recent name="C:\project\bf\src\main\webapp\WEB-INF\views\ftl\m\member_env" />
|
|
|
|
|
<recent name="C:\project\bf\src\main\webapp\WEB-INF\views\ftl\m\index" />
|
|
|
|
|
<recent name="C:\project\bf\src\main\webapp\m\js" />
|
|
|
|
|
<recent name="C:\project\bf\src\main\webapp\static\js" />
|
|
|
|
|
<recent name="C:\project\bf\src\main\webapp\WEB-INF\views\ftl\m\bf_food" />
|
|
|
|
@ -248,6 +245,8 @@
|
|
|
|
|
<workItem from="1650851675151" duration="3750000" />
|
|
|
|
|
<workItem from="1650880342548" duration="16000" />
|
|
|
|
|
<workItem from="1650881164110" duration="14717000" />
|
|
|
|
|
<workItem from="1651074703299" duration="129000" />
|
|
|
|
|
<workItem from="1651149304746" duration="11803000" />
|
|
|
|
|
</task>
|
|
|
|
|
<task id="LOCAL-00001" summary="최초 커밋">
|
|
|
|
|
<created>1645354476031</created>
|
|
|
|
@ -564,7 +563,14 @@
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
<updated>1650806994907</updated>
|
|
|
|
|
</task>
|
|
|
|
|
<option name="localTasksCounter" value="46" />
|
|
|
|
|
<task id="LOCAL-00046" summary="체크리스트 오류 수정">
|
|
|
|
|
<created>1651074067731</created>
|
|
|
|
|
<option name="number" value="00046" />
|
|
|
|
|
<option name="presentableId" value="LOCAL-00046" />
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
<updated>1651074067731</updated>
|
|
|
|
|
</task>
|
|
|
|
|
<option name="localTasksCounter" value="47" />
|
|
|
|
|
<servers />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
|
@ -584,7 +590,6 @@
|
|
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
|
|
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
|
|
|
|
|
<option name="CHECK_NEW_TODO" value="false" />
|
|
|
|
|
<MESSAGE value="D-Day 관리기능 적용" />
|
|
|
|
|
<MESSAGE value="D-Day 관리기능 적용-2" />
|
|
|
|
|
<MESSAGE value="홈>홈메이드 추천 이유식 퍼블리싱작업-1" />
|
|
|
|
|
<MESSAGE value="회원가입 오류 수정" />
|
|
|
|
@ -609,6 +614,7 @@
|
|
|
|
|
<MESSAGE value="소셜회원가입 오류수정" />
|
|
|
|
|
<MESSAGE value="아이디 비밀번호 찾기 오류 수정" />
|
|
|
|
|
<MESSAGE value="아이디 저장기능 적용" />
|
|
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="아이디 저장기능 적용" />
|
|
|
|
|
<MESSAGE value="체크리스트 오류 수정" />
|
|
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="체크리스트 오류 수정" />
|
|
|
|
|
</component>
|
|
|
|
|
</project>
|