| xqd
@@ -2,7 +2,7 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.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
@@ -33,7 +33,7 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="true">
|
|
|
+ <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="477">
|
| xqd
@@ -57,13 +57,13 @@
|
|
|
</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="233">
|
|
|
- <caret line="1358" column="77" lean-forward="false" selection-start-line="1358" selection-start-column="39" selection-end-line="1358" selection-end-column="77" />
|
|
|
+ <state relative-caret-position="529">
|
|
|
+ <caret line="18" column="80" lean-forward="true" selection-start-line="18" selection-start-column="80" selection-end-line="18" selection-end-column="80" />
|
|
|
<folding>
|
|
|
- <marker date="1525270666326" expanded="true" signature="18737:18749" ph="..." />
|
|
|
+ <marker date="1525271072146" expanded="true" signature="18744:18756" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -104,8 +104,8 @@
|
|
|
<option value="$PROJECT_DIR$/group.php" />
|
|
|
<option value="$PROJECT_DIR$/config/config_global.php" />
|
|
|
<option value="$PROJECT_DIR$/source/function/function_group.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$/data/template/3_diy_group_group.tpl.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
| xqd
@@ -202,12 +202,12 @@
|
|
|
<workItem from="1525013350506" duration="115000" />
|
|
|
<workItem from="1525013490770" duration="4105000" />
|
|
|
<workItem from="1525181078381" duration="610000" />
|
|
|
- <workItem from="1525227575525" duration="6891000" />
|
|
|
+ <workItem from="1525227575525" duration="6984000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="11721000" />
|
|
|
+ <option name="totallyTimeSpent" value="11814000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
| xqd
@@ -250,7 +250,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="1525270666326" expanded="true" signature="18737:18749" ph="..." />
|
|
|
+ <marker date="1525271072146" expanded="true" signature="18744:18756" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -397,13 +397,11 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="233">
|
|
|
- <caret line="1358" column="77" lean-forward="false" selection-start-line="1358" selection-start-column="39" selection-end-line="1358" selection-end-column="77" />
|
|
|
- <folding>
|
|
|
- <marker date="1525270666326" expanded="true" signature="18737:18749" ph="..." />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="477">
|
|
|
+ <caret line="121" column="47" lean-forward="false" selection-start-line="121" selection-start-column="47" selection-end-line="121" selection-end-column="47" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
| xqd
@@ -419,11 +417,13 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.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="477">
|
|
|
- <caret line="121" column="47" lean-forward="false" selection-start-line="121" selection-start-column="47" selection-end-line="121" selection-end-column="47" />
|
|
|
- <folding />
|
|
|
+ <state relative-caret-position="529">
|
|
|
+ <caret line="18" column="80" lean-forward="true" selection-start-line="18" selection-start-column="80" selection-end-line="18" selection-end-column="80" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1525271072146" expanded="true" signature="18744:18756" ph="..." />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|