diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0566d1009d3b5a75db9634bce124c04934006b13..67300cd73f07efc3bbcd4ab1c3c77a6982a677f5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,20 +5,7 @@ </component> <component name="ChangeListManager"> <list default="true" id="5d66d739-0810-4bfa-9039-29f5df43a961" name="更改" comment="111"> - <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/exercise/.idea/.gitignore" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/exercise/.idea/modules.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/exercise/.idea/webcodegit.iml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/exercise/689d1554-9651-4cfe-9f2b-49c815ed30e1.webp" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/exercise/main.css" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/exercise/taobao.css" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/exercise/taobao.html" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/ext ironing/member home page.html" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/ext ironing/memberhomepage.css" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/ext ironing/myteam" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/ext ironing/reset.css" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/ext ironing/u=2662935961,3025118511&fm=253&fmt=auto&app=138&f=JPEG.webp" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -35,7 +22,28 @@ </component> <component name="Git.Settings"> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> + <option name="ROOT_SYNC" value="DONT_SYNC" /> </component> + <component name="GitLabMergeRequestFiltersHistory"><![CDATA[{ + "history": [ + { + "state": "MERGED", + "assignee": { + "type": "org.jetbrains.plugins.gitlab.mergerequest.ui.filters.GitLabMergeRequestsFiltersValue.MergeRequestsMemberFilterValue.MergeRequestsAssigneeFilterValue", + "username": "c24058946", + "fullname": "Zhicheng Xu" + } + } + ], + "lastFilter": { + "state": "MERGED", + "assignee": { + "type": "org.jetbrains.plugins.gitlab.mergerequest.ui.filters.GitLabMergeRequestsFiltersValue.MergeRequestsMemberFilterValue.MergeRequestsAssigneeFilterValue", + "username": "c24058946", + "fullname": "Zhicheng Xu" + } + } +}]]></component> <component name="GitLabMergeRequestsSettings"><![CDATA[{ "selectedUrlAndAccountId": { "first": "https://git.cardiff.ac.uk/c23096663/myteam.git", @@ -46,7 +54,7 @@ <setting file="file://$PROJECT_DIR$/taobao.css" root0="SKIP_INSPECTION" /> </component> <component name="ProblemsViewState"> - <option name="selectedTabId" value="CurrentFile" /> + <option name="selectedTabId" value="QODANA_PROBLEMS_VIEW_TAB" /> </component> <component name="ProjectColorInfo">{ "customColor": "", @@ -92,13 +100,45 @@ <option name="presentableId" value="Default" /> <updated>1728398002254</updated> <workItem from="1728398003914" duration="4894000" /> - <workItem from="1728550406289" duration="9302000" /> + <workItem from="1728550406289" duration="9937000" /> + </task> + <task id="LOCAL-00001" summary="111"> + <option name="closed" value="true" /> + <created>1728559850168</created> + <option name="number" value="00001" /> + <option name="presentableId" value="LOCAL-00001" /> + <option name="project" value="LOCAL" /> + <updated>1728559850168</updated> </task> + <option name="localTasksCounter" value="2" /> <servers /> </component> <component name="TypeScriptGeneratedFilesManager"> <option name="version" value="3" /> </component> + <component name="Vcs.Log.Tabs.Properties"> + <option name="TAB_STATES"> + <map> + <entry key="MAIN"> + <value> + <State> + <option name="FILTERS"> + <map> + <entry key="branch"> + <value> + <list> + <option value="origin/main" /> + </list> + </value> + </entry> + </map> + </option> + </State> + </value> + </entry> + </map> + </option> + </component> <component name="VcsManagerConfiguration"> <MESSAGE value="111" /> <option name="LAST_COMMIT_MESSAGE" value="111" />