| xqd
@@ -3,6 +3,7 @@
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
| xqd
@@ -13,11 +14,11 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
|
|
|
- <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="false">
|
|
|
+ <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="true">
|
|
|
<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="363" column="337" lean-forward="true" selection-start-line="363" selection-start-column="337" selection-end-line="363" selection-end-column="337" />
|
|
|
+ <state relative-caret-position="446">
|
|
|
+ <caret line="347" column="40" lean-forward="false" selection-start-line="347" selection-start-column="40" selection-end-line="347" selection-end-column="40" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -39,7 +40,7 @@
|
|
|
<file leaf-file-name="function_forum.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/source/function/function_forum.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="305">
|
|
|
+ <state relative-caret-position="-253">
|
|
|
<caret line="707" column="9" lean-forward="false" selection-start-line="707" selection-start-column="9" selection-end-line="707" selection-end-column="9" />
|
|
|
<folding>
|
|
|
<marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
|
| xqd
@@ -87,15 +88,15 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="true">
|
|
|
+ <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="false">
|
|
|
<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="589">
|
|
|
- <caret line="64" column="17" lean-forward="true" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" />
|
|
|
+ <state relative-caret-position="-3553">
|
|
|
+ <caret line="698" column="94" lean-forward="true" selection-start-line="698" selection-start-column="94" selection-end-line="698" selection-end-column="94" />
|
|
|
<folding>
|
|
|
- <element signature="e#72555#72561#0#HTML" expanded="true" />
|
|
|
- <element signature="e#73181#73187#0#HTML" expanded="true" />
|
|
|
- <marker date="1525622970134" expanded="true" signature="18891:18903" ph="..." />
|
|
|
+ <element signature="e#72585#72591#0#HTML" expanded="true" />
|
|
|
+ <element signature="e#73211#73217#0#HTML" expanded="true" />
|
|
|
+ <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -139,7 +140,6 @@
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
|
- <find>activityattach_image</find>
|
|
|
<find>groupnamecheck</find>
|
|
|
<find>checkgroupname</find>
|
|
|
<find>$jointype</find>
|
| xqd
@@ -168,6 +168,7 @@
|
|
|
<find>bannernew_image</find>
|
|
|
<find>bannernew_upload</find>
|
|
|
<find>bannernew_url</find>
|
|
|
+ <find>创建我的俱乐部</find>
|
|
|
<find>upload_icon_banner</find>
|
|
|
</findStrings>
|
|
|
</component>
|
| xqd
@@ -193,8 +194,8 @@
|
|
|
<option value="$PROJECT_DIR$/source/module/group/group_index.php" />
|
|
|
<option value="$PROJECT_DIR$/config/config_global.php" />
|
|
|
<option value="$PROJECT_DIR$/config/config_ucenter.php" />
|
|
|
- <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
|
|
|
<option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
|
|
|
+ <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
| xqd
@@ -301,12 +302,12 @@
|
|
|
<workItem from="1525181078381" duration="610000" />
|
|
|
<workItem from="1525227575525" duration="11054000" />
|
|
|
<workItem from="1525275777043" duration="4000" />
|
|
|
- <workItem from="1525612433789" duration="8202000" />
|
|
|
+ <workItem from="1525612433789" duration="8631000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="24090000" />
|
|
|
+ <option name="totallyTimeSpent" value="24519000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
| xqd
@@ -407,9 +408,9 @@
|
|
|
<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>
|
|
|
- <element signature="e#72555#72561#0#HTML" expanded="true" />
|
|
|
- <element signature="e#73181#73187#0#HTML" expanded="true" />
|
|
|
- <marker date="1525622970134" expanded="true" signature="18891:18903" ph="..." />
|
|
|
+ <element signature="e#72585#72591#0#HTML" expanded="true" />
|
|
|
+ <element signature="e#73211#73217#0#HTML" expanded="true" />
|
|
|
+ <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -477,9 +478,9 @@
|
|
|
<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>
|
|
|
- <element signature="e#72555#72561#0#HTML" expanded="true" />
|
|
|
- <element signature="e#73181#73187#0#HTML" expanded="true" />
|
|
|
- <marker date="1525622970134" expanded="true" signature="18891:18903" ph="..." />
|
|
|
+ <element signature="e#72585#72591#0#HTML" expanded="true" />
|
|
|
+ <element signature="e#73211#73217#0#HTML" expanded="true" />
|
|
|
+ <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -489,9 +490,9 @@
|
|
|
<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>
|
|
|
- <element signature="e#72555#72561#0#HTML" expanded="true" />
|
|
|
- <element signature="e#73181#73187#0#HTML" expanded="true" />
|
|
|
- <marker date="1525622970134" expanded="true" signature="18891:18903" ph="..." />
|
|
|
+ <element signature="e#72585#72591#0#HTML" expanded="true" />
|
|
|
+ <element signature="e#73211#73217#0#HTML" expanded="true" />
|
|
|
+ <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -714,20 +715,21 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/source/function/function_core.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="314">
|
|
|
- <caret line="1429" column="9" lean-forward="false" selection-start-line="1429" selection-start-column="9" selection-end-line="1429" selection-end-column="9" />
|
|
|
+ <state relative-caret-position="-3553">
|
|
|
+ <caret line="698" column="94" lean-forward="true" selection-start-line="698" selection-start-column="94" selection-end-line="698" selection-end-column="94" />
|
|
|
<folding>
|
|
|
- <marker date="1525615190064" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
|
|
|
- <marker date="1525615190064" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
|
|
|
+ <element signature="e#72585#72591#0#HTML" expanded="true" />
|
|
|
+ <element signature="e#73211#73217#0#HTML" expanded="true" />
|
|
|
+ <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/source/function/function_forum.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="305">
|
|
|
+ <state relative-caret-position="-253">
|
|
|
<caret line="707" column="9" lean-forward="false" selection-start-line="707" selection-start-column="9" selection-end-line="707" selection-end-column="9" />
|
|
|
<folding>
|
|
|
<marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
|
| xqd
@@ -764,23 +766,22 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="539">
|
|
|
- <caret line="363" column="337" lean-forward="true" selection-start-line="363" selection-start-column="337" selection-end-line="363" selection-end-column="337" />
|
|
|
- <folding />
|
|
|
+ <state relative-caret-position="314">
|
|
|
+ <caret line="1429" column="9" lean-forward="false" selection-start-line="1429" selection-start-column="9" selection-end-line="1429" selection-end-column="9" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1525615190064" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
|
|
|
+ <marker date="1525615190064" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
|
|
|
+ </folding>
|
|
|
</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="589">
|
|
|
- <caret line="64" column="17" lean-forward="true" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" />
|
|
|
- <folding>
|
|
|
- <element signature="e#72555#72561#0#HTML" expanded="true" />
|
|
|
- <element signature="e#73181#73187#0#HTML" expanded="true" />
|
|
|
- <marker date="1525622970134" expanded="true" signature="18891:18903" ph="..." />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="446">
|
|
|
+ <caret line="347" column="40" lean-forward="false" selection-start-line="347" selection-start-column="40" selection-end-line="347" selection-end-column="40" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|