| 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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
<change beforePath="$PROJECT_DIR$/config/config_global.php" afterPath="$PROJECT_DIR$/config/config_global.php" />
|
|
|
- <change beforePath="$PROJECT_DIR$/config/config_ucenter.php" afterPath="$PROJECT_DIR$/config/config_ucenter.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
| xqd
@@ -18,7 +18,7 @@
|
|
|
<entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="539">
|
|
|
- <caret line="366" column="58" lean-forward="true" selection-start-line="366" selection-start-column="58" selection-end-line="366" selection-end-column="58" />
|
|
|
+ <caret line="366" column="58" lean-forward="false" selection-start-line="366" selection-start-column="58" selection-end-line="366" selection-end-column="58" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -104,7 +104,7 @@
|
|
|
<entry file="file://$PROJECT_DIR$/data/cache/area-select/area.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="739">
|
|
|
- <caret line="34" column="1" lean-forward="true" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
|
|
|
+ <caret line="34" column="1" lean-forward="false" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -122,11 +122,11 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="config_global.php" pinned="false" current-in-tab="false">
|
|
|
+ <file leaf-file-name="config_global.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-2108">
|
|
|
- <caret line="10" column="41" lean-forward="true" selection-start-line="10" selection-start-column="41" selection-end-line="10" selection-end-column="41" />
|
|
|
+ <state relative-caret-position="155">
|
|
|
+ <caret line="53" column="57" lean-forward="true" selection-start-line="53" selection-start-column="57" selection-end-line="53" selection-end-column="57" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -146,11 +146,11 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="config_ucenter.php" pinned="false" current-in-tab="true">
|
|
|
+ <file leaf-file-name="config_ucenter.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="217">
|
|
|
- <caret line="7" column="38" lean-forward="true" selection-start-line="7" selection-start-column="38" selection-end-line="7" selection-end-column="38" />
|
|
|
+ <caret line="7" column="35" lean-forward="false" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="35" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -215,8 +215,8 @@
|
|
|
<option value="$PROJECT_DIR$/source/function/function_forum.php" />
|
|
|
<option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
|
|
|
<option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
|
|
|
- <option value="$PROJECT_DIR$/config/config_global.php" />
|
|
|
<option value="$PROJECT_DIR$/config/config_ucenter.php" />
|
|
|
+ <option value="$PROJECT_DIR$/config/config_global.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
| xqd
@@ -324,12 +324,12 @@
|
|
|
<workItem from="1525227575525" duration="11054000" />
|
|
|
<workItem from="1525275777043" duration="4000" />
|
|
|
<workItem from="1525612433789" duration="9986000" />
|
|
|
- <workItem from="1525658293907" duration="2979000" />
|
|
|
+ <workItem from="1525658293907" duration="3787000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="28853000" />
|
|
|
+ <option name="totallyTimeSpent" value="29661000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
| xqd
@@ -777,7 +777,7 @@
|
|
|
<entry file="file://$PROJECT_DIR$/data/cache/area-select/area.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="739">
|
|
|
- <caret line="34" column="1" lean-forward="true" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
|
|
|
+ <caret line="34" column="1" lean-forward="false" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -795,23 +795,23 @@
|
|
|
<entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="539">
|
|
|
- <caret line="366" column="58" lean-forward="true" selection-start-line="366" selection-start-column="58" selection-end-line="366" selection-end-column="58" />
|
|
|
+ <caret line="366" column="58" lean-forward="false" selection-start-line="366" selection-start-column="58" selection-end-line="366" selection-end-column="58" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-2108">
|
|
|
- <caret line="10" column="41" lean-forward="true" selection-start-line="10" selection-start-column="41" selection-end-line="10" selection-end-column="41" />
|
|
|
+ <state relative-caret-position="217">
|
|
|
+ <caret line="7" column="35" lean-forward="false" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="35" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="217">
|
|
|
- <caret line="7" column="38" lean-forward="true" selection-start-line="7" selection-start-column="38" selection-end-line="7" selection-end-column="38" />
|
|
|
+ <state relative-caret-position="155">
|
|
|
+ <caret line="53" column="57" lean-forward="true" selection-start-line="53" selection-start-column="57" selection-end-line="53" selection-end-column="57" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|