| xqd
@@ -26,15 +26,37 @@
|
|
|
<file leaf-file-name="3_diy_group_group_sg.tpl.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group_sg.tpl.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="440">
|
|
|
- <caret line="60" column="52" lean-forward="false" selection-start-line="60" selection-start-column="52" selection-end-line="60" selection-end-column="52" />
|
|
|
+ <state relative-caret-position="688">
|
|
|
+ <caret line="62" column="198" lean-forward="false" selection-start-line="62" selection-start-column="198" selection-end-line="62" selection-end-column="198" />
|
|
|
<folding>
|
|
|
- <marker date="1525791799229" expanded="true" signature="19458:19470" ph="..." />
|
|
|
+ <marker date="1525792312045" expanded="true" signature="19503:19515" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
+ <file leaf-file-name="function_group.php" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="686">
|
|
|
+ <caret line="93" column="18" lean-forward="true" selection-start-line="93" selection-start-column="18" selection-end-line="93" selection-end-column="18" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1525269524011" expanded="true" signature="5812:5820" ph="›" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="config_global.php" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="333">
|
|
|
+ <caret line="61" column="27" lean-forward="false" selection-start-line="61" selection-start-column="22" selection-end-line="61" selection-end-column="27" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
<file leaf-file-name="group_index.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
| xqd
@@ -48,7 +70,7 @@
|
|
|
<file leaf-file-name="3_diy_group_area.tpl.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="538">
|
|
|
+ <state relative-caret-position="569">
|
|
|
<caret line="102" column="73" lean-forward="false" selection-start-line="102" selection-start-column="56" selection-end-line="102" selection-end-column="73" />
|
|
|
<folding />
|
|
|
</state>
|
| xqd
@@ -59,8 +81,6 @@
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
|
- <find>jquery</find>
|
|
|
- <find>收藏</find>
|
|
|
<find>fwin_a_favorite</find>
|
|
|
<find>append_parent</find>
|
|
|
<find>$groupnav</find>
|
| xqd
@@ -89,6 +109,8 @@
|
|
|
<find>upload_icon_banner</find>
|
|
|
<find>创建我的俱乐部</find>
|
|
|
<find>推荐</find>
|
|
|
+ <find>attach</find>
|
|
|
+ <find>attachurl</find>
|
|
|
</findStrings>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
| xqd
@@ -232,12 +254,12 @@
|
|
|
<workItem from="1525658293907" duration="23514000" />
|
|
|
<workItem from="1525701498505" duration="7843000" />
|
|
|
<workItem from="1525738524458" duration="1328000" />
|
|
|
- <workItem from="1525788960861" duration="2826000" />
|
|
|
+ <workItem from="1525788960861" duration="3334000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="61385000" />
|
|
|
+ <option name="totallyTimeSpent" value="61893000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
| xqd
@@ -464,13 +486,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="460">
|
|
|
- <caret line="303" column="21" lean-forward="false" selection-start-line="303" selection-start-column="21" selection-end-line="303" selection-end-column="21" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forumfield.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="636">
|
| xqd
@@ -622,14 +637,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="62">
|
|
|
- <caret line="8" column="47" lean-forward="false" selection-start-line="8" selection-start-column="31" selection-end-line="8" selection-end-column="47" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/source/module/portal/portal_index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="605">
|
| xqd
@@ -656,6 +663,22 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="569">
|
|
|
+ <caret line="102" column="73" lean-forward="false" selection-start-line="102" selection-start-column="56" selection-end-line="102" selection-end-column="73" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="333">
|
|
|
+ <caret line="61" column="27" lean-forward="false" selection-start-line="61" selection-start-column="22" selection-end-line="61" selection-end-column="27" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="264">
|
| xqd
@@ -664,20 +687,22 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="538">
|
|
|
- <caret line="102" column="73" lean-forward="false" selection-start-line="102" selection-start-column="56" selection-end-line="102" selection-end-column="73" />
|
|
|
- <folding />
|
|
|
+ <state relative-caret-position="686">
|
|
|
+ <caret line="93" column="18" lean-forward="true" selection-start-line="93" selection-start-column="18" selection-end-line="93" selection-end-column="18" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1525269524011" expanded="true" signature="5812:5820" ph="›" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group_sg.tpl.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="440">
|
|
|
- <caret line="60" column="52" lean-forward="false" selection-start-line="60" selection-start-column="52" selection-end-line="60" selection-end-column="52" />
|
|
|
+ <state relative-caret-position="688">
|
|
|
+ <caret line="62" column="198" lean-forward="false" selection-start-line="62" selection-start-column="198" selection-end-line="62" selection-end-column="198" />
|
|
|
<folding>
|
|
|
- <marker date="1525791799229" expanded="true" signature="19458:19470" ph="..." />
|
|
|
+ <marker date="1525792312045" expanded="true" signature="19503:19515" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|