| 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$/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" />
|
|
|
+ <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
@@ -14,10 +14,10 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
|
|
|
- <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="508">
|
|
|
+ <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" />
|
|
|
<folding />
|
|
|
</state>
|
| xqd
@@ -125,8 +125,8 @@
|
|
|
<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="248">
|
|
|
- <caret line="8" column="47" lean-forward="false" selection-start-line="8" selection-start-column="31" selection-end-line="8" selection-end-column="47" />
|
|
|
+ <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" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -146,11 +146,11 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="config_ucenter.php" pinned="false" current-in-tab="false">
|
|
|
+ <file leaf-file-name="config_ucenter.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/config/config_ucenter.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" />
|
|
|
+ <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" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -187,9 +187,9 @@
|
|
|
<find>创建我的俱乐部</find>
|
|
|
<find>checkgroupname</find>
|
|
|
<find>print_r</find>
|
|
|
- <find>upload_icon_banner</find>
|
|
|
<find>所属分类</find>
|
|
|
<find>s_province</find>
|
|
|
+ <find>upload_icon_banner</find>
|
|
|
</findStrings>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
| xqd
@@ -212,11 +212,11 @@
|
|
|
<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$/config/config_global.php" />
|
|
|
- <option value="$PROJECT_DIR$/config/config_ucenter.php" />
|
|
|
<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" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
| xqd
@@ -251,7 +251,6 @@
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
- <pane id="Scope" />
|
|
|
<pane id="Scratches" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
| xqd
@@ -280,6 +279,7 @@
|
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
+ <pane id="Scope" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
| xqd
@@ -324,18 +324,18 @@
|
|
|
<workItem from="1525227575525" duration="11054000" />
|
|
|
<workItem from="1525275777043" duration="4000" />
|
|
|
<workItem from="1525612433789" duration="9986000" />
|
|
|
- <workItem from="1525658293907" duration="2451000" />
|
|
|
+ <workItem from="1525658293907" duration="2979000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="28325000" />
|
|
|
+ <option name="totallyTimeSpent" value="28853000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
| xqd
@@ -694,14 +694,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/config/config_ucenter.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>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/source/function/function_group.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="2635">
|
| xqd
@@ -790,14 +782,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="248">
|
|
|
- <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$/data/template/3_diy_group_group.tpl.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="470">
|
| xqd
@@ -810,11 +794,27 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="508">
|
|
|
+ <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" />
|
|
|
<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="-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" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <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" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
</project>
|