I deleted the changed file "bootstrap/start.php", Then run the command:
Code:sherly@HOME:~/www/imagehostnow.com$ cd ~/www/imagehostnow.com sherly@HOME:~/www/imagehostnow.com$ git pull origin master From ssh://git.buyscripts.in:10022/buyscripts/imagehost * branch master -> FETCH_HEAD Updating 23bd260..1316183 Fast-forward app/config/local/database.php | 6 +- app/controllers/Admin/AuthController.php | 115 +++++++++++++++++++++ app/controllers/Admin/HomeController.php | 35 +++++++ app/controllers/Admin/ImageController.php | 70 +++++++++++++ app/controllers/Admin/SettingsController.php | 58 +++++++++++ app/controllers/Admin/SpamReportsController.php | 25 +++++ app/controllers/Admin/UserController.php | 65 ++++++++++++ app/controllers/ImageController.php | 52 +++++++++- app/controllers/UploadController.php | 14 ++- app/controllers/UserController.php | 15 +++ .../2015_01_09_084809_add_type_in_images.php | 32 ++++++ ...0_040524_add_default_image_privacy_in_users.php | 32 ++++++ .../2015_01_10_062030_create_settings.php | 33 ++++++ .../2015_01_13_053228_create_spam_reports.php | 33 ++++++ app/models/Image.php | 25 +++++ app/models/Net.php | 29 ++++++ app/models/Settings.php | 31 ++++++ app/models/SpamReport.php | 17 +++ app/models/User.php | 17 +++ app/routes.php | 40 +++++++ app/views/admin/auth/forgot_password.blade.php | 48 +++++++++ app/views/admin/auth/login.blade.php | 66 ++++++++++++ app/views/admin/emails/reset_password.blade.php | 16 +++ app/views/admin/home/index.blade.php | 44 ++++++++ app/views/admin/image/index.blade.php | 51 +++++++++ app/views/admin/image/view.blade.php | 78 ++++++++++++++ app/views/admin/layouts/master.blade.php | 92 +++++++++++++++++ app/views/admin/settings/change_password.blade.php | 38 +++++++ app/views/admin/settings/index.blade.php | 47 +++++++++ app/views/admin/spam_reports/index.blade.php | 30 ++++++ app/views/admin/user/edit.blade.php | 35 +++++++ app/views/admin/user/images.blade.php | 53 ++++++++++ app/views/admin/user/index.blade.php | 47 +++++++++ app/views/image/index.blade.php | 32 ++++++ app/views/layouts/master.blade.php | 7 +- app/views/upload/success.blade.php | 7 +- app/views/user/image_settings.blade.php | 31 ++++++ app/views/user/images.blade.php | 40 ++++++- app/views/user/settings_menu.blade.php | 3 + bootstrap/start.php | 3 +- 40 files changed, 1496 insertions(+), 16 deletions(-) create mode 100644 app/controllers/Admin/AuthController.php create mode 100644 app/controllers/Admin/HomeController.php create mode 100644 app/controllers/Admin/ImageController.php create mode 100644 app/controllers/Admin/SettingsController.php create mode 100644 app/controllers/Admin/SpamReportsController.php create mode 100644 app/controllers/Admin/UserController.php create mode 100644 app/database/migrations/2015_01_09_084809_add_type_in_images.php create mode 100644 app/database/migrations/2015_01_10_040524_add_default_image_privacy_in_users.php create mode 100644 app/database/migrations/2015_01_10_062030_create_settings.php create mode 100644 app/database/migrations/2015_01_13_053228_create_spam_reports.php create mode 100644 app/models/Net.php create mode 100644 app/models/Settings.php create mode 100644 app/models/SpamReport.php create mode 100644 app/views/admin/auth/forgot_password.blade.php create mode 100644 app/views/admin/auth/login.blade.php create mode 100644 app/views/admin/emails/reset_password.blade.php create mode 100644 app/views/admin/home/index.blade.php create mode 100644 app/views/admin/image/index.blade.php create mode 100644 app/views/admin/image/view.blade.php create mode 100644 app/views/admin/layouts/master.blade.php create mode 100644 app/views/admin/settings/change_password.blade.php create mode 100644 app/views/admin/settings/index.blade.php create mode 100644 app/views/admin/spam_reports/index.blade.php create mode 100644 app/views/admin/user/edit.blade.php create mode 100644 app/views/admin/user/images.blade.php create mode 100644 app/views/admin/user/index.blade.php create mode 100644 app/views/user/image_settings.blade.php sherly@HOME:~/www/imagehostnow.com$




Reply With Quote
Bookmarks