|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
<project version="4">
|
|
|
|
<component name="ArtifactsWorkspaceSettings">
|
|
|
|
<artifacts-to-build>
|
|
|
|
<artifact name="code:war" />
|
|
|
|
</artifacts-to-build>
|
|
|
|
</component>
|
|
|
|
<component name="AutoImportSettings">
|
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
|
</component>
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
<list default="true" id="32da4ae4-985b-4d63-8b34-968979675a1a" name="默认变更列表" comment="Merge remote-tracking branch 'origin/master' into master">
|
|
|
|
<change afterPath="$PROJECT_DIR$/code/src/main/java/com/example/bean/user.java" afterDir="false" />
|
|
|
|
<change afterPath="$PROJECT_DIR$/code/src/main/java/com/example/codeManage/codeGetServlet.java" afterDir="false" />
|
|
|
|
<change afterPath="$PROJECT_DIR$/code/src/main/java/com/example/codeManage/codeSubmitServlet.java" afterDir="false" />
|
|
|
|
<change afterPath="$PROJECT_DIR$/code/src/main/java/com/example/competition/competitionServlet.java" afterDir="false" />
|
|
|
|
<change afterPath="$PROJECT_DIR$/code/src/main/java/com/example/course/courseServlet.java" afterDir="false" />
|
|
|
|
<change afterPath="$PROJECT_DIR$/code/src/main/java/com/example/question/questionServlet.java" afterDir="false" />
|
|
|
|
<change afterPath="$PROJECT_DIR$/code/src/main/java/com/example/questionlist/questionlistServlet.java" afterDir="false" />
|
|
|
|
<change afterPath="$PROJECT_DIR$/code/src/main/java/com/example/user/userServlet.java" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/code/code.iml" beforeDir="false" afterPath="$PROJECT_DIR$/code/code.iml" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/code/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/code/pom.xml" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/code/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/code/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/code/src/main/webapp/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/code/src/main/webapp/index.jsp" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/code/src/main/webapp/pageStatic/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/code/src/main/webapp/pageStatic/css/style.css" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/code/src/main/webapp/pageStatic/images/滚轮.png" beforeDir="false" afterPath="$PROJECT_DIR$/code/src/main/webapp/pageStatic/images/pic.png" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/code/src/main/webapp/recommend.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/code/src/main/webapp/recommend.jsp" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/code/target/code-1.0-SNAPSHOT.war" beforeDir="false" afterPath="$PROJECT_DIR$/code/target/code-1.0-SNAPSHOT.war" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/code/target/code-1.0-SNAPSHOT/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/code/target/code-1.0-SNAPSHOT/WEB-INF/web.xml" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/code/target/code-1.0-SNAPSHOT/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/code/target/code-1.0-SNAPSHOT/index.jsp" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/code/target/code-1.0-SNAPSHOT/pageStatic/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/code/target/code-1.0-SNAPSHOT/pageStatic/css/style.css" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/code/target/code-1.0-SNAPSHOT/pageStatic/images/滚轮.png" beforeDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/code/target/code-1.0-SNAPSHOT/recommend.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/code/target/code-1.0-SNAPSHOT/recommend.jsp" afterDir="false" />
|
|
|
|
</list>
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
|
|
</component>
|
|
|
|
<component name="FileTemplateManagerImpl">
|
|
|
|
<option name="RECENT_TEMPLATES">
|
|
|
|
<list>
|
|
|
|
<option value="Jsp File" />
|
|
|
|
<option value="Class" />
|
|
|
|
</list>
|
|
|
|
</option>
|
|
|
|
</component>
|
|
|
|
<component name="Git.Settings">
|
|
|
|
<option name="PREVIOUS_COMMIT_AUTHORS">
|
|
|
|
<list>
|
|
|
|
<option value="HP <853541169@qq.com>" />
|
|
|
|
</list>
|
|
|
|
</option>
|
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
|
</component>
|
|
|
|
<component name="LogFilters">
|
|
|
|
<option name="FILTER_ERRORS" value="false" />
|
|
|
|
<option name="FILTER_WARNINGS" value="false" />
|
|
|
|
<option name="FILTER_INFO" value="true" />
|
|
|
|
<option name="FILTER_DEBUG" value="true" />
|
|
|
|
<option name="CUSTOM_FILTER" />
|
|
|
|
</component>
|
|
|
|
<component name="ProjectId" id="20cyFEgFEoAUWg1XwSkGexW298t" />
|
|
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
|
|
<component name="ProjectViewState">
|
|
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
|
|
<option name="showLibraryContents" value="true" />
|
|
|
|
</component>
|
|
|
|
<component name="PropertiesComponent">
|
|
|
|
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
|
|
|
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
|
|
|
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
|
<property name="aspect.path.notification.shown" value="true" />
|
|
|
|
<property name="jdk.selected.JAVA_MODULE" value="1.8" />
|
|
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
|
<property name="project.structure.last.edited" value="模块" />
|
|
|
|
<property name="project.structure.proportion" value="0.0" />
|
|
|
|
<property name="project.structure.side.proportion" value="0.0" />
|
|
|
|
<property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
|
|
|
|
</component>
|
|
|
|
<component name="RunManager" selected="Tomcat Server.index.jsp (1)">
|
|
|
|
<configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
|
|
|
|
<option name="arquillianRunConfiguration">
|
|
|
|
<value>
|
|
|
|
<option name="containerStateName" value="" />
|
|
|
|
</value>
|
|
|
|
</option>
|
|
|
|
<option name="TEST_OBJECT" value="CLASS" />
|
|
|
|
<properties />
|
|
|
|
<listeners />
|
|
|
|
<method v="2">
|
|
|
|
<option name="Make" enabled="true" />
|
|
|
|
</method>
|
|
|
|
</configuration>
|
|
|
|
<configuration name="index.jsp" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:8888/code_war/index.jsp">
|
|
|
|
<method v="2" />
|
|
|
|
</configuration>
|
|
|
|
<configuration name="Tomcat 9.0.31" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 9.0.31" ALTERNATIVE_JRE_ENABLED="false">
|
|
|
|
<deployment>
|
|
|
|
<artifact name="code:war exploded">
|
|
|
|
<settings>
|
|
|
|
<option name="CONTEXT_PATH" value="/code_war_exploded" />
|
|
|
|
</settings>
|
|
|
|
</artifact>
|
|
|
|
</deployment>
|
|
|
|
<server-settings>
|
|
|
|
<option name="BASE_DIRECTORY_NAME" value="5735f0e4-3164-4dd3-91e3-14a479617a91" />
|
|
|
|
</server-settings>
|
|
|
|
<predefined_log_file enabled="true" id="Tomcat" />
|
|
|
|
<predefined_log_file enabled="true" id="Tomcat Catalina" />
|
|
|
|
<predefined_log_file id="Tomcat Manager" />
|
|
|
|
<predefined_log_file id="Tomcat Host Manager" />
|
|
|
|
<predefined_log_file id="Tomcat Localhost Access" />
|
|
|
|
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
|
|
|
|
<option name="USE_ENV_VARIABLES" value="true" />
|
|
|
|
<STARTUP>
|
|
|
|
<option name="USE_DEFAULT" value="true" />
|
|
|
|
<option name="SCRIPT" value="" />
|
|
|
|
<option name="VM_PARAMETERS" value="" />
|
|
|
|
<option name="PROGRAM_PARAMETERS" value="" />
|
|
|
|
</STARTUP>
|
|
|
|
<SHUTDOWN>
|
|
|
|
<option name="USE_DEFAULT" value="true" />
|
|
|
|
<option name="SCRIPT" value="" />
|
|
|
|
<option name="VM_PARAMETERS" value="" />
|
|
|
|
<option name="PROGRAM_PARAMETERS" value="" />
|
|
|
|
</SHUTDOWN>
|
|
|
|
</ConfigurationWrapper>
|
|
|
|
<method v="2">
|
|
|
|
<option name="Make" enabled="true" />
|
|
|
|
<option name="BuildArtifacts" enabled="true">
|
|
|
|
<artifact name="code:war exploded" />
|
|
|
|
</option>
|
|
|
|
</method>
|
|
|
|
</configuration>
|
|
|
|
<configuration name="index.jsp (1)" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" temporary="true" APPLICATION_SERVER_NAME="Tomcat 9.0.31" ALTERNATIVE_JRE_ENABLED="false">
|
|
|
|
<option name="OPEN_IN_BROWSER_URL" value="http://localhost:8888/index.jsp" />
|
|
|
|
<deployment>
|
|
|
|
<artifact name="code:war">
|
|
|
|
<settings>
|
|
|
|
<option name="CONTEXT_PATH" value="/code_war" />
|
|
|
|
</settings>
|
|
|
|
</artifact>
|
|
|
|
</deployment>
|
|
|
|
<server-settings>
|
|
|
|
<option name="BASE_DIRECTORY_NAME" value="9f4f2e12-555a-4896-b71e-c00a41b37140" />
|
|
|
|
</server-settings>
|
|
|
|
<predefined_log_file enabled="true" id="Tomcat" />
|
|
|
|
<predefined_log_file enabled="true" id="Tomcat Catalina" />
|
|
|
|
<predefined_log_file id="Tomcat Manager" />
|
|
|
|
<predefined_log_file id="Tomcat Host Manager" />
|
|
|
|
<predefined_log_file id="Tomcat Localhost Access" />
|
|
|
|
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
|
|
|
|
<option name="USE_ENV_VARIABLES" value="true" />
|
|
|
|
<STARTUP>
|
|
|
|
<option name="USE_DEFAULT" value="true" />
|
|
|
|
<option name="SCRIPT" value="" />
|
|
|
|
<option name="VM_PARAMETERS" value="" />
|
|
|
|
<option name="PROGRAM_PARAMETERS" value="" />
|
|
|
|
</STARTUP>
|
|
|
|
<SHUTDOWN>
|
|
|
|
<option name="USE_DEFAULT" value="true" />
|
|
|
|
<option name="SCRIPT" value="" />
|
|
|
|
<option name="VM_PARAMETERS" value="" />
|
|
|
|
<option name="PROGRAM_PARAMETERS" value="" />
|
|
|
|
</SHUTDOWN>
|
|
|
|
</ConfigurationWrapper>
|
|
|
|
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
|
|
|
|
<option name="USE_ENV_VARIABLES" value="true" />
|
|
|
|
<STARTUP>
|
|
|
|
<option name="USE_DEFAULT" value="true" />
|
|
|
|
<option name="SCRIPT" value="" />
|
|
|
|
<option name="VM_PARAMETERS" value="" />
|
|
|
|
<option name="PROGRAM_PARAMETERS" value="" />
|
|
|
|
</STARTUP>
|
|
|
|
<SHUTDOWN>
|
|
|
|
<option name="USE_DEFAULT" value="true" />
|
|
|
|
<option name="SCRIPT" value="" />
|
|
|
|
<option name="VM_PARAMETERS" value="" />
|
|
|
|
<option name="PROGRAM_PARAMETERS" value="" />
|
|
|
|
</SHUTDOWN>
|
|
|
|
</ConfigurationWrapper>
|
|
|
|
<method v="2">
|
|
|
|
<option name="Make" enabled="true" />
|
|
|
|
<option name="BuildArtifacts" enabled="true">
|
|
|
|
<artifact name="code:war" />
|
|
|
|
</option>
|
|
|
|
</method>
|
|
|
|
</configuration>
|
|
|
|
<configuration name="index.jsp (3)" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" temporary="true" APPLICATION_SERVER_NAME="Tomcat 9.0.31" ALTERNATIVE_JRE_ENABLED="false">
|
|
|
|
<option name="OPEN_IN_BROWSER_URL" value="http://localhost:8888/index.jsp" />
|
|
|
|
<deployment>
|
|
|
|
<artifact name="code:war exploded">
|
|
|
|
<settings>
|
|
|
|
<option name="CONTEXT_PATH" value="/code_war_exploded" />
|
|
|
|
</settings>
|
|
|
|
</artifact>
|
|
|
|
</deployment>
|
|
|
|
<server-settings>
|
|
|
|
<option name="BASE_DIRECTORY_NAME" value="e96c8076-f62e-4c38-875f-67a1eb2d1318" />
|
|
|
|
</server-settings>
|
|
|
|
<predefined_log_file enabled="true" id="Tomcat" />
|
|
|
|
<predefined_log_file enabled="true" id="Tomcat Catalina" />
|
|
|
|
<predefined_log_file id="Tomcat Manager" />
|
|
|
|
<predefined_log_file id="Tomcat Host Manager" />
|
|
|
|
<predefined_log_file id="Tomcat Localhost Access" />
|
|
|
|
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
|
|
|
|
<option name="USE_ENV_VARIABLES" value="true" />
|
|
|
|
<STARTUP>
|
|
|
|
<option name="USE_DEFAULT" value="true" />
|
|
|
|
<option name="SCRIPT" value="" />
|
|
|
|
<option name="VM_PARAMETERS" value="" />
|
|
|
|
<option name="PROGRAM_PARAMETERS" value="" />
|
|
|
|
</STARTUP>
|
|
|
|
<SHUTDOWN>
|
|
|
|
<option name="USE_DEFAULT" value="true" />
|
|
|
|
<option name="SCRIPT" value="" />
|
|
|
|
<option name="VM_PARAMETERS" value="" />
|
|
|
|
<option name="PROGRAM_PARAMETERS" value="" />
|
|
|
|
</SHUTDOWN>
|
|
|
|
</ConfigurationWrapper>
|
|
|
|
<method v="2">
|
|
|
|
<option name="Make" enabled="true" />
|
|
|
|
<option name="BuildArtifacts" enabled="true">
|
|
|
|
<artifact name="code:war exploded" />
|
|
|
|
</option>
|
|
|
|
</method>
|
|
|
|
</configuration>
|
|
|
|
<configuration name="index.jsp (4)" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" temporary="true" APPLICATION_SERVER_NAME="Tomcat 9.0.31" ALTERNATIVE_JRE_ENABLED="false">
|
|
|
|
<option name="OPEN_IN_BROWSER_URL" value="http://localhost:8888/index.jsp" />
|
|
|
|
<deployment>
|
|
|
|
<artifact name="code:war">
|
|
|
|
<settings>
|
|
|
|
<option name="CONTEXT_PATH" value="/code_war" />
|
|
|
|
</settings>
|
|
|
|
</artifact>
|
|
|
|
</deployment>
|
|
|
|
<server-settings>
|
|
|
|
<option name="BASE_DIRECTORY_NAME" value="69d3cd9a-875d-472f-9514-767bb6327875" />
|
|
|
|
</server-settings>
|
|
|
|
<predefined_log_file enabled="true" id="Tomcat" />
|
|
|
|
<predefined_log_file enabled="true" id="Tomcat Catalina" />
|
|
|
|
<predefined_log_file id="Tomcat Manager" />
|
|
|
|
<predefined_log_file id="Tomcat Host Manager" />
|
|
|
|
<predefined_log_file id="Tomcat Localhost Access" />
|
|
|
|
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
|
|
|
|
<option name="USE_ENV_VARIABLES" value="true" />
|
|
|
|
<STARTUP>
|
|
|
|
<option name="USE_DEFAULT" value="true" />
|
|
|
|
<option name="SCRIPT" value="" />
|
|
|
|
<option name="VM_PARAMETERS" value="" />
|
|
|
|
<option name="PROGRAM_PARAMETERS" value="" />
|
|
|
|
</STARTUP>
|
|
|
|
<SHUTDOWN>
|
|
|
|
<option name="USE_DEFAULT" value="true" />
|
|
|
|
<option name="SCRIPT" value="" />
|
|
|
|
<option name="VM_PARAMETERS" value="" />
|
|
|
|
<option name="PROGRAM_PARAMETERS" value="" />
|
|
|
|
</SHUTDOWN>
|
|
|
|
</ConfigurationWrapper>
|
|
|
|
<method v="2">
|
|
|
|
<option name="Make" enabled="true" />
|
|
|
|
<option name="BuildArtifacts" enabled="true">
|
|
|
|
<artifact name="code:war" />
|
|
|
|
</option>
|
|
|
|
</method>
|
|
|
|
</configuration>
|
|
|
|
<configuration name="ratingrank.jsp" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" temporary="true" APPLICATION_SERVER_NAME="Tomcat 9.0.31" ALTERNATIVE_JRE_ENABLED="false">
|
|
|
|
<option name="OPEN_IN_BROWSER_URL" value="http://localhost:8888/rank/ratingrank.jsp" />
|
|
|
|
<deployment>
|
|
|
|
<artifact name="code:war">
|
|
|
|
<settings>
|
|
|
|
<option name="CONTEXT_PATH" value="/code_war" />
|
|
|
|
</settings>
|
|
|
|
</artifact>
|
|
|
|
</deployment>
|
|
|
|
<server-settings>
|
|
|
|
<option name="BASE_DIRECTORY_NAME" value="13f08108-517d-4412-ac52-cadf6688520d" />
|
|
|
|
</server-settings>
|
|
|
|
<predefined_log_file enabled="true" id="Tomcat" />
|
|
|
|
<predefined_log_file enabled="true" id="Tomcat Catalina" />
|
|
|
|
<predefined_log_file id="Tomcat Manager" />
|
|
|
|
<predefined_log_file id="Tomcat Host Manager" />
|
|
|
|
<predefined_log_file id="Tomcat Localhost Access" />
|
|
|
|
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
|
|
|
|
<option name="USE_ENV_VARIABLES" value="true" />
|
|
|
|
<STARTUP>
|
|
|
|
<option name="USE_DEFAULT" value="true" />
|
|
|
|
<option name="SCRIPT" value="" />
|
|
|
|
<option name="VM_PARAMETERS" value="" />
|
|
|
|
<option name="PROGRAM_PARAMETERS" value="" />
|
|
|
|
</STARTUP>
|
|
|
|
<SHUTDOWN>
|
|
|
|
<option name="USE_DEFAULT" value="true" />
|
|
|
|
<option name="SCRIPT" value="" />
|
|
|
|
<option name="VM_PARAMETERS" value="" />
|
|
|
|
<option name="PROGRAM_PARAMETERS" value="" />
|
|
|
|
</SHUTDOWN>
|
|
|
|
</ConfigurationWrapper>
|
|
|
|
<method v="2">
|
|
|
|
<option name="Make" enabled="true" />
|
|
|
|
<option name="BuildArtifacts" enabled="true">
|
|
|
|
<artifact name="code:war" />
|
|
|
|
</option>
|
|
|
|
</method>
|
|
|
|
</configuration>
|
|
|
|
<recent_temporary>
|
|
|
|
<list>
|
|
|
|
<item itemvalue="Tomcat Server.index.jsp (1)" />
|
|
|
|
<item itemvalue="JavaScript Debug.index.jsp" />
|
|
|
|
<item itemvalue="Tomcat Server.ratingrank.jsp" />
|
|
|
|
<item itemvalue="Tomcat Server.index.jsp (4)" />
|
|
|
|
<item itemvalue="Tomcat Server.index.jsp (3)" />
|
|
|
|
</list>
|
|
|
|
</recent_temporary>
|
|
|
|
</component>
|
|
|
|
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
|
|
|
|
<component name="TaskManager">
|
|
|
|
<task active="true" id="Default" summary="默认任务">
|
|
|
|
<changelist id="32da4ae4-985b-4d63-8b34-968979675a1a" name="默认变更列表" comment="" />
|
|
|
|
<created>1636358064805</created>
|
|
|
|
<option name="number" value="Default" />
|
|
|
|
<option name="presentableId" value="Default" />
|
|
|
|
<updated>1636358064805</updated>
|
|
|
|
<workItem from="1636358066192" duration="1542000" />
|
|
|
|
<workItem from="1636421580166" duration="9940000" />
|
|
|
|
<workItem from="1636449464876" duration="180000" />
|
|
|
|
<workItem from="1636450451041" duration="292000" />
|
|
|
|
<workItem from="1636465493644" duration="779000" />
|
|
|
|
<workItem from="1636510139285" duration="300000" />
|
|
|
|
<workItem from="1636510454240" duration="165000" />
|
|
|
|
<workItem from="1636533433908" duration="629000" />
|
|
|
|
<workItem from="1636536098073" duration="406000" />
|
|
|
|
<workItem from="1636536530123" duration="152000" />
|
|
|
|
<workItem from="1636536697022" duration="1714000" />
|
|
|
|
<workItem from="1636542765777" duration="3040000" />
|
|
|
|
<workItem from="1636547208592" duration="18317000" />
|
|
|
|
<workItem from="1636569516529" duration="1844000" />
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00001" summary="Merge remote-tracking branch 'origin/master' into master">
|
|
|
|
<created>1636358116094</created>
|
|
|
|
<option name="number" value="00001" />
|
|
|
|
<option name="presentableId" value="LOCAL-00001" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1636358116094</updated>
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00002" summary="Merge remote-tracking branch 'origin/master' into master">
|
|
|
|
<created>1636358243941</created>
|
|
|
|
<option name="number" value="00002" />
|
|
|
|
<option name="presentableId" value="LOCAL-00002" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1636358243941</updated>
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00003" summary="Merge remote-tracking branch 'origin/master' into master">
|
|
|
|
<created>1636358365249</created>
|
|
|
|
<option name="number" value="00003" />
|
|
|
|
<option name="presentableId" value="LOCAL-00003" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1636358365249</updated>
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00004" summary="Merge remote-tracking branch 'origin/master' into master">
|
|
|
|
<created>1636424684249</created>
|
|
|
|
<option name="number" value="00004" />
|
|
|
|
<option name="presentableId" value="LOCAL-00004" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1636424684249</updated>
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00005" summary="Merge remote-tracking branch 'origin/master' into master">
|
|
|
|
<created>1636450493875</created>
|
|
|
|
<option name="number" value="00005" />
|
|
|
|
<option name="presentableId" value="LOCAL-00005" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1636450493875</updated>
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00006" summary="Merge remote-tracking branch 'origin/master' into master">
|
|
|
|
<created>1636562061290</created>
|
|
|
|
<option name="number" value="00006" />
|
|
|
|
<option name="presentableId" value="LOCAL-00006" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1636562061290</updated>
|
|
|
|
</task>
|
|
|
|
<option name="localTasksCounter" value="7" />
|
|
|
|
<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 />
|
|
|
|
</value>
|
|
|
|
</entry>
|
|
|
|
</map>
|
|
|
|
</option>
|
|
|
|
<option name="oldMeFiltersMigrated" value="true" />
|
|
|
|
</component>
|
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
|
<MESSAGE value="Merge remote-tracking branch 'origin/master' into master" />
|
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="Merge remote-tracking branch 'origin/master' into master" />
|
|
|
|
</component>
|
|
|
|
</project>
|