Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- [root@web1 www]# git status
- # On branch master
- # Your branch is ahead of 'origin/master' by 30 commits.
- # (use "git push" to publish your local commits)
- #
- # Changes not staged for commit:
- # (use "git add <file>..." to update what will be committed)
- # (use "git checkout -- <file>..." to discard changes in working directory)
- #
- # modified: checkMobile/resources/storage/persistence/1/3/08216d76a11d6460a4e2cdd01d92a7
- #
- no changes added to commit (use "git add" and/or "git commit -a")
- [root@web1 www]# git reset --hard origin/master
- Checking out files: 100% (30968/30968), done.
- HEAD is now at e3f6746 чистка кеша
- [root@web1 www]#
- [root@web1 www]#
- [root@web1 www]# git pull origin master
- remote: Enumerating objects: 241, done.
- remote: Counting objects: 100% (241/241), done.
- remote: Compressing objects: 100% (140/140), done.
- remote: Total 202 (delta 124), reused 110 (delta 58)
- Receiving objects: 100% (202/202), 34.94 MiB | 21.91 MiB/s, done.
- Resolving deltas: 100% (124/124), completed with 22 local objects.
- From gitl.notamedia.ru:wkhamovniki/wkhamovniki
- * branch master -> FETCH_HEAD
- Updating e3f6746..59957c5
- Fast-forward
- .gitignore | 3 +-
- AIBOLIT-WHITELIST.db | Bin 0 -> 6536964 bytes
- README.md | 26 +
- ai-bolit.php | 5890 +++++++++++++++++++++++++++++++++++++++
- assets/css/src/libs/menu.scss | 1126 ++++----
- assets/css/src/pages/otdelka.scss | 208 ++
- assets/css/src/style.scss | 2123 +++++++-------
- assets/css/style.css | 6675 +++++++++++++++++++++++++++++++++++++++++++-
- assets/css/style.css.map | 53 +-
- assets/js/script.js | 146 +
- assets/layout/menu.phtml | 1 +
- assets/m/css/src/pages/otdelka.scss | 129 +
- assets/m/css/src/style.scss | 1 +
- assets/m/css/style.css | 3705 ++++++++++++++++++++++++-
- assets/m/css/style.css.map | 79 +-
- assets/m/js/script.js | 7218 +++++++++++++++++++++++++++++++++++++++++++++++-
- assets/m/layout/menu.phtml | 1 +
- assets/m/pages/lobby.phtml | 2 +-
- assets/m/pages/otdelka.phtml | 49 +
- assets/pages/interiors.phtml | 2 +-
- assets/pages/lobby.phtml | 4 +-
- assets/pages/otdelka.phtml | 52 +
- assets/pages/otdelka_bg.phtml | 6 +
- checkMobile/resources/storage/cache/.gitkeep | 0
- checkMobile/resources/storage/persistence/b/e/ec06e0c6b7972ffb0d022a64716aae | Bin 117 -> 117 bytes
- checkMobile/wurfl-php-1.6.0.1/WURFL/Configuration/idx_config/.htaccess | 3 -
- checkMobile/wurfl-php-1.6.0.1/WURFL/Configuration/wpfunck.php | 1 -
- config.php | 42 +-
- db/wolf.sq3 | Bin 222208 -> 236544 bytes
- ...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
- public/documents/Khamovniki_Pres.pdf | Bin 0 -> 6733556 bytes
- public/images/construction/2019.04.17/01.jpg | Bin 0 -> 3095985 bytes
- public/images/construction/2019.04.17/03.jpg | Bin 0 -> 1405237 bytes
- public/images/construction/2019.04.17/06 .jpg | Bin 0 -> 2713879 bytes
- public/images/construction/2019.04.17/11.jpg | Bin 0 -> 2272956 bytes
- public/images/construction/2019.04.17/19 .jpg | Bin 0 -> 3098519 bytes
- public/images/construction/2019.04.17/24.jpg | Bin 0 -> 2890184 bytes
- public/images/construction/2019.04.17/25.jpg | Bin 0 -> 1618031 bytes
- public/images/construction/2019.04.17/35.jpg | Bin 0 -> 2050647 bytes
- public/images/construction/2019.04.17/36.jpg | Bin 0 -> 2735917 bytes
- public/images/interiors/ginger_1.jpg | Bin 0 -> 4529522 bytes
- public/images/interiors/ginger_2.jpg | Bin 0 -> 4436075 bytes
- public/images/interiors/grey_1.jpg | Bin 0 -> 4415577 bytes
- public/images/interiors/grey_2.jpg | Bin 0 -> 6476240 bytes
- public/images/interiors/white_1.jpg | Bin 0 -> 4242997 bytes
- public/images/interiors/white_2.jpg | Bin 0 -> 6102899 bytes
- public/images/news/2018.08.02-1/wp-change.php | 47 -
- public/images/news/2018.08.02-1/wp-colz.php | 1 -
- public/images/news/2018.08.02-1/wp-sss.php | 9 -
- public/images/news/2018.08.02-1/wp-test-mail.php | 70 -
- wolf/plugins/blockadmin/views/public/content.php | 48 +-
- wolf/plugins/blockadmin/views/public/header.php | 46 +-
- wolf/plugins/blockadmin/views/public/layout.php | 44 +-
- wolf/plugins/blockadmin/views/public/sidebar.php | 0
- wolf/plugins/file_manager/FileManagerController.php | 2 -
- 55 files changed, 25768 insertions(+), 2044 deletions(-)
- create mode 100644 AIBOLIT-WHITELIST.db
- create mode 100644 README.md
- create mode 100644 ai-bolit.php
- create mode 100755 assets/css/src/pages/otdelka.scss
- create mode 100755 assets/m/css/src/pages/otdelka.scss
- create mode 100755 assets/m/pages/otdelka.phtml
- create mode 100644 assets/pages/otdelka.phtml
- create mode 100644 assets/pages/otdelka_bg.phtml
- delete mode 100644 checkMobile/resources/storage/cache/.gitkeep
- delete mode 100644 checkMobile/wurfl-php-1.6.0.1/WURFL/Configuration/idx_config/.htaccess
- delete mode 100644 checkMobile/wurfl-php-1.6.0.1/WURFL/Configuration/wpfunck.php
- mode change 100755 => 100644 config.php
- 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"
- create mode 100644 public/documents/Khamovniki_Pres.pdf
- create mode 100644 public/images/construction/2019.04.17/01.jpg
- create mode 100644 public/images/construction/2019.04.17/03.jpg
- create mode 100644 public/images/construction/2019.04.17/06 .jpg
- create mode 100644 public/images/construction/2019.04.17/11.jpg
- create mode 100644 public/images/construction/2019.04.17/19 .jpg
- create mode 100644 public/images/construction/2019.04.17/24.jpg
- create mode 100644 public/images/construction/2019.04.17/25.jpg
- create mode 100644 public/images/construction/2019.04.17/35.jpg
- create mode 100644 public/images/construction/2019.04.17/36.jpg
- create mode 100644 public/images/interiors/ginger_1.jpg
- create mode 100644 public/images/interiors/ginger_2.jpg
- create mode 100644 public/images/interiors/grey_1.jpg
- create mode 100644 public/images/interiors/grey_2.jpg
- create mode 100644 public/images/interiors/white_1.jpg
- create mode 100644 public/images/interiors/white_2.jpg
- delete mode 100644 public/images/news/2018.08.02-1/wp-change.php
- delete mode 100644 public/images/news/2018.08.02-1/wp-colz.php
- delete mode 100644 public/images/news/2018.08.02-1/wp-sss.php
- delete mode 100644 public/images/news/2018.08.02-1/wp-test-mail.php
- mode change 100755 => 100644 wolf/plugins/blockadmin/views/public/content.php
- mode change 100755 => 100644 wolf/plugins/blockadmin/views/public/header.php
- mode change 100755 => 100644 wolf/plugins/blockadmin/views/public/layout.php
- mode change 100755 => 100644 wolf/plugins/blockadmin/views/public/sidebar.php
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement