Advertisement
Guest User

Untitled

a guest
May 22nd, 2019
76
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 10.04 KB | None | 0 0
  1. [root@web1 www]# git status
  2. # On branch master
  3. # Your branch is ahead of 'origin/master' by 30 commits.
  4. # (use "git push" to publish your local commits)
  5. #
  6. # Changes not staged for commit:
  7. # (use "git add <file>..." to update what will be committed)
  8. # (use "git checkout -- <file>..." to discard changes in working directory)
  9. #
  10. # modified: checkMobile/resources/storage/persistence/1/3/08216d76a11d6460a4e2cdd01d92a7
  11. #
  12. no changes added to commit (use "git add" and/or "git commit -a")
  13. [root@web1 www]# git reset --hard origin/master
  14. Checking out files: 100% (30968/30968), done.
  15. HEAD is now at e3f6746 чистка кеша
  16. [root@web1 www]#
  17. [root@web1 www]#
  18. [root@web1 www]# git pull origin master
  19. remote: Enumerating objects: 241, done.
  20. remote: Counting objects: 100% (241/241), done.
  21. remote: Compressing objects: 100% (140/140), done.
  22. remote: Total 202 (delta 124), reused 110 (delta 58)
  23. Receiving objects: 100% (202/202), 34.94 MiB | 21.91 MiB/s, done.
  24. Resolving deltas: 100% (124/124), completed with 22 local objects.
  25. From gitl.notamedia.ru:wkhamovniki/wkhamovniki
  26. * branch master -> FETCH_HEAD
  27. Updating e3f6746..59957c5
  28. Fast-forward
  29. .gitignore | 3 +-
  30. AIBOLIT-WHITELIST.db | Bin 0 -> 6536964 bytes
  31. README.md | 26 +
  32. ai-bolit.php | 5890 +++++++++++++++++++++++++++++++++++++++
  33. assets/css/src/libs/menu.scss | 1126 ++++----
  34. assets/css/src/pages/otdelka.scss | 208 ++
  35. assets/css/src/style.scss | 2123 +++++++-------
  36. assets/css/style.css | 6675 +++++++++++++++++++++++++++++++++++++++++++-
  37. assets/css/style.css.map | 53 +-
  38. assets/js/script.js | 146 +
  39. assets/layout/menu.phtml | 1 +
  40. assets/m/css/src/pages/otdelka.scss | 129 +
  41. assets/m/css/src/style.scss | 1 +
  42. assets/m/css/style.css | 3705 ++++++++++++++++++++++++-
  43. assets/m/css/style.css.map | 79 +-
  44. assets/m/js/script.js | 7218 +++++++++++++++++++++++++++++++++++++++++++++++-
  45. assets/m/layout/menu.phtml | 1 +
  46. assets/m/pages/lobby.phtml | 2 +-
  47. assets/m/pages/otdelka.phtml | 49 +
  48. assets/pages/interiors.phtml | 2 +-
  49. assets/pages/lobby.phtml | 4 +-
  50. assets/pages/otdelka.phtml | 52 +
  51. assets/pages/otdelka_bg.phtml | 6 +
  52. checkMobile/resources/storage/cache/.gitkeep | 0
  53. checkMobile/resources/storage/persistence/b/e/ec06e0c6b7972ffb0d022a64716aae | Bin 117 -> 117 bytes
  54. checkMobile/wurfl-php-1.6.0.1/WURFL/Configuration/idx_config/.htaccess | 3 -
  55. checkMobile/wurfl-php-1.6.0.1/WURFL/Configuration/wpfunck.php | 1 -
  56. config.php | 42 +-
  57. db/wolf.sq3 | Bin 222208 -> 236544 bytes
  58. ...273\321\201\321\203\321\204\321\214\320\265\320\262\321\201\320\272\320\270\320\270\314\206.pdf" | Bin 0 -> 227558 bytes
  59. public/documents/Khamovniki_Pres.pdf | Bin 0 -> 6733556 bytes
  60. public/images/construction/2019.04.17/01.jpg | Bin 0 -> 3095985 bytes
  61. public/images/construction/2019.04.17/03.jpg | Bin 0 -> 1405237 bytes
  62. public/images/construction/2019.04.17/06 .jpg | Bin 0 -> 2713879 bytes
  63. public/images/construction/2019.04.17/11.jpg | Bin 0 -> 2272956 bytes
  64. public/images/construction/2019.04.17/19 .jpg | Bin 0 -> 3098519 bytes
  65. public/images/construction/2019.04.17/24.jpg | Bin 0 -> 2890184 bytes
  66. public/images/construction/2019.04.17/25.jpg | Bin 0 -> 1618031 bytes
  67. public/images/construction/2019.04.17/35.jpg | Bin 0 -> 2050647 bytes
  68. public/images/construction/2019.04.17/36.jpg | Bin 0 -> 2735917 bytes
  69. public/images/interiors/ginger_1.jpg | Bin 0 -> 4529522 bytes
  70. public/images/interiors/ginger_2.jpg | Bin 0 -> 4436075 bytes
  71. public/images/interiors/grey_1.jpg | Bin 0 -> 4415577 bytes
  72. public/images/interiors/grey_2.jpg | Bin 0 -> 6476240 bytes
  73. public/images/interiors/white_1.jpg | Bin 0 -> 4242997 bytes
  74. public/images/interiors/white_2.jpg | Bin 0 -> 6102899 bytes
  75. public/images/news/2018.08.02-1/wp-change.php | 47 -
  76. public/images/news/2018.08.02-1/wp-colz.php | 1 -
  77. public/images/news/2018.08.02-1/wp-sss.php | 9 -
  78. public/images/news/2018.08.02-1/wp-test-mail.php | 70 -
  79. wolf/plugins/blockadmin/views/public/content.php | 48 +-
  80. wolf/plugins/blockadmin/views/public/header.php | 46 +-
  81. wolf/plugins/blockadmin/views/public/layout.php | 44 +-
  82. wolf/plugins/blockadmin/views/public/sidebar.php | 0
  83. wolf/plugins/file_manager/FileManagerController.php | 2 -
  84. 55 files changed, 25768 insertions(+), 2044 deletions(-)
  85. create mode 100644 AIBOLIT-WHITELIST.db
  86. create mode 100644 README.md
  87. create mode 100644 ai-bolit.php
  88. create mode 100755 assets/css/src/pages/otdelka.scss
  89. create mode 100755 assets/m/css/src/pages/otdelka.scss
  90. create mode 100755 assets/m/pages/otdelka.phtml
  91. create mode 100644 assets/pages/otdelka.phtml
  92. create mode 100644 assets/pages/otdelka_bg.phtml
  93. delete mode 100644 checkMobile/resources/storage/cache/.gitkeep
  94. delete mode 100644 checkMobile/wurfl-php-1.6.0.1/WURFL/Configuration/idx_config/.htaccess
  95. delete mode 100644 checkMobile/wurfl-php-1.6.0.1/WURFL/Configuration/wpfunck.php
  96. mode change 100755 => 100644 config.php
  97. create mode 100644 "public/doc/290419\320\237\320\224_\320\236\320\273\321\201\321\203\321\204\321\214\320\265\320\262\321\201\320\272\320\270\320\270\314\206.pdf"
  98. create mode 100644 public/documents/Khamovniki_Pres.pdf
  99. create mode 100644 public/images/construction/2019.04.17/01.jpg
  100. create mode 100644 public/images/construction/2019.04.17/03.jpg
  101. create mode 100644 public/images/construction/2019.04.17/06 .jpg
  102. create mode 100644 public/images/construction/2019.04.17/11.jpg
  103. create mode 100644 public/images/construction/2019.04.17/19 .jpg
  104. create mode 100644 public/images/construction/2019.04.17/24.jpg
  105. create mode 100644 public/images/construction/2019.04.17/25.jpg
  106. create mode 100644 public/images/construction/2019.04.17/35.jpg
  107. create mode 100644 public/images/construction/2019.04.17/36.jpg
  108. create mode 100644 public/images/interiors/ginger_1.jpg
  109. create mode 100644 public/images/interiors/ginger_2.jpg
  110. create mode 100644 public/images/interiors/grey_1.jpg
  111. create mode 100644 public/images/interiors/grey_2.jpg
  112. create mode 100644 public/images/interiors/white_1.jpg
  113. create mode 100644 public/images/interiors/white_2.jpg
  114. delete mode 100644 public/images/news/2018.08.02-1/wp-change.php
  115. delete mode 100644 public/images/news/2018.08.02-1/wp-colz.php
  116. delete mode 100644 public/images/news/2018.08.02-1/wp-sss.php
  117. delete mode 100644 public/images/news/2018.08.02-1/wp-test-mail.php
  118. mode change 100755 => 100644 wolf/plugins/blockadmin/views/public/content.php
  119. mode change 100755 => 100644 wolf/plugins/blockadmin/views/public/header.php
  120. mode change 100755 => 100644 wolf/plugins/blockadmin/views/public/layout.php
  121. mode change 100755 => 100644 wolf/plugins/blockadmin/views/public/sidebar.php
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement