|
@@ -27,64 +27,22 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
|
|
|
- <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/views/product/index.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="100">
|
|
|
- <caret line="4" column="83" selection-start-line="4" selection-start-column="83" selection-end-line="4" selection-end-column="83" />
|
|
|
- <folding>
|
|
|
- <marker date="1474452054326" expanded="true" signature="15497:15509" ph="..." />
|
|
|
- <marker date="1474452054326" expanded="true" signature="15560:15577" ph="..." />
|
|
|
- <marker date="1474452054326" expanded="true" signature="23122:23128" ph=" " />
|
|
|
- <marker date="1474452054326" expanded="true" signature="23128:23134" ph=" " />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/views/slide/index.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="292">
|
|
|
- <caret line="253" column="112" selection-start-line="253" selection-start-column="112" selection-end-line="253" selection-end-column="112" />
|
|
|
- <folding>
|
|
|
- <marker date="1474452064373" expanded="true" signature="17758:17775" ph="..." />
|
|
|
- <marker date="1474452064373" expanded="true" signature="18274:18291" ph="..." />
|
|
|
- <marker date="1474452064373" expanded="true" signature="21454:21471" ph="..." />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/views/rUser/index.php">
|
|
|
+ <file leaf-file-name="console.php" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/config/console.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="292">
|
|
|
- <caret line="243" column="112" selection-start-line="243" selection-start-column="112" selection-end-line="243" selection-end-column="112" />
|
|
|
- <folding>
|
|
|
- <marker date="1474452070375" expanded="true" signature="14327:14344" ph="..." />
|
|
|
- <marker date="1474452070375" expanded="true" signature="16762:16772" ph="..." />
|
|
|
- <marker date="1474452070375" expanded="true" signature="16934:16952" ph="..." />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="541">
|
|
|
+ <caret line="318" column="0" selection-start-line="318" selection-start-column="0" selection-end-line="318" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/modules/o2o/views/tech/index.php">
|
|
|
+ <file leaf-file-name="develop.php" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/config/develop.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="125">
|
|
|
- <caret line="5" column="112" selection-start-line="5" selection-start-column="112" selection-end-line="5" selection-end-column="112" />
|
|
|
- <folding>
|
|
|
- <marker date="1474452076116" expanded="true" signature="16930:16944" ph="..." />
|
|
|
- <marker date="1474452076116" expanded="true" signature="17543:17549" ph="..." />
|
|
|
- <marker date="1474452076116" expanded="true" signature="18158:18173" ph="..." />
|
|
|
- <marker date="1474452076116" expanded="true" signature="18904:18920" ph="..." />
|
|
|
- <marker date="1474452076116" expanded="true" signature="30704:30710" ph=" " />
|
|
|
- <marker date="1474452076116" expanded="true" signature="30710:30716" ph=" " />
|
|
|
- <marker date="1474452076116" expanded="true" signature="30865:30871" ph=" " />
|
|
|
- <marker date="1474452076116" expanded="true" signature="30871:30877" ph=" " />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="541">
|
|
|
+ <caret line="53" column="26" selection-start-line="53" selection-start-column="26" selection-end-line="53" selection-end-column="26" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -92,28 +50,18 @@
|
|
|
<file leaf-file-name="main.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="403">
|
|
|
- <caret line="122" column="35" selection-start-line="122" selection-start-column="35" selection-end-line="122" selection-end-column="35" />
|
|
|
+ <state relative-caret-position="541">
|
|
|
+ <caret line="127" column="0" selection-start-line="127" selection-start-column="0" selection-end-line="127" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="console.php" pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/config/console.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="578">
|
|
|
- <caret line="320" column="30" selection-start-line="320" selection-start-column="30" selection-end-line="320" selection-end-column="30" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="develop.php" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/config/develop.php">
|
|
|
+ <file leaf-file-name="test.php" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/config/test.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="578">
|
|
|
- <caret line="55" column="30" selection-start-line="55" selection-start-column="30" selection-end-line="55" selection-end-column="30" />
|
|
|
+ <state relative-caret-position="491">
|
|
|
+ <caret line="57" column="18" selection-start-line="57" selection-start-column="18" selection-end-line="57" selection-end-column="18" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
@@ -129,29 +77,6 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="test.php" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/config/test.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="353">
|
|
|
- <caret line="54" column="30" selection-start-line="54" selection-start-column="30" selection-end-line="54" selection-end-column="30" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/views/master/index.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="292">
|
|
|
- <caret line="366" column="112" selection-start-line="366" selection-start-column="112" selection-end-line="366" selection-end-column="112" />
|
|
|
- <folding>
|
|
|
- <marker date="1474452054432" expanded="true" signature="19744:19775" ph="..." />
|
|
|
- <marker date="1474452054432" expanded="true" signature="19807:19824" ph="..." />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
</leaf>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
|
@@ -213,9 +138,9 @@
|
|
|
<option value="$PROJECT_DIR$/www/protected/views/slide/index.php" />
|
|
|
<option value="$PROJECT_DIR$/www/protected/views/rUser/index.php" />
|
|
|
<option value="$PROJECT_DIR$/www/protected/modules/o2o/views/tech/index.php" />
|
|
|
- <option value="$PROJECT_DIR$/www/protected/config/main.php" />
|
|
|
- <option value="$PROJECT_DIR$/www/protected/config/console.php" />
|
|
|
<option value="$PROJECT_DIR$/www/protected/config/develop.php" />
|
|
|
+ <option value="$PROJECT_DIR$/www/protected/config/console.php" />
|
|
|
+ <option value="$PROJECT_DIR$/www/protected/config/main.php" />
|
|
|
<option value="$PROJECT_DIR$/www/protected/config/test.php" />
|
|
|
</list>
|
|
|
</option>
|
|
@@ -446,12 +371,12 @@
|
|
|
<workItem from="1474271619805" duration="5210000" />
|
|
|
<workItem from="1474335695854" duration="27867000" />
|
|
|
<workItem from="1474419504100" duration="12299000" />
|
|
|
- <workItem from="1474436874642" duration="15556000" />
|
|
|
+ <workItem from="1474436874642" duration="15900000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="60932000" />
|
|
|
+ <option name="totallyTimeSpent" value="61276000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -839,67 +764,67 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/views/master/index.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/views/rUser/index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="292">
|
|
|
- <caret line="366" column="112" selection-start-line="366" selection-start-column="112" selection-end-line="366" selection-end-column="112" />
|
|
|
+ <caret line="243" column="112" selection-start-line="243" selection-start-column="112" selection-end-line="243" selection-end-column="112" />
|
|
|
<folding>
|
|
|
- <marker date="1474452054432" expanded="true" signature="19744:19775" ph="..." />
|
|
|
- <marker date="1474452054432" expanded="true" signature="19807:19824" ph="..." />
|
|
|
+ <marker date="1474452070375" expanded="true" signature="14327:14344" ph="..." />
|
|
|
+ <marker date="1474452070375" expanded="true" signature="16762:16772" ph="..." />
|
|
|
+ <marker date="1474452070375" expanded="true" signature="16934:16952" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/views/product/index.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/modules/o2o/views/tech/index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="100">
|
|
|
- <caret line="4" column="83" selection-start-line="4" selection-start-column="83" selection-end-line="4" selection-end-column="83" />
|
|
|
+ <state relative-caret-position="125">
|
|
|
+ <caret line="5" column="112" selection-start-line="5" selection-start-column="112" selection-end-line="5" selection-end-column="112" />
|
|
|
<folding>
|
|
|
- <marker date="1474452054326" expanded="true" signature="15497:15509" ph="..." />
|
|
|
- <marker date="1474452054326" expanded="true" signature="15560:15577" ph="..." />
|
|
|
- <marker date="1474452054326" expanded="true" signature="23122:23128" ph=" " />
|
|
|
- <marker date="1474452054326" expanded="true" signature="23128:23134" ph=" " />
|
|
|
+ <marker date="1474452076116" expanded="true" signature="16930:16944" ph="..." />
|
|
|
+ <marker date="1474452076116" expanded="true" signature="17543:17549" ph="..." />
|
|
|
+ <marker date="1474452076116" expanded="true" signature="18158:18173" ph="..." />
|
|
|
+ <marker date="1474452076116" expanded="true" signature="18904:18920" ph="..." />
|
|
|
+ <marker date="1474452076116" expanded="true" signature="30704:30710" ph=" " />
|
|
|
+ <marker date="1474452076116" expanded="true" signature="30710:30716" ph=" " />
|
|
|
+ <marker date="1474452076116" expanded="true" signature="30865:30871" ph=" " />
|
|
|
+ <marker date="1474452076116" expanded="true" signature="30871:30877" ph=" " />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/views/slide/index.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/views/master/index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="292">
|
|
|
- <caret line="253" column="112" selection-start-line="253" selection-start-column="112" selection-end-line="253" selection-end-column="112" />
|
|
|
+ <caret line="366" column="112" selection-start-line="366" selection-start-column="112" selection-end-line="366" selection-end-column="112" />
|
|
|
<folding>
|
|
|
- <marker date="1474452064373" expanded="true" signature="17758:17775" ph="..." />
|
|
|
- <marker date="1474452064373" expanded="true" signature="18274:18291" ph="..." />
|
|
|
- <marker date="1474452064373" expanded="true" signature="21454:21471" ph="..." />
|
|
|
+ <marker date="1474452054432" expanded="true" signature="19744:19775" ph="..." />
|
|
|
+ <marker date="1474452054432" expanded="true" signature="19807:19824" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/views/rUser/index.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/views/slide/index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="292">
|
|
|
- <caret line="243" column="112" selection-start-line="243" selection-start-column="112" selection-end-line="243" selection-end-column="112" />
|
|
|
+ <caret line="253" column="112" selection-start-line="253" selection-start-column="112" selection-end-line="253" selection-end-column="112" />
|
|
|
<folding>
|
|
|
- <marker date="1474452070375" expanded="true" signature="14327:14344" ph="..." />
|
|
|
- <marker date="1474452070375" expanded="true" signature="16762:16772" ph="..." />
|
|
|
- <marker date="1474452070375" expanded="true" signature="16934:16952" ph="..." />
|
|
|
+ <marker date="1474452064373" expanded="true" signature="17758:17775" ph="..." />
|
|
|
+ <marker date="1474452064373" expanded="true" signature="18274:18291" ph="..." />
|
|
|
+ <marker date="1474452064373" expanded="true" signature="21454:21471" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/modules/o2o/views/tech/index.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/views/product/index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="125">
|
|
|
- <caret line="5" column="112" selection-start-line="5" selection-start-column="112" selection-end-line="5" selection-end-column="112" />
|
|
|
+ <state relative-caret-position="100">
|
|
|
+ <caret line="4" column="83" selection-start-line="4" selection-start-column="83" selection-end-line="4" selection-end-column="83" />
|
|
|
<folding>
|
|
|
- <marker date="1474452076116" expanded="true" signature="16930:16944" ph="..." />
|
|
|
- <marker date="1474452076116" expanded="true" signature="17543:17549" ph="..." />
|
|
|
- <marker date="1474452076116" expanded="true" signature="18158:18173" ph="..." />
|
|
|
- <marker date="1474452076116" expanded="true" signature="18904:18920" ph="..." />
|
|
|
- <marker date="1474452076116" expanded="true" signature="30704:30710" ph=" " />
|
|
|
- <marker date="1474452076116" expanded="true" signature="30710:30716" ph=" " />
|
|
|
- <marker date="1474452076116" expanded="true" signature="30865:30871" ph=" " />
|
|
|
- <marker date="1474452076116" expanded="true" signature="30871:30877" ph=" " />
|
|
|
+ <marker date="1474452054326" expanded="true" signature="15497:15509" ph="..." />
|
|
|
+ <marker date="1474452054326" expanded="true" signature="15560:15577" ph="..." />
|
|
|
+ <marker date="1474452054326" expanded="true" signature="23122:23128" ph=" " />
|
|
|
+ <marker date="1474452054326" expanded="true" signature="23128:23134" ph=" " />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
@@ -912,34 +837,34 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/config/test.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/config/console.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="353">
|
|
|
- <caret line="54" column="30" selection-start-line="54" selection-start-column="30" selection-end-line="54" selection-end-column="30" />
|
|
|
+ <state relative-caret-position="541">
|
|
|
+ <caret line="318" column="0" selection-start-line="318" selection-start-column="0" selection-end-line="318" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/config/develop.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="403">
|
|
|
- <caret line="122" column="35" selection-start-line="122" selection-start-column="35" selection-end-line="122" selection-end-column="35" />
|
|
|
+ <state relative-caret-position="541">
|
|
|
+ <caret line="53" column="26" selection-start-line="53" selection-start-column="26" selection-end-line="53" selection-end-column="26" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/config/develop.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="578">
|
|
|
- <caret line="55" column="30" selection-start-line="55" selection-start-column="30" selection-end-line="55" selection-end-column="30" />
|
|
|
+ <state relative-caret-position="541">
|
|
|
+ <caret line="127" column="0" selection-start-line="127" selection-start-column="0" selection-end-line="127" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/config/console.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/config/test.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="578">
|
|
|
- <caret line="320" column="30" selection-start-line="320" selection-start-column="30" selection-end-line="320" selection-end-column="30" />
|
|
|
+ <state relative-caret-position="491">
|
|
|
+ <caret line="57" column="18" selection-start-line="57" selection-start-column="18" selection-end-line="57" selection-end-column="18" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|