| xqd
@@ -2,8 +2,8 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
|
|
|
+ <change beforePath="$PROJECT_DIR$/forum.php" afterPath="$PROJECT_DIR$/forum.php" />
|
|
|
<change beforePath="$PROJECT_DIR$/index.php" afterPath="$PROJECT_DIR$/index.php" />
|
|
|
- <change beforePath="$PROJECT_DIR$/portal.php" afterPath="$PROJECT_DIR$/portal.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
| xqd
@@ -14,11 +14,21 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
|
|
|
- <file leaf-file-name="index.php" pinned="false" current-in-tab="true">
|
|
|
+ <file leaf-file-name="forum.php" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/forum.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="217">
|
|
|
+ <caret line="12" column="21" lean-forward="false" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="31">
|
|
|
- <caret line="1" column="21" lean-forward="false" selection-start-line="1" selection-start-column="21" selection-end-line="1" selection-end-column="21" />
|
|
|
+ <state relative-caret-position="-868">
|
|
|
+ <caret line="8" column="6" lean-forward="true" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -68,7 +78,6 @@
|
|
|
<list>
|
|
|
<option value="$PROJECT_DIR$/static/js/forum_post.js" />
|
|
|
<option value="$PROJECT_DIR$/source/language/lang_message.php" />
|
|
|
- <option value="$PROJECT_DIR$/forum.php" />
|
|
|
<option value="$PROJECT_DIR$/source/function/function_group.php" />
|
|
|
<option value="$PROJECT_DIR$/static/js/common.js" />
|
|
|
<option value="$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php" />
|
| xqd
@@ -93,6 +102,7 @@
|
|
|
<option value="$PROJECT_DIR$/source/module/group/group_index.php" />
|
|
|
<option value="$PROJECT_DIR$/portal.php" />
|
|
|
<option value="$PROJECT_DIR$/index.php" />
|
|
|
+ <option value="$PROJECT_DIR$/forum.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
| xqd
@@ -135,22 +145,6 @@
|
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
- <path>
|
|
|
- <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
- <item name="config" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
- <item name="uc_server" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
- <item name="uc_server" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
- <item name="model" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
- </path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
| xqd
@@ -200,12 +194,12 @@
|
|
|
<workItem from="1525227575525" duration="11054000" />
|
|
|
<workItem from="1525275777043" duration="4000" />
|
|
|
<workItem from="1525612433789" duration="9986000" />
|
|
|
- <workItem from="1525658293907" duration="19032000" />
|
|
|
+ <workItem from="1525658293907" duration="19172000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="44906000" />
|
|
|
+ <option name="totallyTimeSpent" value="45046000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
| xqd
@@ -243,43 +237,6 @@
|
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="4836">
|
|
|
- <caret line="161" column="19" lean-forward="false" selection-start-line="161" selection-start-column="19" selection-end-line="161" selection-end-column="19" />
|
|
|
- <folding>
|
|
|
- <marker date="1525269524011" expanded="true" signature="5365:5373" ph="›" />
|
|
|
- <marker date="1525269524011" expanded="true" signature="5503:5511" ph="›" />
|
|
|
- <marker date="1525269524011" expanded="true" signature="5812:5820" ph="›" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="682">
|
|
|
- <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/static/js/common.js">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="37510">
|
|
|
- <caret line="1215" column="137" lean-forward="false" selection-start-line="1215" selection-start-column="137" selection-end-line="1215" selection-end-column="137" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="43679">
|
|
|
- <caret line="1407" column="16" lean-forward="false" selection-start-line="1407" selection-start-column="8" selection-end-line="1407" selection-end-column="16" />
|
|
|
- <folding>
|
|
|
- <marker date="1525660444406" expanded="true" signature="18891:18903" ph="..." />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="23901">
|
| xqd
@@ -341,13 +298,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/forum.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="636">
|
|
|
- <caret line="70" column="0" lean-forward="true" selection-start-line="70" selection-start-column="0" selection-end-line="70" selection-end-column="0" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/common/header_no_nav.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
| xqd
@@ -884,18 +834,58 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/addoncert.txt">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="0">
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/admin.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-697">
|
|
|
+ <state relative-caret-position="31">
|
|
|
<caret line="28" column="12" lean-forward="true" selection-start-line="28" selection-start-column="12" selection-end-line="28" selection-end-column="12" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/api.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="0">
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/connect.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="0">
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/crossdomain.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="0">
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="31">
|
|
|
- <caret line="1" column="21" lean-forward="false" selection-start-line="1" selection-start-column="21" selection-end-line="1" selection-end-column="21" />
|
|
|
+ <state relative-caret-position="-868">
|
|
|
+ <caret line="8" column="6" lean-forward="true" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/forum.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="217">
|
|
|
+ <caret line="12" column="21" lean-forward="false" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|