|
|
|
@ -9,29 +9,11 @@
|
|
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
|
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="디폴트 선택한 아이 유지안되는 버그 수정-2">
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/tutorial/M_Bf_tutorialBO.java" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/tutorial/M_Bf_tutorialBOImpl.java" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/tutorial/TutorialController.java" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/tutorial/com.backoffice.m.tutorial.xml" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/board_tutorial.ftl" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/food_tutorial.ftl" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/index_tutorial.ftl" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/memory_tutorial.ftl" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/nutrient_tutorial.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/m/bf_board/M_Bf_boardController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_board/M_Bf_boardController.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/bf_growth/M_Bf_growthController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.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/resources/appcontext/application_context_generator.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/appcontext/application_context_generator.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/datasource/sql_map_config_mysql.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/datasource/sql_map_config_mysql.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/nutrient_balance.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/nutrient_balance.ftl" 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/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/include/board_tutorial.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/board_tutorial.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/memory_tutorial.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/memory_tutorial.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/nutrient_tutorial.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/nutrient_tutorial.ftl" afterDir="false" />
|
|
|
|
|
</list>
|
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
|
@ -261,14 +243,7 @@
|
|
|
|
|
<workItem from="1651149304746" duration="15131000" />
|
|
|
|
|
<workItem from="1651193694137" duration="12076000" />
|
|
|
|
|
<workItem from="1651229947933" duration="3142000" />
|
|
|
|
|
<workItem from="1651296949782" duration="11707000" />
|
|
|
|
|
</task>
|
|
|
|
|
<task id="LOCAL-00004" summary="아이 사진 업로드 오류">
|
|
|
|
|
<created>1648364237160</created>
|
|
|
|
|
<option name="number" value="00004" />
|
|
|
|
|
<option name="presentableId" value="LOCAL-00004" />
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
<updated>1648364237160</updated>
|
|
|
|
|
<workItem from="1651296949782" duration="12133000" />
|
|
|
|
|
</task>
|
|
|
|
|
<task id="LOCAL-00005" summary="SNS 탈퇴 로그인 불가 처리 메시지">
|
|
|
|
|
<created>1648370835819</created>
|
|
|
|
@ -606,7 +581,14 @@
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
<updated>1651232993829</updated>
|
|
|
|
|
</task>
|
|
|
|
|
<option name="localTasksCounter" value="53" />
|
|
|
|
|
<task id="LOCAL-00053" summary="튜토리얼 기능 적용">
|
|
|
|
|
<created>1651309230468</created>
|
|
|
|
|
<option name="number" value="00053" />
|
|
|
|
|
<option name="presentableId" value="LOCAL-00053" />
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
<updated>1651309230468</updated>
|
|
|
|
|
</task>
|
|
|
|
|
<option name="localTasksCounter" value="54" />
|
|
|
|
|
<servers />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
|
@ -626,7 +608,6 @@
|
|
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
|
|
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
|
|
|
|
|
<option name="CHECK_NEW_TODO" value="false" />
|
|
|
|
|
<MESSAGE value="회원가입 퍼블리싱 페이지 적용-2" />
|
|
|
|
|
<MESSAGE value="아이정보등록 퍼블리싱" />
|
|
|
|
|
<MESSAGE value="D-Day 설정관련 홈화면 오류 수정" />
|
|
|
|
|
<MESSAGE value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용." />
|
|
|
|
@ -651,6 +632,7 @@
|
|
|
|
|
<MESSAGE value="추천이유식 레시피 식재료 번호 수정" />
|
|
|
|
|
<MESSAGE value="디폴트 선택한 아이 유지안되는 버그 수정" />
|
|
|
|
|
<MESSAGE value="디폴트 선택한 아이 유지안되는 버그 수정-2" />
|
|
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="디폴트 선택한 아이 유지안되는 버그 수정-2" />
|
|
|
|
|
<MESSAGE value="튜토리얼 기능 적용" />
|
|
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="튜토리얼 기능 적용" />
|
|
|
|
|
</component>
|
|
|
|
|
</project>
|