Commit 109856f87423f2ddf37459ee9edf2efd119aad55
1 parent
1e337311
merge with server
Showing
2 changed files
with
182 additions
and
271 deletions
Show diff stats
storage/.gitignore renamed to .gitignore
.idea/workspace.xml
| ... | ... | @@ -20,16 +20,7 @@ |
| 20 | 20 | <change type="DELETED" beforePath="C:\xampp\htdocs\ital\storage\parser_data\temp\xlsx\kud0hb7or3133ull44s061thg2\xl\worksheets\sheet1.xml" afterPath="" /> |
| 21 | 21 | <change type="DELETED" beforePath="C:\xampp\htdocs\ital\storage\parser_data\temp\xlsx\kud0hb7or3133ull44s061thg2\xl\worksheets\sheet2.xml" afterPath="" /> |
| 22 | 22 | <change type="DELETED" beforePath="C:\xampp\htdocs\ital\storage\parser_data\temp\xlsx\kud0hb7or3133ull44s061thg2\xl\worksheets\sheet3.xml" afterPath="" /> |
| 23 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/backend/components/base/BaseController.php" afterPath="$PROJECT_DIR$/backend/components/base/BaseController.php" /> | |
| 24 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/backend/controllers/CrossingUploadController.php" afterPath="$PROJECT_DIR$/backend/controllers/CrossingUploadController.php" /> | |
| 25 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/common/models/MarginsGroups.php" afterPath="$PROJECT_DIR$/common/models/MarginsGroups.php" /> | |
| 26 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/backend/controllers/ParserController.php" afterPath="$PROJECT_DIR$/backend/controllers/ParserController.php" /> | |
| 27 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/backend/controllers/RgGrupController.php" afterPath="$PROJECT_DIR$/backend/controllers/RgGrupController.php" /> | |
| 28 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/backend/views/parser/error.php" afterPath="$PROJECT_DIR$/backend/views/parser/error.php" /> | |
| 29 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/backend/views/crossing-upload/index.php" afterPath="$PROJECT_DIR$/backend/views/crossing-upload/index.php" /> | |
| 30 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/backend/views/rg-grup/index.php" afterPath="$PROJECT_DIR$/backend/views/rg-grup/index.php" /> | |
| 31 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/backend/views/rg-grup/results.php" afterPath="$PROJECT_DIR$/backend/views/rg-grup/results.php" /> | |
| 32 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/test-1.artwebua.in.ua.iml" afterPath="$PROJECT_DIR$/.idea/test-1.artwebua.in.ua.iml" /> | |
| 23 | + <change type="MOVED" beforePath="C:\xampp\htdocs\ital\storage\.gitignore" afterPath="$PROJECT_DIR$/.gitignore" /> | |
| 33 | 24 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> |
| 34 | 25 | </list> |
| 35 | 26 | <ignored path="test-1.artwebua.in.ua.iws" /> |
| ... | ... | @@ -171,47 +162,55 @@ |
| 171 | 162 | </component> |
| 172 | 163 | <component name="FileEditorManager"> |
| 173 | 164 | <leaf> |
| 174 | - <file leaf-file-name="CrossingUploadController.php" pinned="false" current-in-tab="false"> | |
| 175 | - <entry file="file://$PROJECT_DIR$/backend/controllers/CrossingUploadController.php"> | |
| 165 | + <file leaf-file-name="ParserController.php" pinned="false" current-in-tab="false"> | |
| 166 | + <entry file="file://$PROJECT_DIR$/backend/controllers/ParserController.php"> | |
| 176 | 167 | <provider selected="true" editor-type-id="text-editor"> |
| 177 | - <state vertical-scroll-proportion="-37.333332" vertical-offset="1134" max-vertical-offset="4746"> | |
| 178 | - <caret line="102" column="0" selection-start-line="102" selection-start-column="0" selection-end-line="102" selection-end-column="0" /> | |
| 168 | + <state vertical-scroll-proportion="0.0" vertical-offset="5628" max-vertical-offset="6468"> | |
| 169 | + <caret line="291" column="54" selection-start-line="291" selection-start-column="54" selection-end-line="291" selection-end-column="54" /> | |
| 179 | 170 | <folding> |
| 180 | - <element signature="e#6#91#0#PHP" expanded="true" /> | |
| 181 | - <element signature="e#125#168#0#PHP" expanded="true" /> | |
| 171 | + <element signature="e#38#65#0#PHP" expanded="true" /> | |
| 182 | 172 | </folding> |
| 183 | 173 | </state> |
| 184 | 174 | </provider> |
| 185 | 175 | </entry> |
| 186 | 176 | </file> |
| 187 | - <file leaf-file-name="RgGrupController.php" pinned="false" current-in-tab="false"> | |
| 188 | - <entry file="file://$PROJECT_DIR$/backend/controllers/RgGrupController.php"> | |
| 177 | + <file leaf-file-name="config.php" pinned="false" current-in-tab="false"> | |
| 178 | + <entry file="file://$PROJECT_DIR$/common/components/parsers/config.php"> | |
| 189 | 179 | <provider selected="true" editor-type-id="text-editor"> |
| 190 | - <state vertical-scroll-proportion="-109.59259" vertical-offset="527" max-vertical-offset="4053"> | |
| 191 | - <caret line="190" column="5" selection-start-line="190" selection-start-column="5" selection-end-line="190" selection-end-column="5" /> | |
| 192 | - <folding> | |
| 193 | - <element signature="e#125#168#0#PHP" expanded="true" /> | |
| 194 | - <element signature="e#787#1322#0#PHP" expanded="false" /> | |
| 195 | - </folding> | |
| 180 | + <state vertical-scroll-proportion="0.0" vertical-offset="1449" max-vertical-offset="2079"> | |
| 181 | + <caret line="69" column="45" selection-start-line="69" selection-start-column="45" selection-end-line="69" selection-end-column="45" /> | |
| 182 | + <folding /> | |
| 196 | 183 | </state> |
| 197 | 184 | </provider> |
| 198 | 185 | </entry> |
| 199 | 186 | </file> |
| 200 | - <file leaf-file-name="CustomArrayHelper.php" pinned="false" current-in-tab="false"> | |
| 201 | - <entry file="file://$PROJECT_DIR$/common/components/CustomArrayHelper.php"> | |
| 187 | + <file leaf-file-name="main.php" pinned="false" current-in-tab="false"> | |
| 188 | + <entry file="file://$PROJECT_DIR$/common/config/main.php"> | |
| 202 | 189 | <provider selected="true" editor-type-id="text-editor"> |
| 203 | - <state vertical-scroll-proportion="-9.62963" vertical-offset="286" max-vertical-offset="1596"> | |
| 204 | - <caret line="31" column="36" selection-start-line="31" selection-start-column="36" selection-end-line="31" selection-end-column="36" /> | |
| 190 | + <state vertical-scroll-proportion="-0.7777778" vertical-offset="0" max-vertical-offset="735"> | |
| 191 | + <caret line="1" column="76" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="76" /> | |
| 205 | 192 | <folding /> |
| 206 | 193 | </state> |
| 207 | 194 | </provider> |
| 208 | 195 | </entry> |
| 209 | 196 | </file> |
| 210 | - <file leaf-file-name="Margins.php" pinned="false" current-in-tab="false"> | |
| 211 | - <entry file="file://$PROJECT_DIR$/common/models/Margins.php"> | |
| 197 | + <file leaf-file-name="m151116_153942_add_field_to_news.php" pinned="false" current-in-tab="false"> | |
| 198 | + <entry file="file://$PROJECT_DIR$/console/migrations/m151116_153942_add_field_to_news.php"> | |
| 199 | + <provider selected="true" editor-type-id="text-editor"> | |
| 200 | + <state vertical-scroll-proportion="-9.333333" vertical-offset="0" max-vertical-offset="861"> | |
| 201 | + <caret line="13" column="6" selection-start-line="10" selection-start-column="7" selection-end-line="13" selection-end-column="6" /> | |
| 202 | + <folding> | |
| 203 | + <element signature="e#156#283#0#PHP" expanded="true" /> | |
| 204 | + </folding> | |
| 205 | + </state> | |
| 206 | + </provider> | |
| 207 | + </entry> | |
| 208 | + </file> | |
| 209 | + <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true"> | |
| 210 | + <entry file="file://$PROJECT_DIR$/.gitignore"> | |
| 212 | 211 | <provider selected="true" editor-type-id="text-editor"> |
| 213 | - <state vertical-scroll-proportion="-10.407408" vertical-offset="832" max-vertical-offset="1512"> | |
| 214 | - <caret line="53" column="8" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="51" /> | |
| 212 | + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="842"> | |
| 213 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | |
| 215 | 214 | <folding /> |
| 216 | 215 | </state> |
| 217 | 216 | </provider> |
| ... | ... | @@ -220,8 +219,8 @@ |
| 220 | 219 | <file leaf-file-name="ParserTrait.php" pinned="false" current-in-tab="false"> |
| 221 | 220 | <entry file="file://$PROJECT_DIR$/backend/components/traits/ParserTrait.php"> |
| 222 | 221 | <provider selected="true" editor-type-id="text-editor"> |
| 223 | - <state vertical-scroll-proportion="-42.77778" vertical-offset="126" max-vertical-offset="1848"> | |
| 224 | - <caret line="66" column="46" selection-start-line="66" selection-start-column="31" selection-end-line="66" selection-end-column="46" /> | |
| 222 | + <state vertical-scroll-proportion="0.0" vertical-offset="693" max-vertical-offset="1848"> | |
| 223 | + <caret line="66" column="43" selection-start-line="66" selection-start-column="43" selection-end-line="66" selection-end-column="43" /> | |
| 225 | 224 | <folding> |
| 226 | 225 | <element signature="e#129#177#0#PHP" expanded="true" /> |
| 227 | 226 | </folding> |
| ... | ... | @@ -229,56 +228,42 @@ |
| 229 | 228 | </provider> |
| 230 | 229 | </entry> |
| 231 | 230 | </file> |
| 232 | - <file leaf-file-name="index.php" pinned="false" current-in-tab="false"> | |
| 233 | - <entry file="file://$PROJECT_DIR$/backend/views/rg-grup/index.php"> | |
| 231 | + <file leaf-file-name="main.php" pinned="false" current-in-tab="false"> | |
| 232 | + <entry file="file://$PROJECT_DIR$/frontend/config/main.php"> | |
| 234 | 233 | <provider selected="true" editor-type-id="text-editor"> |
| 235 | - <state vertical-scroll-proportion="-18.666666" vertical-offset="0" max-vertical-offset="756"> | |
| 236 | - <caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" /> | |
| 234 | + <state vertical-scroll-proportion="0.0" vertical-offset="231" max-vertical-offset="1449"> | |
| 235 | + <caret line="15" column="50" selection-start-line="15" selection-start-column="46" selection-end-line="15" selection-end-column="50" /> | |
| 237 | 236 | <folding /> |
| 238 | 237 | </state> |
| 239 | 238 | </provider> |
| 240 | 239 | </entry> |
| 241 | 240 | </file> |
| 242 | - <file leaf-file-name="results.php" pinned="false" current-in-tab="false"> | |
| 243 | - <entry file="file://$PROJECT_DIR$/backend/views/rg-grup/results.php"> | |
| 244 | - <provider selected="true" editor-type-id="text-editor"> | |
| 245 | - <state vertical-scroll-proportion="-22.555555" vertical-offset="0" max-vertical-offset="777"> | |
| 246 | - <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" /> | |
| 247 | - <folding> | |
| 248 | - <element signature="e#7#28#0#PHP" expanded="true" /> | |
| 249 | - </folding> | |
| 250 | - </state> | |
| 251 | - </provider> | |
| 252 | - </entry> | |
| 253 | - </file> | |
| 254 | - <file leaf-file-name="server-files.php" pinned="false" current-in-tab="false"> | |
| 255 | - <entry file="file://$PROJECT_DIR$/backend/views/parser/server-files.php"> | |
| 241 | + <file leaf-file-name="UploadFileParsingForm.php" pinned="false" current-in-tab="false"> | |
| 242 | + <entry file="file://$PROJECT_DIR$/backend/models/UploadFileParsingForm.php"> | |
| 256 | 243 | <provider selected="true" editor-type-id="text-editor"> |
| 257 | - <state vertical-scroll-proportion="-22.777779" vertical-offset="288" max-vertical-offset="1155"> | |
| 258 | - <caret line="49" column="108" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="108" /> | |
| 244 | + <state vertical-scroll-proportion="0.0" vertical-offset="567" max-vertical-offset="2163"> | |
| 245 | + <caret line="54" column="43" selection-start-line="54" selection-start-column="12" selection-end-line="54" selection-end-column="43" /> | |
| 259 | 246 | <folding /> |
| 260 | 247 | </state> |
| 261 | 248 | </provider> |
| 262 | 249 | </entry> |
| 263 | 250 | </file> |
| 264 | - <file leaf-file-name="MarginsGroups.php" pinned="false" current-in-tab="false"> | |
| 265 | - <entry file="file://$PROJECT_DIR$/common/models/MarginsGroups.php"> | |
| 251 | + <file leaf-file-name="index.php" pinned="false" current-in-tab="false"> | |
| 252 | + <entry file="file://$PROJECT_DIR$/backend/views/parser/index.php"> | |
| 266 | 253 | <provider selected="true" editor-type-id="text-editor"> |
| 267 | - <state vertical-scroll-proportion="15.62963" vertical-offset="758" max-vertical-offset="2520"> | |
| 268 | - <caret line="17" column="19" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="19" /> | |
| 254 | + <state vertical-scroll-proportion="0.0" vertical-offset="693" max-vertical-offset="1218"> | |
| 255 | + <caret line="36" column="45" selection-start-line="36" selection-start-column="39" selection-end-line="36" selection-end-column="45" /> | |
| 269 | 256 | <folding /> |
| 270 | 257 | </state> |
| 271 | 258 | </provider> |
| 272 | 259 | </entry> |
| 273 | 260 | </file> |
| 274 | - <file leaf-file-name="ParserController.php" pinned="false" current-in-tab="true"> | |
| 275 | - <entry file="file://$PROJECT_DIR$/backend/controllers/ParserController.php"> | |
| 261 | + <file leaf-file-name="composer.json" pinned="false" current-in-tab="false"> | |
| 262 | + <entry file="file://$PROJECT_DIR$/composer.json"> | |
| 276 | 263 | <provider selected="true" editor-type-id="text-editor"> |
| 277 | - <state vertical-scroll-proportion="0.021428572" vertical-offset="1494" max-vertical-offset="6468"> | |
| 278 | - <caret line="72" column="54" selection-start-line="72" selection-start-column="54" selection-end-line="72" selection-end-column="54" /> | |
| 279 | - <folding> | |
| 280 | - <element signature="e#38#65#0#PHP" expanded="true" /> | |
| 281 | - </folding> | |
| 264 | + <state vertical-scroll-proportion="0.0" vertical-offset="420" max-vertical-offset="1113"> | |
| 265 | + <caret line="20" column="36" selection-start-line="20" selection-start-column="36" selection-end-line="20" selection-end-column="36" /> | |
| 266 | + <folding /> | |
| 282 | 267 | </state> |
| 283 | 268 | </provider> |
| 284 | 269 | </entry> |
| ... | ... | @@ -292,8 +277,6 @@ |
| 292 | 277 | <component name="IdeDocumentHistory"> |
| 293 | 278 | <option name="CHANGED_PATHS"> |
| 294 | 279 | <list> |
| 295 | - <option value="$PROJECT_DIR$/backend/controllers/CartController.php" /> | |
| 296 | - <option value="$PROJECT_DIR$/backend/web/js/cart.js" /> | |
| 297 | 280 | <option value="$PROJECT_DIR$/backend/controllers/CurrencyController.php" /> |
| 298 | 281 | <option value="$PROJECT_DIR$/backend/views/currency/_form.php" /> |
| 299 | 282 | <option value="$PROJECT_DIR$/backend/views/currency/create.php" /> |
| ... | ... | @@ -343,6 +326,8 @@ |
| 343 | 326 | <option value="$PROJECT_DIR$/common/models/Margins.php" /> |
| 344 | 327 | <option value="$PROJECT_DIR$/backend/controllers/RgGrupController.php" /> |
| 345 | 328 | <option value="$PROJECT_DIR$/backend/controllers/ParserController.php" /> |
| 329 | + <option value="$PROJECT_DIR$/console/migrations/m151116_153942_add_field_to_news.php" /> | |
| 330 | + <option value="$PROJECT_DIR$/storage/.gitignore" /> | |
| 346 | 331 | </list> |
| 347 | 332 | </option> |
| 348 | 333 | </component> |
| ... | ... | @@ -395,80 +380,6 @@ |
| 395 | 380 | <sortByType /> |
| 396 | 381 | </navigator> |
| 397 | 382 | <panes> |
| 398 | - <pane id="ProjectPane"> | |
| 399 | - <subPane> | |
| 400 | - <PATH> | |
| 401 | - <PATH_ELEMENT> | |
| 402 | - <option name="myItemId" value="test-1.artwebua.in.ua" /> | |
| 403 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 404 | - </PATH_ELEMENT> | |
| 405 | - </PATH> | |
| 406 | - <PATH> | |
| 407 | - <PATH_ELEMENT> | |
| 408 | - <option name="myItemId" value="test-1.artwebua.in.ua" /> | |
| 409 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 410 | - </PATH_ELEMENT> | |
| 411 | - <PATH_ELEMENT> | |
| 412 | - <option name="myItemId" value="ital" /> | |
| 413 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 414 | - </PATH_ELEMENT> | |
| 415 | - </PATH> | |
| 416 | - <PATH> | |
| 417 | - <PATH_ELEMENT> | |
| 418 | - <option name="myItemId" value="test-1.artwebua.in.ua" /> | |
| 419 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 420 | - </PATH_ELEMENT> | |
| 421 | - <PATH_ELEMENT> | |
| 422 | - <option name="myItemId" value="ital" /> | |
| 423 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 424 | - </PATH_ELEMENT> | |
| 425 | - <PATH_ELEMENT> | |
| 426 | - <option name="myItemId" value="backend" /> | |
| 427 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 428 | - </PATH_ELEMENT> | |
| 429 | - </PATH> | |
| 430 | - <PATH> | |
| 431 | - <PATH_ELEMENT> | |
| 432 | - <option name="myItemId" value="test-1.artwebua.in.ua" /> | |
| 433 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 434 | - </PATH_ELEMENT> | |
| 435 | - <PATH_ELEMENT> | |
| 436 | - <option name="myItemId" value="ital" /> | |
| 437 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 438 | - </PATH_ELEMENT> | |
| 439 | - <PATH_ELEMENT> | |
| 440 | - <option name="myItemId" value="backend" /> | |
| 441 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 442 | - </PATH_ELEMENT> | |
| 443 | - <PATH_ELEMENT> | |
| 444 | - <option name="myItemId" value="views" /> | |
| 445 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 446 | - </PATH_ELEMENT> | |
| 447 | - </PATH> | |
| 448 | - <PATH> | |
| 449 | - <PATH_ELEMENT> | |
| 450 | - <option name="myItemId" value="test-1.artwebua.in.ua" /> | |
| 451 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 452 | - </PATH_ELEMENT> | |
| 453 | - <PATH_ELEMENT> | |
| 454 | - <option name="myItemId" value="ital" /> | |
| 455 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 456 | - </PATH_ELEMENT> | |
| 457 | - <PATH_ELEMENT> | |
| 458 | - <option name="myItemId" value="backend" /> | |
| 459 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 460 | - </PATH_ELEMENT> | |
| 461 | - <PATH_ELEMENT> | |
| 462 | - <option name="myItemId" value="views" /> | |
| 463 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 464 | - </PATH_ELEMENT> | |
| 465 | - <PATH_ELEMENT> | |
| 466 | - <option name="myItemId" value="crossing-upload" /> | |
| 467 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 468 | - </PATH_ELEMENT> | |
| 469 | - </PATH> | |
| 470 | - </subPane> | |
| 471 | - </pane> | |
| 472 | 383 | <pane id="Scope"> |
| 473 | 384 | <subPane subId="Default"> |
| 474 | 385 | <PATH> |
| ... | ... | @@ -600,11 +511,31 @@ |
| 600 | 511 | </PATH> |
| 601 | 512 | </subPane> |
| 602 | 513 | </pane> |
| 514 | + <pane id="ProjectPane"> | |
| 515 | + <subPane> | |
| 516 | + <PATH> | |
| 517 | + <PATH_ELEMENT> | |
| 518 | + <option name="myItemId" value="test-1.artwebua.in.ua" /> | |
| 519 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 520 | + </PATH_ELEMENT> | |
| 521 | + </PATH> | |
| 522 | + <PATH> | |
| 523 | + <PATH_ELEMENT> | |
| 524 | + <option name="myItemId" value="test-1.artwebua.in.ua" /> | |
| 525 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 526 | + </PATH_ELEMENT> | |
| 527 | + <PATH_ELEMENT> | |
| 528 | + <option name="myItemId" value="ital" /> | |
| 529 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 530 | + </PATH_ELEMENT> | |
| 531 | + </PATH> | |
| 532 | + </subPane> | |
| 533 | + </pane> | |
| 603 | 534 | </panes> |
| 604 | 535 | </component> |
| 605 | 536 | <component name="PropertiesComponent"> |
| 606 | 537 | <property name="WebServerToolWindowFactoryState" value="true" /> |
| 607 | - <property name="last_opened_file_path" value="$PROJECT_DIR$/../yii-multiparser" /> | |
| 538 | + <property name="last_opened_file_path" value="$PROJECT_DIR$/../yii_advanced" /> | |
| 608 | 539 | <property name="LayoutCode.rearrangeEntriesPHP" value="false" /> |
| 609 | 540 | <property name="FullScreen" value="false" /> |
| 610 | 541 | <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="236" /> |
| ... | ... | @@ -644,11 +575,11 @@ |
| 644 | 575 | <recent name="C:\xampp\htdocs\ital\backend\assets" /> |
| 645 | 576 | </key> |
| 646 | 577 | <key name="MoveFile.RECENT_KEYS"> |
| 578 | + <recent name="C:\xampp\htdocs\ital" /> | |
| 647 | 579 | <recent name="C:\xampp\htdocs\ital\storage" /> |
| 648 | 580 | <recent name="C:\xampp\htdocs\ital\common\components\mail" /> |
| 649 | 581 | <recent name="C:\xampp\htdocs\ital\backend\views" /> |
| 650 | 582 | <recent name="C:\xampp\htdocs\ital\common\components" /> |
| 651 | - <recent name="C:\xampp\htdocs\ital\console\migrations" /> | |
| 652 | 583 | </key> |
| 653 | 584 | </component> |
| 654 | 585 | <component name="RunManager" selected="PHP Web Application.ital"> |
| ... | ... | @@ -759,27 +690,27 @@ |
| 759 | 690 | <frame x="-15" y="0" width="1692" height="1026" extended-state="0" /> |
| 760 | 691 | <editor active="false" /> |
| 761 | 692 | <layout> |
| 762 | - <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32960895" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> | |
| 763 | 693 | <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32849163" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> |
| 764 | 694 | <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.34301677" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" /> |
| 765 | - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29944134" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | |
| 695 | + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3206704" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> | |
| 766 | 696 | <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.21936275" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> |
| 697 | + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25306374" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | |
| 698 | + <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> | |
| 767 | 699 | <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3290441" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> |
| 768 | - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30726257" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | |
| 769 | - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3206704" sideWeight="0.5" order="10" side_tool="true" content_ui="tabs" /> | |
| 700 | + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3112745" sideWeight="0.49944505" order="0" side_tool="false" content_ui="combo" /> | |
| 770 | 701 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5005549" order="2" side_tool="true" content_ui="tabs" /> |
| 702 | + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3206704" sideWeight="0.5" order="10" side_tool="true" content_ui="tabs" /> | |
| 771 | 703 | <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22905028" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> |
| 772 | - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3206704" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> | |
| 773 | - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25306374" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | |
| 774 | - <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> | |
| 775 | - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30392158" sideWeight="0.49944505" order="0" side_tool="false" content_ui="combo" /> | |
| 776 | - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | |
| 777 | 704 | <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2547486" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
| 705 | + <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32960895" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> | |
| 778 | 706 | <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> |
| 779 | 707 | <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
| 708 | + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29944134" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | |
| 780 | 709 | <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
| 710 | + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30726257" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | |
| 781 | 711 | <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> |
| 782 | 712 | <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
| 713 | + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | |
| 783 | 714 | <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> |
| 784 | 715 | <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> |
| 785 | 716 | <window_info id="Command Line Tools Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32960895" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" /> |
| ... | ... | @@ -850,37 +781,6 @@ |
| 850 | 781 | </watches-manager> |
| 851 | 782 | </component> |
| 852 | 783 | <component name="editorHistoryManager"> |
| 853 | - <entry file="file://$PROJECT_DIR$/common/components/ModelArrayValidator.php"> | |
| 854 | - <provider selected="true" editor-type-id="text-editor"> | |
| 855 | - <state vertical-scroll-proportion="-59.88889" vertical-offset="840" max-vertical-offset="3066"> | |
| 856 | - <caret line="122" column="32" selection-start-line="122" selection-start-column="32" selection-end-line="122" selection-end-column="32" /> | |
| 857 | - <folding /> | |
| 858 | - </state> | |
| 859 | - </provider> | |
| 860 | - </entry> | |
| 861 | - <entry file="file://$PROJECT_DIR$/backend/models/DetailsCrosses.php"> | |
| 862 | - <provider selected="true" editor-type-id="text-editor"> | |
| 863 | - <state vertical-scroll-proportion="0.0" vertical-offset="610" max-vertical-offset="2058"> | |
| 864 | - <caret line="38" column="54" selection-start-line="38" selection-start-column="35" selection-end-line="38" selection-end-column="54" /> | |
| 865 | - <folding /> | |
| 866 | - </state> | |
| 867 | - </provider> | |
| 868 | - </entry> | |
| 869 | - <entry file="file://$PROJECT_DIR$/backend/models/Details.php"> | |
| 870 | - <provider selected="true" editor-type-id="text-editor"> | |
| 871 | - <state vertical-scroll-proportion="1.375" vertical-offset="0" max-vertical-offset="3339"> | |
| 872 | - <caret line="57" column="115" selection-start-line="57" selection-start-column="93" selection-end-line="57" selection-end-column="115" /> | |
| 873 | - <folding /> | |
| 874 | - </state> | |
| 875 | - </provider> | |
| 876 | - </entry> | |
| 877 | - <entry file="file://$PROJECT_DIR$/vendor/yiisoft/yii2/messages/ru/yii.php"> | |
| 878 | - <provider selected="true" editor-type-id="text-editor"> | |
| 879 | - <state vertical-scroll-proportion="3.5185184" vertical-offset="1082" max-vertical-offset="3150"> | |
| 880 | - <caret line="63" column="134" selection-start-line="63" selection-start-column="134" selection-end-line="63" selection-end-column="134" /> | |
| 881 | - </state> | |
| 882 | - </provider> | |
| 883 | - </entry> | |
| 884 | 784 | <entry file="file://$PROJECT_DIR$/vendor/yiisoft/yii2/validators/FileValidator.php"> |
| 885 | 785 | <provider selected="true" editor-type-id="text-editor"> |
| 886 | 786 | <state vertical-scroll-proportion="252.77777" vertical-offset="6825" max-vertical-offset="8862"> |
| ... | ... | @@ -888,14 +788,6 @@ |
| 888 | 788 | </state> |
| 889 | 789 | </provider> |
| 890 | 790 | </entry> |
| 891 | - <entry file="file://$PROJECT_DIR$/backend/models/UploadFileParsingForm.php"> | |
| 892 | - <provider selected="true" editor-type-id="text-editor"> | |
| 893 | - <state vertical-scroll-proportion="-14.0" vertical-offset="567" max-vertical-offset="2163"> | |
| 894 | - <caret line="49" column="37" selection-start-line="49" selection-start-column="37" selection-end-line="49" selection-end-column="37" /> | |
| 895 | - <folding /> | |
| 896 | - </state> | |
| 897 | - </provider> | |
| 898 | - </entry> | |
| 899 | 791 | <entry file="file://$PROJECT_DIR$/vendor/yiisoft/yii2/log/Logger.php"> |
| 900 | 792 | <provider selected="true" editor-type-id="text-editor"> |
| 901 | 793 | <state vertical-scroll-proportion="0.33274338" vertical-offset="3361" max-vertical-offset="6636"> |
| ... | ... | @@ -928,19 +820,18 @@ |
| 928 | 820 | <provider selected="true" editor-type-id="text-editor"> |
| 929 | 821 | <state vertical-scroll-proportion="-7.703704" vertical-offset="1766" max-vertical-offset="3213"> |
| 930 | 822 | <caret line="96" column="0" selection-start-line="96" selection-start-column="0" selection-end-line="96" selection-end-column="0" /> |
| 931 | - <folding /> | |
| 932 | 823 | </state> |
| 933 | 824 | </provider> |
| 934 | 825 | </entry> |
| 935 | 826 | <entry file="file://$PROJECT_DIR$/console/runtime/logs/parser.log"> |
| 827 | + <provider editor-type-id="com.intellij.database.editor.CsvTableFileEditorProvider"> | |
| 828 | + <state /> | |
| 829 | + </provider> | |
| 936 | 830 | <provider selected="true" editor-type-id="text-editor"> |
| 937 | 831 | <state vertical-scroll-proportion="0.79928315" vertical-offset="5946" max-vertical-offset="6783"> |
| 938 | 832 | <caret line="288" column="61" selection-start-line="288" selection-start-column="61" selection-end-line="288" selection-end-column="61" /> |
| 939 | 833 | </state> |
| 940 | 834 | </provider> |
| 941 | - <provider editor-type-id="com.intellij.database.editor.CsvTableFileEditorProvider"> | |
| 942 | - <state /> | |
| 943 | - </provider> | |
| 944 | 835 | </entry> |
| 945 | 836 | <entry file="file://$PROJECT_DIR$/common/components/parsers/Converter.php"> |
| 946 | 837 | <provider selected="true" editor-type-id="text-editor"> |
| ... | ... | @@ -949,13 +840,6 @@ |
| 949 | 840 | </state> |
| 950 | 841 | </provider> |
| 951 | 842 | </entry> |
| 952 | - <entry file="file://$PROJECT_DIR$/common/components/parsers/config.php"> | |
| 953 | - <provider selected="true" editor-type-id="text-editor"> | |
| 954 | - <state vertical-scroll-proportion="-7.7777777" vertical-offset="1239" max-vertical-offset="2079"> | |
| 955 | - <caret line="69" column="45" selection-start-line="69" selection-start-column="45" selection-end-line="69" selection-end-column="45" /> | |
| 956 | - </state> | |
| 957 | - </provider> | |
| 958 | - </entry> | |
| 959 | 843 | <entry file="file://$PROJECT_DIR$/backend/views/parser/results.php"> |
| 960 | 844 | <provider selected="true" editor-type-id="text-editor"> |
| 961 | 845 | <state vertical-scroll-proportion="-2.3333333" vertical-offset="0" max-vertical-offset="777"> |
| ... | ... | @@ -991,13 +875,6 @@ |
| 991 | 875 | </state> |
| 992 | 876 | </provider> |
| 993 | 877 | </entry> |
| 994 | - <entry file="file://$PROJECT_DIR$/common/config/main.php"> | |
| 995 | - <provider selected="true" editor-type-id="text-editor"> | |
| 996 | - <state vertical-scroll-proportion="-10.296296" vertical-offset="163" max-vertical-offset="735"> | |
| 997 | - <caret line="21" column="24" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" /> | |
| 998 | - </state> | |
| 999 | - </provider> | |
| 1000 | - </entry> | |
| 1001 | 878 | <entry file="file://$PROJECT_DIR$/tests/unit/BaseConverterTest.php"> |
| 1002 | 879 | <provider selected="true" editor-type-id="text-editor"> |
| 1003 | 880 | <state vertical-scroll-proportion="-3.8888888" vertical-offset="0" max-vertical-offset="1533"> |
| ... | ... | @@ -1005,18 +882,10 @@ |
| 1005 | 882 | </state> |
| 1006 | 883 | </provider> |
| 1007 | 884 | </entry> |
| 1008 | - <entry file="file://$PROJECT_DIR$/storage/.gitignore"> | |
| 1009 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1010 | - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="867"> | |
| 1011 | - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | |
| 1012 | - </state> | |
| 1013 | - </provider> | |
| 1014 | - </entry> | |
| 1015 | 885 | <entry file="file://$PROJECT_DIR$/backend/web/index.php"> |
| 1016 | 886 | <provider selected="true" editor-type-id="text-editor"> |
| 1017 | 887 | <state vertical-scroll-proportion="0.075" vertical-offset="0" max-vertical-offset="840"> |
| 1018 | 888 | <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> |
| 1019 | - <folding /> | |
| 1020 | 889 | </state> |
| 1021 | 890 | </provider> |
| 1022 | 891 | </entry> |
| ... | ... | @@ -1024,7 +893,6 @@ |
| 1024 | 893 | <provider selected="true" editor-type-id="text-editor"> |
| 1025 | 894 | <state vertical-scroll-proportion="-9.333333" vertical-offset="0" max-vertical-offset="441"> |
| 1026 | 895 | <caret line="16" column="19" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="19" /> |
| 1027 | - <folding /> | |
| 1028 | 896 | </state> |
| 1029 | 897 | </provider> |
| 1030 | 898 | </entry> |
| ... | ... | @@ -1039,7 +907,6 @@ |
| 1039 | 907 | <provider selected="true" editor-type-id="text-editor"> |
| 1040 | 908 | <state vertical-scroll-proportion="0.33208954" vertical-offset="1355" max-vertical-offset="9093"> |
| 1041 | 909 | <caret line="81" column="0" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" /> |
| 1042 | - <folding /> | |
| 1043 | 910 | </state> |
| 1044 | 911 | </provider> |
| 1045 | 912 | </entry> |
| ... | ... | @@ -1061,7 +928,6 @@ |
| 1061 | 928 | <provider selected="true" editor-type-id="text-editor"> |
| 1062 | 929 | <state vertical-scroll-proportion="0.2" vertical-offset="0" max-vertical-offset="840"> |
| 1063 | 930 | <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" /> |
| 1064 | - <folding /> | |
| 1065 | 931 | </state> |
| 1066 | 932 | </provider> |
| 1067 | 933 | </entry> |
| ... | ... | @@ -1069,7 +935,6 @@ |
| 1069 | 935 | <provider selected="true" editor-type-id="text-editor"> |
| 1070 | 936 | <state vertical-scroll-proportion="0.225" vertical-offset="0" max-vertical-offset="840"> |
| 1071 | 937 | <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> |
| 1072 | - <folding /> | |
| 1073 | 938 | </state> |
| 1074 | 939 | </provider> |
| 1075 | 940 | </entry> |
| ... | ... | @@ -1077,7 +942,6 @@ |
| 1077 | 942 | <provider selected="true" editor-type-id="text-editor"> |
| 1078 | 943 | <state vertical-scroll-proportion="0.25" vertical-offset="0" max-vertical-offset="840"> |
| 1079 | 944 | <caret line="15" column="1" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" /> |
| 1080 | - <folding /> | |
| 1081 | 945 | </state> |
| 1082 | 946 | </provider> |
| 1083 | 947 | </entry> |
| ... | ... | @@ -1085,7 +949,6 @@ |
| 1085 | 949 | <provider selected="true" editor-type-id="text-editor"> |
| 1086 | 950 | <state vertical-scroll-proportion="0.8304498" vertical-offset="750" max-vertical-offset="1617"> |
| 1087 | 951 | <caret line="70" column="31" selection-start-line="69" selection-start-column="3" selection-end-line="70" selection-end-column="31" /> |
| 1088 | - <folding /> | |
| 1089 | 952 | </state> |
| 1090 | 953 | </provider> |
| 1091 | 954 | </entry> |
| ... | ... | @@ -1093,7 +956,6 @@ |
| 1093 | 956 | <provider selected="true" editor-type-id="text-editor"> |
| 1094 | 957 | <state vertical-scroll-proportion="0.875" vertical-offset="3654" max-vertical-offset="4536"> |
| 1095 | 958 | <caret line="218" column="0" selection-start-line="218" selection-start-column="0" selection-end-line="218" selection-end-column="0" /> |
| 1096 | - <folding /> | |
| 1097 | 959 | </state> |
| 1098 | 960 | </provider> |
| 1099 | 961 | </entry> |
| ... | ... | @@ -1101,15 +963,6 @@ |
| 1101 | 963 | <provider selected="true" editor-type-id="text-editor"> |
| 1102 | 964 | <state vertical-scroll-proportion="-4.6" vertical-offset="4746" max-vertical-offset="5586"> |
| 1103 | 965 | <caret line="51" column="13" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="13" /> |
| 1104 | - <folding /> | |
| 1105 | - </state> | |
| 1106 | - </provider> | |
| 1107 | - </entry> | |
| 1108 | - <entry file="file://$PROJECT_DIR$/backend/config/main.php"> | |
| 1109 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1110 | - <state vertical-scroll-proportion="0.475" vertical-offset="210" max-vertical-offset="1050"> | |
| 1111 | - <caret line="29" column="44" selection-start-line="29" selection-start-column="44" selection-end-line="29" selection-end-column="44" /> | |
| 1112 | - <folding /> | |
| 1113 | 966 | </state> |
| 1114 | 967 | </provider> |
| 1115 | 968 | </entry> |
| ... | ... | @@ -1117,7 +970,6 @@ |
| 1117 | 970 | <provider selected="true" editor-type-id="text-editor"> |
| 1118 | 971 | <state vertical-scroll-proportion="0.25" vertical-offset="0" max-vertical-offset="840"> |
| 1119 | 972 | <caret line="15" column="46" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="46" /> |
| 1120 | - <folding /> | |
| 1121 | 973 | </state> |
| 1122 | 974 | </provider> |
| 1123 | 975 | </entry> |
| ... | ... | @@ -1125,7 +977,6 @@ |
| 1125 | 977 | <provider selected="true" editor-type-id="text-editor"> |
| 1126 | 978 | <state vertical-scroll-proportion="0.6845238" vertical-offset="2155" max-vertical-offset="6867"> |
| 1127 | 979 | <caret line="136" column="20" selection-start-line="136" selection-start-column="20" selection-end-line="136" selection-end-column="20" /> |
| 1128 | - <folding /> | |
| 1129 | 980 | </state> |
| 1130 | 981 | </provider> |
| 1131 | 982 | </entry> |
| ... | ... | @@ -1133,7 +984,6 @@ |
| 1133 | 984 | <provider selected="true" editor-type-id="text-editor"> |
| 1134 | 985 | <state vertical-scroll-proportion="-7.296296" vertical-offset="7489" max-vertical-offset="10437"> |
| 1135 | 986 | <caret line="370" column="0" selection-start-line="370" selection-start-column="0" selection-end-line="370" selection-end-column="0" /> |
| 1136 | - <folding /> | |
| 1137 | 987 | </state> |
| 1138 | 988 | </provider> |
| 1139 | 989 | </entry> |
| ... | ... | @@ -1141,7 +991,6 @@ |
| 1141 | 991 | <provider selected="true" editor-type-id="text-editor"> |
| 1142 | 992 | <state vertical-scroll-proportion="-18.666666" vertical-offset="0" max-vertical-offset="819"> |
| 1143 | 993 | <caret line="24" column="10" selection-start-line="24" selection-start-column="10" selection-end-line="24" selection-end-column="10" /> |
| 1144 | - <folding /> | |
| 1145 | 994 | </state> |
| 1146 | 995 | </provider> |
| 1147 | 996 | </entry> |
| ... | ... | @@ -1149,15 +998,6 @@ |
| 1149 | 998 | <provider selected="true" editor-type-id="text-editor"> |
| 1150 | 999 | <state vertical-scroll-proportion="0.2937063" vertical-offset="0" max-vertical-offset="572"> |
| 1151 | 1000 | <caret line="13" column="51" selection-start-line="13" selection-start-column="51" selection-end-line="13" selection-end-column="51" /> |
| 1152 | - <folding /> | |
| 1153 | - </state> | |
| 1154 | - </provider> | |
| 1155 | - </entry> | |
| 1156 | - <entry file="file://$PROJECT_DIR$/backend/views/parser/index.php"> | |
| 1157 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1158 | - <state vertical-scroll-proportion="-0.22222222" vertical-offset="372" max-vertical-offset="1239"> | |
| 1159 | - <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" /> | |
| 1160 | - <folding /> | |
| 1161 | 1001 | </state> |
| 1162 | 1002 | </provider> |
| 1163 | 1003 | </entry> |
| ... | ... | @@ -1165,7 +1005,6 @@ |
| 1165 | 1005 | <provider selected="true" editor-type-id="text-editor"> |
| 1166 | 1006 | <state vertical-scroll-proportion="-22.777779" vertical-offset="288" max-vertical-offset="1155"> |
| 1167 | 1007 | <caret line="49" column="108" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="108" /> |
| 1168 | - <folding /> | |
| 1169 | 1008 | </state> |
| 1170 | 1009 | </provider> |
| 1171 | 1010 | </entry> |
| ... | ... | @@ -1173,7 +1012,6 @@ |
| 1173 | 1012 | <provider selected="true" editor-type-id="text-editor"> |
| 1174 | 1013 | <state vertical-scroll-proportion="-18.666666" vertical-offset="0" max-vertical-offset="756"> |
| 1175 | 1014 | <caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" /> |
| 1176 | - <folding /> | |
| 1177 | 1015 | </state> |
| 1178 | 1016 | </provider> |
| 1179 | 1017 | </entry> |
| ... | ... | @@ -1181,19 +1019,6 @@ |
| 1181 | 1019 | <provider selected="true" editor-type-id="text-editor"> |
| 1182 | 1020 | <state vertical-scroll-proportion="-22.555555" vertical-offset="0" max-vertical-offset="777"> |
| 1183 | 1021 | <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" /> |
| 1184 | - <folding> | |
| 1185 | - <element signature="e#7#28#0#PHP" expanded="true" /> | |
| 1186 | - </folding> | |
| 1187 | - </state> | |
| 1188 | - </provider> | |
| 1189 | - </entry> | |
| 1190 | - <entry file="file://$PROJECT_DIR$/backend/components/traits/ParserTrait.php"> | |
| 1191 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1192 | - <state vertical-scroll-proportion="-42.77778" vertical-offset="126" max-vertical-offset="1848"> | |
| 1193 | - <caret line="66" column="46" selection-start-line="66" selection-start-column="31" selection-end-line="66" selection-end-column="46" /> | |
| 1194 | - <folding> | |
| 1195 | - <element signature="e#129#177#0#PHP" expanded="true" /> | |
| 1196 | - </folding> | |
| 1197 | 1022 | </state> |
| 1198 | 1023 | </provider> |
| 1199 | 1024 | </entry> |
| ... | ... | @@ -1201,29 +1026,26 @@ |
| 1201 | 1026 | <provider selected="true" editor-type-id="text-editor"> |
| 1202 | 1027 | <state vertical-scroll-proportion="-9.62963" vertical-offset="286" max-vertical-offset="1596"> |
| 1203 | 1028 | <caret line="31" column="36" selection-start-line="31" selection-start-column="36" selection-end-line="31" selection-end-column="36" /> |
| 1204 | - <folding /> | |
| 1205 | 1029 | </state> |
| 1206 | 1030 | </provider> |
| 1207 | 1031 | </entry> |
| 1208 | 1032 | <entry file="file://$PROJECT_DIR$/common/models/MarginsGroups.php"> |
| 1209 | 1033 | <provider selected="true" editor-type-id="text-editor"> |
| 1210 | - <state vertical-scroll-proportion="15.62963" vertical-offset="758" max-vertical-offset="2520"> | |
| 1034 | + <state vertical-scroll-proportion="0.0" vertical-offset="758" max-vertical-offset="2520"> | |
| 1211 | 1035 | <caret line="17" column="19" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="19" /> |
| 1212 | - <folding /> | |
| 1213 | 1036 | </state> |
| 1214 | 1037 | </provider> |
| 1215 | 1038 | </entry> |
| 1216 | 1039 | <entry file="file://$PROJECT_DIR$/common/models/Margins.php"> |
| 1217 | 1040 | <provider selected="true" editor-type-id="text-editor"> |
| 1218 | - <state vertical-scroll-proportion="-10.407408" vertical-offset="832" max-vertical-offset="1512"> | |
| 1041 | + <state vertical-scroll-proportion="0.0" vertical-offset="832" max-vertical-offset="1512"> | |
| 1219 | 1042 | <caret line="53" column="8" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="51" /> |
| 1220 | - <folding /> | |
| 1221 | 1043 | </state> |
| 1222 | 1044 | </provider> |
| 1223 | 1045 | </entry> |
| 1224 | 1046 | <entry file="file://$PROJECT_DIR$/backend/controllers/RgGrupController.php"> |
| 1225 | 1047 | <provider selected="true" editor-type-id="text-editor"> |
| 1226 | - <state vertical-scroll-proportion="-109.59259" vertical-offset="527" max-vertical-offset="4053"> | |
| 1048 | + <state vertical-scroll-proportion="0.0" vertical-offset="527" max-vertical-offset="4053"> | |
| 1227 | 1049 | <caret line="190" column="5" selection-start-line="190" selection-start-column="5" selection-end-line="190" selection-end-column="5" /> |
| 1228 | 1050 | <folding> |
| 1229 | 1051 | <element signature="e#125#168#0#PHP" expanded="true" /> |
| ... | ... | @@ -1234,7 +1056,7 @@ |
| 1234 | 1056 | </entry> |
| 1235 | 1057 | <entry file="file://$PROJECT_DIR$/backend/controllers/CrossingUploadController.php"> |
| 1236 | 1058 | <provider selected="true" editor-type-id="text-editor"> |
| 1237 | - <state vertical-scroll-proportion="-37.333332" vertical-offset="1134" max-vertical-offset="4746"> | |
| 1059 | + <state vertical-scroll-proportion="0.0" vertical-offset="1134" max-vertical-offset="4746"> | |
| 1238 | 1060 | <caret line="102" column="0" selection-start-line="102" selection-start-column="0" selection-end-line="102" selection-end-column="0" /> |
| 1239 | 1061 | <folding> |
| 1240 | 1062 | <element signature="e#6#91#0#PHP" expanded="true" /> |
| ... | ... | @@ -1243,15 +1065,105 @@ |
| 1243 | 1065 | </state> |
| 1244 | 1066 | </provider> |
| 1245 | 1067 | </entry> |
| 1068 | + <entry file="file://$PROJECT_DIR$/composer.json"> | |
| 1069 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1070 | + <state vertical-scroll-proportion="0.0" vertical-offset="420" max-vertical-offset="1113"> | |
| 1071 | + <caret line="20" column="36" selection-start-line="20" selection-start-column="36" selection-end-line="20" selection-end-column="36" /> | |
| 1072 | + <folding /> | |
| 1073 | + </state> | |
| 1074 | + </provider> | |
| 1075 | + </entry> | |
| 1076 | + <entry file="file://$PROJECT_DIR$/backend/views/parser/index.php"> | |
| 1077 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1078 | + <state vertical-scroll-proportion="0.0" vertical-offset="693" max-vertical-offset="1218"> | |
| 1079 | + <caret line="36" column="45" selection-start-line="36" selection-start-column="39" selection-end-line="36" selection-end-column="45" /> | |
| 1080 | + <folding /> | |
| 1081 | + </state> | |
| 1082 | + </provider> | |
| 1083 | + </entry> | |
| 1084 | + <entry file="file://$PROJECT_DIR$/backend/models/UploadFileParsingForm.php"> | |
| 1085 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1086 | + <state vertical-scroll-proportion="0.0" vertical-offset="567" max-vertical-offset="2163"> | |
| 1087 | + <caret line="54" column="43" selection-start-line="54" selection-start-column="12" selection-end-line="54" selection-end-column="43" /> | |
| 1088 | + <folding /> | |
| 1089 | + </state> | |
| 1090 | + </provider> | |
| 1091 | + </entry> | |
| 1092 | + <entry file="file://$PROJECT_DIR$/frontend/config/main.php"> | |
| 1093 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1094 | + <state vertical-scroll-proportion="0.0" vertical-offset="231" max-vertical-offset="1449"> | |
| 1095 | + <caret line="15" column="50" selection-start-line="15" selection-start-column="46" selection-end-line="15" selection-end-column="50" /> | |
| 1096 | + <folding /> | |
| 1097 | + </state> | |
| 1098 | + </provider> | |
| 1099 | + </entry> | |
| 1100 | + <entry file="file://$PROJECT_DIR$/backend/components/traits/ParserTrait.php"> | |
| 1101 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1102 | + <state vertical-scroll-proportion="0.0" vertical-offset="693" max-vertical-offset="1848"> | |
| 1103 | + <caret line="66" column="43" selection-start-line="66" selection-start-column="43" selection-end-line="66" selection-end-column="43" /> | |
| 1104 | + <folding> | |
| 1105 | + <element signature="e#129#177#0#PHP" expanded="true" /> | |
| 1106 | + </folding> | |
| 1107 | + </state> | |
| 1108 | + </provider> | |
| 1109 | + </entry> | |
| 1246 | 1110 | <entry file="file://$PROJECT_DIR$/backend/controllers/ParserController.php"> |
| 1247 | 1111 | <provider selected="true" editor-type-id="text-editor"> |
| 1248 | - <state vertical-scroll-proportion="0.021428572" vertical-offset="1494" max-vertical-offset="6468"> | |
| 1249 | - <caret line="72" column="54" selection-start-line="72" selection-start-column="54" selection-end-line="72" selection-end-column="54" /> | |
| 1112 | + <state vertical-scroll-proportion="0.0" vertical-offset="5628" max-vertical-offset="6468"> | |
| 1113 | + <caret line="291" column="54" selection-start-line="291" selection-start-column="54" selection-end-line="291" selection-end-column="54" /> | |
| 1250 | 1114 | <folding> |
| 1251 | 1115 | <element signature="e#38#65#0#PHP" expanded="true" /> |
| 1252 | 1116 | </folding> |
| 1253 | 1117 | </state> |
| 1254 | 1118 | </provider> |
| 1255 | 1119 | </entry> |
| 1120 | + <entry file="file://$PROJECT_DIR$/backend/config/main.php"> | |
| 1121 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1122 | + <state vertical-scroll-proportion="1.05" vertical-offset="0" max-vertical-offset="1050"> | |
| 1123 | + <caret line="42" column="20" selection-start-line="42" selection-start-column="20" selection-end-line="42" selection-end-column="20" /> | |
| 1124 | + </state> | |
| 1125 | + </provider> | |
| 1126 | + </entry> | |
| 1127 | + <entry file="file://$PROJECT_DIR$/backend/config/bootstrap.php"> | |
| 1128 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1129 | + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="867"> | |
| 1130 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | |
| 1131 | + </state> | |
| 1132 | + </provider> | |
| 1133 | + </entry> | |
| 1134 | + <entry file="file://$PROJECT_DIR$/common/components/parsers/config.php"> | |
| 1135 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1136 | + <state vertical-scroll-proportion="0.0" vertical-offset="1449" max-vertical-offset="2079"> | |
| 1137 | + <caret line="69" column="45" selection-start-line="69" selection-start-column="45" selection-end-line="69" selection-end-column="45" /> | |
| 1138 | + <folding /> | |
| 1139 | + </state> | |
| 1140 | + </provider> | |
| 1141 | + </entry> | |
| 1142 | + <entry file="file://$PROJECT_DIR$/common/config/main.php"> | |
| 1143 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1144 | + <state vertical-scroll-proportion="-0.7777778" vertical-offset="0" max-vertical-offset="735"> | |
| 1145 | + <caret line="1" column="76" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="76" /> | |
| 1146 | + <folding /> | |
| 1147 | + </state> | |
| 1148 | + </provider> | |
| 1149 | + </entry> | |
| 1150 | + <entry file="file://$PROJECT_DIR$/console/migrations/m151116_153942_add_field_to_news.php"> | |
| 1151 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1152 | + <state vertical-scroll-proportion="-9.333333" vertical-offset="0" max-vertical-offset="861"> | |
| 1153 | + <caret line="13" column="6" selection-start-line="10" selection-start-column="7" selection-end-line="13" selection-end-column="6" /> | |
| 1154 | + <folding> | |
| 1155 | + <element signature="e#156#283#0#PHP" expanded="true" /> | |
| 1156 | + </folding> | |
| 1157 | + </state> | |
| 1158 | + </provider> | |
| 1159 | + </entry> | |
| 1160 | + <entry file="file://$PROJECT_DIR$/.gitignore"> | |
| 1161 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1162 | + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="843"> | |
| 1163 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | |
| 1164 | + <folding /> | |
| 1165 | + </state> | |
| 1166 | + </provider> | |
| 1167 | + </entry> | |
| 1256 | 1168 | </component> |
| 1257 | 1169 | </project> |
| 1258 | 1170 | \ No newline at end of file | ... | ... |