|
@@ -1,10 +1,7 @@
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project version="4">
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
- <list default="true" id="82570a17-8430-4238-ae79-81bbbd2de81f" name="Default Changelist" comment="">
|
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/h_exam/exam_detail_s_img.html" beforeDir="false" afterPath="$PROJECT_DIR$/h_exam/exam_detail_s_img.html" afterDir="false" />
|
|
|
|
- </list>
|
|
|
|
|
|
+ <list default="true" id="82570a17-8430-4238-ae79-81bbbd2de81f" name="Default Changelist" comment="" />
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -34,8 +31,8 @@
|
|
<counts>
|
|
<counts>
|
|
<entry key="33" value="1" />
|
|
<entry key="33" value="1" />
|
|
<entry key="css" value="3" />
|
|
<entry key="css" value="3" />
|
|
- <entry key="gitignore" value="2" />
|
|
|
|
- <entry key="html" value="27" />
|
|
|
|
|
|
+ <entry key="gitignore" value="3" />
|
|
|
|
+ <entry key="html" value="28" />
|
|
<entry key="ico" value="2" />
|
|
<entry key="ico" value="2" />
|
|
<entry key="js" value="5" />
|
|
<entry key="js" value="5" />
|
|
<entry key="png" value="19" />
|
|
<entry key="png" value="19" />
|
|
@@ -44,10 +41,10 @@
|
|
<usages-collector id="statistics.file.types.open">
|
|
<usages-collector id="statistics.file.types.open">
|
|
<counts>
|
|
<counts>
|
|
<entry key="CSS" value="3" />
|
|
<entry key="CSS" value="3" />
|
|
- <entry key="HTML" value="27" />
|
|
|
|
|
|
+ <entry key="HTML" value="28" />
|
|
<entry key="Image" value="21" />
|
|
<entry key="Image" value="21" />
|
|
<entry key="JavaScript" value="5" />
|
|
<entry key="JavaScript" value="5" />
|
|
- <entry key="PLAIN_TEXT" value="3" />
|
|
|
|
|
|
+ <entry key="PLAIN_TEXT" value="4" />
|
|
</counts>
|
|
</counts>
|
|
</usages-collector>
|
|
</usages-collector>
|
|
<usages-collector id="statistics.file.extensions.edit">
|
|
<usages-collector id="statistics.file.extensions.edit">
|
|
@@ -124,70 +121,72 @@
|
|
<component name="FileEditorManager">
|
|
<component name="FileEditorManager">
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
- <entry file="file://$PROJECT_DIR$/xgk/xgk.html">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/h_exam/exam_detail_d_img.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="99">
|
|
|
|
- <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
|
|
|
|
|
|
+ <state relative-caret-position="1647">
|
|
|
|
+ <caret line="61" column="60" selection-start-line="61" selection-start-column="60" selection-end-line="61" selection-end-column="60" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="n#style#0;n#div#0;n#div#4;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
|
+ </folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
- <entry file="file://$PROJECT_DIR$/index.html">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/js/exam_detail_img.js">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="330">
|
|
|
|
- <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
|
|
|
|
|
|
+ <state relative-caret-position="1188">
|
|
|
|
+ <caret line="44" column="51" selection-start-line="44" selection-start-column="51" selection-end-line="44" selection-end-column="51" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/imgs/favicon.ico">
|
|
|
|
- <provider selected="true" editor-type-id="images" />
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/h_news/news_list.html">
|
|
|
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/h_exam/exam_detail_s_img.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="297">
|
|
|
|
- <caret line="9" column="75" selection-start-line="9" selection-start-column="75" selection-end-line="9" selection-end-column="75" />
|
|
|
|
|
|
+ <state relative-caret-position="247">
|
|
|
|
+ <caret line="66" column="42" lean-forward="true" selection-start-line="66" selection-start-column="42" selection-end-line="66" selection-end-column="42" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="e#3935#3941#0" expanded="true" />
|
|
|
|
+ <element signature="e#3941#3947#0" expanded="true" />
|
|
|
|
+ <element signature="n#style#0;n#div#0;n#div#4;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
|
+ </folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
- <entry file="file://$PROJECT_DIR$/h_news/news_detail.html">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/404.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="198">
|
|
|
|
- <caret line="6" column="72" selection-start-line="6" selection-start-column="72" selection-end-line="6" selection-end-column="72" />
|
|
|
|
|
|
+ <state relative-caret-position="351">
|
|
|
|
+ <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/css/components.less">
|
|
|
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/index.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="198">
|
|
|
|
- <caret line="746" column="9" lean-forward="true" selection-start-line="746" selection-start-column="9" selection-end-line="746" selection-end-column="9" />
|
|
|
|
|
|
+ <state relative-caret-position="324">
|
|
|
|
+ <caret line="12" column="18" lean-forward="true" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
- <entry file="file://$PROJECT_DIR$/h_exam/exam_detail.html">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/h_exam/exam_detail_img.html">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/search.html">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="315">
|
|
|
|
+ <caret line="39" column="49" lean-forward="true" selection-start-line="39" selection-start-column="49" selection-end-line="39" selection-end-column="49" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
- <entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/css/exam_detail_img.css">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="231">
|
|
|
|
- <caret line="7" column="75" selection-start-line="7" selection-start-column="75" selection-end-line="7" selection-end-column="75" />
|
|
|
|
|
|
+ <state relative-caret-position="248">
|
|
|
|
+ <caret line="59" column="34" lean-forward="true" selection-start-line="59" selection-start-column="34" selection-end-line="59" selection-end-column="34" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -274,28 +273,18 @@
|
|
<foldersAlwaysOnTop value="true" />
|
|
<foldersAlwaysOnTop value="true" />
|
|
</navigator>
|
|
</navigator>
|
|
<panes>
|
|
<panes>
|
|
|
|
+ <pane id="Scope" />
|
|
<pane id="ProjectPane">
|
|
<pane id="ProjectPane">
|
|
<subPane>
|
|
<subPane>
|
|
<expand>
|
|
<expand>
|
|
<path>
|
|
<path>
|
|
- <item name="gs_try" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
- <item name="gs_try" type="462c0819:PsiDirectoryNode" />
|
|
|
|
- </path>
|
|
|
|
- <path>
|
|
|
|
- <item name="gs_try" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
- <item name="gs_try" type="462c0819:PsiDirectoryNode" />
|
|
|
|
- <item name="css" type="462c0819:PsiDirectoryNode" />
|
|
|
|
- </path>
|
|
|
|
- <path>
|
|
|
|
- <item name="gs_try" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
- <item name="gs_try" type="462c0819:PsiDirectoryNode" />
|
|
|
|
- <item name="h_exam" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
+ <item name="examwin_web" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
+ <item name="examwin_web" type="462c0819:PsiDirectoryNode" />
|
|
</path>
|
|
</path>
|
|
</expand>
|
|
</expand>
|
|
<select />
|
|
<select />
|
|
</subPane>
|
|
</subPane>
|
|
</pane>
|
|
</pane>
|
|
- <pane id="Scope" />
|
|
|
|
</panes>
|
|
</panes>
|
|
</component>
|
|
</component>
|
|
<component name="PropertiesComponent">
|
|
<component name="PropertiesComponent">
|
|
@@ -323,6 +312,146 @@
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myId" value="CHANGED_ON_SERVER" />
|
|
<option name="myId" value="CHANGED_ON_SERVER" />
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" value="Updated" />
|
|
|
|
+ <option name="myStatusName" value="Changed" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" value="UPDATED" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" value="Created" />
|
|
|
|
+ <option name="myStatusName" value="Created" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" value="CREATED" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" value="Deleted" />
|
|
|
|
+ <option name="myStatusName" value="Deleted" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="true" />
|
|
|
|
+ <option name="myId" value="REMOVED_FROM_REPOSITORY" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" value="Restored" />
|
|
|
|
+ <option name="myStatusName" value="Will be restored" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" value="RESTORED" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" value="Modified" />
|
|
|
|
+ <option name="myStatusName" value="Modified" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" value="MODIFIED" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" value="Skipped" />
|
|
|
|
+ <option name="myStatusName" value="Skipped" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" value="SKIPPED" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" value="Merged with conflicts" />
|
|
|
|
+ <option name="myStatusName" value="Will be merged with conflicts" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" value="MERGED_WITH_CONFLICTS" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" value="Merged with tree conflicts" />
|
|
|
|
+ <option name="myStatusName" value="Merged with tree conflicts" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" value="Merged with property conflicts" />
|
|
|
|
+ <option name="myStatusName" value="Will be merged with property conflicts" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" value="Merged" />
|
|
|
|
+ <option name="myStatusName" value="Will be merged" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" value="MERGED" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" value="Not in repository" />
|
|
|
|
+ <option name="myStatusName" value="Not in repository" />
|
|
|
|
+ <option name="mySupportsDeletion" value="true" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" value="UNKNOWN" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" value="Locally added" />
|
|
|
|
+ <option name="myStatusName" value="Locally added" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" value="LOCALLY_ADDED" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" value="Locally removed" />
|
|
|
|
+ <option name="myStatusName" value="Locally removed" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" value="LOCALLY_REMOVED" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" value="Switched" />
|
|
|
|
+ <option name="myStatusName" value="Switched" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" value="SWITCHED" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" value="Updated from server" />
|
|
|
|
+ <option name="myStatusName" value="Changed on server" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" value="CHANGED_ON_SERVER" />
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<option name="myUpdateName" value="Updated" />
|
|
<option name="myUpdateName" value="Updated" />
|
|
<option name="myStatusName" value="Changed" />
|
|
<option name="myStatusName" value="Changed" />
|
|
@@ -331,6 +460,55 @@
|
|
<option name="myId" value="UPDATED" />
|
|
<option name="myId" value="UPDATED" />
|
|
<PATH vcs="Git" revision="">$PROJECT_DIR$/css/exam_detail_img.css</PATH>
|
|
<PATH vcs="Git" revision="">$PROJECT_DIR$/css/exam_detail_img.css</PATH>
|
|
<PATH vcs="Git" revision="">$PROJECT_DIR$/search.html</PATH>
|
|
<PATH vcs="Git" revision="">$PROJECT_DIR$/search.html</PATH>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<option name="myUpdateName" value="Created" />
|
|
<option name="myUpdateName" value="Created" />
|
|
@@ -338,6 +516,41 @@
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myId" value="CREATED" />
|
|
<option name="myId" value="CREATED" />
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<option name="myUpdateName" value="Deleted" />
|
|
<option name="myUpdateName" value="Deleted" />
|
|
@@ -345,6 +558,41 @@
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="myCanBeAbsent" value="true" />
|
|
<option name="myCanBeAbsent" value="true" />
|
|
<option name="myId" value="REMOVED_FROM_REPOSITORY" />
|
|
<option name="myId" value="REMOVED_FROM_REPOSITORY" />
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<option name="myUpdateName" value="Restored" />
|
|
<option name="myUpdateName" value="Restored" />
|
|
@@ -352,6 +600,41 @@
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myId" value="RESTORED" />
|
|
<option name="myId" value="RESTORED" />
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<FILE-GROUP>
|
|
@@ -360,6 +643,41 @@
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myId" value="MODIFIED" />
|
|
<option name="myId" value="MODIFIED" />
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<option name="myUpdateName" value="Skipped" />
|
|
<option name="myUpdateName" value="Skipped" />
|
|
@@ -367,6 +685,41 @@
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myId" value="SKIPPED" />
|
|
<option name="myId" value="SKIPPED" />
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<option name="myUpdateName" value="Merged with conflicts" />
|
|
<option name="myUpdateName" value="Merged with conflicts" />
|
|
@@ -374,6 +727,41 @@
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myId" value="MERGED_WITH_CONFLICTS" />
|
|
<option name="myId" value="MERGED_WITH_CONFLICTS" />
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<option name="myUpdateName" value="Merged with tree conflicts" />
|
|
<option name="myUpdateName" value="Merged with tree conflicts" />
|
|
@@ -381,6 +769,41 @@
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
|
|
<option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<option name="myUpdateName" value="Merged with property conflicts" />
|
|
<option name="myUpdateName" value="Merged with property conflicts" />
|
|
@@ -388,6 +811,41 @@
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
|
|
<option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<option name="myUpdateName" value="Merged" />
|
|
<option name="myUpdateName" value="Merged" />
|
|
@@ -395,6 +853,41 @@
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myId" value="MERGED" />
|
|
<option name="myId" value="MERGED" />
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<option name="myUpdateName" value="Not in repository" />
|
|
<option name="myUpdateName" value="Not in repository" />
|
|
@@ -402,6 +895,41 @@
|
|
<option name="mySupportsDeletion" value="true" />
|
|
<option name="mySupportsDeletion" value="true" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myId" value="UNKNOWN" />
|
|
<option name="myId" value="UNKNOWN" />
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<option name="myUpdateName" value="Locally added" />
|
|
<option name="myUpdateName" value="Locally added" />
|
|
@@ -409,6 +937,41 @@
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myId" value="LOCALLY_ADDED" />
|
|
<option name="myId" value="LOCALLY_ADDED" />
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<option name="myUpdateName" value="Locally removed" />
|
|
<option name="myUpdateName" value="Locally removed" />
|
|
@@ -416,6 +979,41 @@
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myId" value="LOCALLY_REMOVED" />
|
|
<option name="myId" value="LOCALLY_REMOVED" />
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<FILE-GROUP>
|
|
<option name="myUpdateName" value="Switched" />
|
|
<option name="myUpdateName" value="Switched" />
|
|
@@ -423,6 +1021,41 @@
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="mySupportsDeletion" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myCanBeAbsent" value="false" />
|
|
<option name="myId" value="SWITCHED" />
|
|
<option name="myId" value="SWITCHED" />
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
|
|
+ <FILE-GROUP>
|
|
|
|
+ <option name="myUpdateName" />
|
|
|
|
+ <option name="myStatusName" />
|
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
|
+ <option name="myId" />
|
|
|
|
+ </FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</FILE-GROUP>
|
|
</UpdatedFiles>
|
|
</UpdatedFiles>
|
|
</component>
|
|
</component>
|
|
@@ -768,10 +1401,10 @@
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
- <frame x="-57" y="121" width="1933" height="884" extended-state="0" />
|
|
|
|
|
|
+ <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
<editor active="true" />
|
|
<editor active="true" />
|
|
<layout>
|
|
<layout>
|
|
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17351842" />
|
|
|
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12526652" />
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
<window_info id="Favorites" order="2" side_tool="true" />
|
|
<window_info id="Favorites" order="2" side_tool="true" />
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
@@ -782,7 +1415,7 @@
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
|
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
|
- <window_info active="true" anchor="bottom" id="Version Control" order="8" visible="true" weight="0.21066667" />
|
|
|
|
|
|
+ <window_info anchor="bottom" id="Version Control" order="8" weight="0.4815618" />
|
|
<window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
|
|
<window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
|
|
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
|
|
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
|
|
<window_info anchor="bottom" id="Terminal" order="11" weight="0.3264642" />
|
|
<window_info anchor="bottom" id="Terminal" order="11" weight="0.3264642" />
|
|
@@ -894,22 +1527,8 @@
|
|
<provider selected="true" editor-type-id="images" />
|
|
<provider selected="true" editor-type-id="images" />
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/33" />
|
|
<entry file="file://$PROJECT_DIR$/33" />
|
|
- <entry file="file://$PROJECT_DIR$/.gitignore">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="108">
|
|
|
|
- <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/imgs/404.png" />
|
|
<entry file="file://$PROJECT_DIR$/imgs/404.png" />
|
|
<entry file="file://$PROJECT_DIR$/h_exam/404.html" />
|
|
<entry file="file://$PROJECT_DIR$/h_exam/404.html" />
|
|
- <entry file="file://$PROJECT_DIR$/404.html">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="351">
|
|
|
|
- <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/imgs/msg.png">
|
|
<entry file="file://$PROJECT_DIR$/imgs/msg.png">
|
|
<provider selected="true" editor-type-id="images" />
|
|
<provider selected="true" editor-type-id="images" />
|
|
</entry>
|
|
</entry>
|
|
@@ -932,8 +1551,8 @@
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/js/exam_detail_img.js">
|
|
<entry file="file://$PROJECT_DIR$/js/exam_detail_img.js">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="1026">
|
|
|
|
- <caret line="38" column="214" selection-start-line="38" selection-start-column="208" selection-end-line="38" selection-end-column="214" />
|
|
|
|
|
|
+ <state relative-caret-position="1188">
|
|
|
|
+ <caret line="44" column="51" selection-start-line="44" selection-start-column="51" selection-end-line="44" selection-end-column="51" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -962,8 +1581,8 @@
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/css/exam_detail_img.css">
|
|
<entry file="file://$PROJECT_DIR$/css/exam_detail_img.css">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="292">
|
|
|
|
- <caret line="79" column="2" lean-forward="true" selection-start-line="79" selection-start-column="2" selection-end-line="79" selection-end-column="16" />
|
|
|
|
|
|
+ <state relative-caret-position="248">
|
|
|
|
+ <caret line="59" column="34" lean-forward="true" selection-start-line="59" selection-start-column="34" selection-end-line="59" selection-end-column="34" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -976,8 +1595,8 @@
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/index.html">
|
|
<entry file="file://$PROJECT_DIR$/index.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="330">
|
|
|
|
- <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
|
|
|
|
|
|
+ <state relative-caret-position="324">
|
|
|
|
+ <caret line="12" column="18" lean-forward="true" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -1018,5 +1637,31 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/.gitignore">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="81">
|
|
|
|
+ <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/404.html">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="351">
|
|
|
|
+ <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/h_exam/exam_detail_s_img.html">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="247">
|
|
|
|
+ <caret line="66" column="42" lean-forward="true" selection-start-line="66" selection-start-column="42" selection-end-line="66" selection-end-column="42" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="e#3935#3941#0" expanded="true" />
|
|
|
|
+ <element signature="e#3941#3947#0" expanded="true" />
|
|
|
|
+ <element signature="n#style#0;n#div#0;n#div#4;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
|
+ </folding>
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
</component>
|
|
</component>
|
|
</project>
|
|
</project>
|