| xqd
@@ -2,8 +2,7 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
|
|
|
- <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" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
| xqd
@@ -17,20 +16,20 @@
|
|
|
<file leaf-file-name="forum_group.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-14826">
|
|
|
+ <state relative-caret-position="-15570">
|
|
|
<caret line="251" column="205" lean-forward="false" selection-start-line="251" selection-start-column="199" selection-end-line="251" selection-end-column="205" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="false">
|
|
|
+ <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="true">
|
|
|
<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="694">
|
|
|
- <caret line="810" column="37" lean-forward="true" selection-start-line="810" selection-start-column="37" selection-end-line="810" selection-end-column="37" />
|
|
|
+ <state relative-caret-position="625">
|
|
|
+ <caret line="1418" column="30" lean-forward="false" selection-start-line="1418" selection-start-column="30" selection-end-line="1418" selection-end-column="30" />
|
|
|
<folding>
|
|
|
- <marker date="1525620688984" expanded="true" signature="18830:18842" ph="..." />
|
|
|
+ <marker date="1525620896018" expanded="true" signature="18830:18842" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -46,7 +45,7 @@
|
|
|
</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="248">
|
| xqd
@@ -110,9 +109,9 @@
|
|
|
<option value="$PROJECT_DIR$/template/default/group/group_area.htm" />
|
|
|
<option value="$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php" />
|
|
|
<option value="$PROJECT_DIR$/source/module/group/group_index.php" />
|
|
|
- <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
|
|
|
<option value="$PROJECT_DIR$/config/config_global.php" />
|
|
|
<option value="$PROJECT_DIR$/config/config_ucenter.php" />
|
|
|
+ <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
| xqd
@@ -219,12 +218,12 @@
|
|
|
<workItem from="1525181078381" duration="610000" />
|
|
|
<workItem from="1525227575525" duration="11054000" />
|
|
|
<workItem from="1525275777043" duration="4000" />
|
|
|
- <workItem from="1525612433789" duration="6006000" />
|
|
|
+ <workItem from="1525612433789" duration="6143000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="21894000" />
|
|
|
+ <option name="totallyTimeSpent" value="22031000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
| xqd
@@ -325,7 +324,7 @@
|
|
|
<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="1525620688984" expanded="true" signature="18830:18842" ph="..." />
|
|
|
+ <marker date="1525620896018" expanded="true" signature="18830:18842" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -393,7 +392,7 @@
|
|
|
<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="1525620688984" expanded="true" signature="18830:18842" ph="..." />
|
|
|
+ <marker date="1525620896018" expanded="true" signature="18830:18842" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -403,7 +402,7 @@
|
|
|
<state relative-caret-position="23901">
|
|
|
<caret line="769" column="151" lean-forward="false" selection-start-line="769" selection-start-column="149" selection-end-line="769" selection-end-column="151" />
|
|
|
<folding>
|
|
|
- <marker date="1525620688984" expanded="true" signature="18830:18842" ph="..." />
|
|
|
+ <marker date="1525620896018" expanded="true" signature="18830:18842" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -613,37 +612,37 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-14826">
|
|
|
- <caret line="251" column="205" lean-forward="false" selection-start-line="251" selection-start-column="199" selection-end-line="251" selection-end-column="205" />
|
|
|
+ <state relative-caret-position="279">
|
|
|
+ <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="2" selection-end-line="10" selection-end-column="41" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="694">
|
|
|
- <caret line="810" column="37" lean-forward="true" selection-start-line="810" selection-start-column="37" selection-end-line="810" selection-end-column="37" />
|
|
|
- <folding>
|
|
|
- <marker date="1525620688984" expanded="true" signature="18830:18842" ph="..." />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="248">
|
|
|
+ <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="2" selection-end-line="9" selection-end-column="30" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="279">
|
|
|
- <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="2" selection-end-line="10" selection-end-column="41" />
|
|
|
+ <state relative-caret-position="-15570">
|
|
|
+ <caret line="251" column="205" lean-forward="false" selection-start-line="251" selection-start-column="199" selection-end-line="251" selection-end-column="205" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
|
|
|
+ <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="248">
|
|
|
- <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="2" selection-end-line="9" selection-end-column="30" />
|
|
|
- <folding />
|
|
|
+ <state relative-caret-position="625">
|
|
|
+ <caret line="1418" column="30" lean-forward="false" selection-start-line="1418" selection-start-column="30" selection-end-line="1418" selection-end-column="30" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1525620896018" expanded="true" signature="18830:18842" ph="..." />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|