Created
October 4, 2016 16:23
-
-
Save jdotpz/60d74d18560799e96fcaa7e128a0b66e to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| mozilla-21477:~ mozilla$ cd /u/personal/ | |
| .DS_Store cat-in-a-bag/ | |
| mozilla-21477:~ mozilla$ cd /u/personal/cat-in-a-bag/ | |
| mozilla-21477:cat-in-a-bag mozilla$ git checkout vv | |
| Already on 'vv' | |
| Your branch is up-to-date with 'origin/vv'. | |
| mozilla-21477:cat-in-a-bag mozilla$ git pull | |
| remote: Counting objects: 356, done. | |
| remote: Total 356 (delta 252), reused 252 (delta 252), pack-reused 104 | |
| Receiving objects: 100% (356/356), 407.38 KiB | 0 bytes/s, done. | |
| Resolving deltas: 100% (266/266), completed with 200 local objects. | |
| From github.com:jdotpz/cat-in-a-bag | |
| ae48422..486d244 vv -> origin/vv | |
| Updating ae48422..486d244 | |
| Fast-forward | |
| application/config/autoload.php | 270 +- | |
| application/config/config.php | 2 +- | |
| application/config/database.php | 6 +- | |
| application/config/routes.php | 5 + | |
| application/libraries/MY_Form_validation.php | 20 +- | |
| application/modules/account/controllers/account_core.php | 8 +- | |
| application/modules/admin/controllers/Admin.php | 34 +- | |
| application/modules/admin/controllers/Auth.php | 34 +- | |
| application/modules/admin/controllers/Blog.php | 48 +- | |
| application/modules/admin/controllers/Business.php | 34 +- | |
| application/modules/admin/controllers/Category.php | 48 +- | |
| application/modules/admin/controllers/Category_blog.php | 48 +- | |
| application/modules/admin/controllers/Page.php | 48 +- | |
| application/modules/admin/controllers/Plugins.php | 34 +- | |
| application/modules/admin/controllers/Purchase.php | 34 +- | |
| application/modules/admin/controllers/Slider.php | 48 +- | |
| application/modules/admin/controllers/System.php | 34 +- | |
| application/modules/admin/controllers/Themes.php | 46 +- | |
| application/modules/admin/controllers/Users.php | 48 +- | |
| application/modules/admin/controllers/Widgets.php | 36 +- | |
| application/modules/admin/controllers/admin_core.php | 2934 +++++----- | |
| application/modules/admin/controllers/auth_core.php | 852 +-- | |
| application/modules/admin/controllers/blog_core.php | 519 +- | |
| application/modules/admin/controllers/business_core.php | 4294 +++++++------- | |
| application/modules/admin/controllers/category_blog_core.php | 474 +- | |
| application/modules/admin/controllers/category_core.php | 478 +- | |
| application/modules/admin/controllers/index.html | 18 +- | |
| application/modules/admin/controllers/page_core.php | 416 +- | |
| application/modules/admin/controllers/plugins_core.php | 508 +- | |
| application/modules/admin/controllers/purchase_core.php | 192 +- | |
| application/modules/admin/controllers/slider_core.php | 414 +- | |
| application/modules/admin/controllers/system_core.php | 1504 ++--- | |
| application/modules/admin/controllers/themes_core.php | 116 +- | |
| application/modules/admin/controllers/translate.php | 262 +- | |
| application/modules/admin/controllers/users_core.php | 644 +-- | |
| application/modules/admin/controllers/widgets_core.php | 322 +- | |
| application/modules/admin/index.html | 18 +- | |
| application/modules/admin/models/Admin_model.php | 36 +- | |
| application/modules/admin/models/Auth_model.php | 34 +- | |
| application/modules/admin/models/Blog_model.php | 46 +- | |
| application/modules/admin/models/Business_model.php | 46 +- | |
| application/modules/admin/models/Category_blog_model.php | 46 +- | |
| application/modules/admin/models/Category_model.php | 46 +- | |
| application/modules/admin/models/Cistance_info_model.php | 36 +- | |
| application/modules/admin/models/Options_model.php | 34 +- | |
| application/modules/admin/models/Page_model.php | 46 +- | |
| application/modules/admin/models/Plugins_model.php | 34 +- | |
| application/modules/admin/models/Slider_model.php | 46 +- | |
| application/modules/admin/models/System_model.php | 34 +- | |
| application/modules/admin/models/Themes_model.php | 46 +- | |
| application/modules/admin/models/Users_model.php | 46 +- | |
| application/modules/admin/models/Widget_model.php | 36 +- | |
| application/modules/admin/models/admin_model_core.php | 264 +- | |
| application/modules/admin/models/auth_model_core.php | 334 +- | |
| application/modules/admin/models/blog_model_core.php | 404 +- | |
| application/modules/admin/models/business_model_core.php | 938 +-- | |
| application/modules/admin/models/category_blog_model_core.php | 144 +- | |
| application/modules/admin/models/category_model_core.php | 144 +- | |
| application/modules/admin/models/distance_info_model_core.php | 348 +- | |
| application/modules/admin/models/index.html | 18 +- | |
| application/modules/admin/models/options_model_core.php | 124 +- | |
| application/modules/admin/models/page_model_core.php | 1074 ++-- | |
| application/modules/admin/models/plugins_model_core.php | 86 +- | |
| application/modules/admin/models/slider_model_core.php | 272 +- | |
| application/modules/admin/models/system_model_core.php | 214 +- | |
| application/modules/admin/models/themes_model_core.php | 56 +- | |
| application/modules/admin/models/users_model_core.php | 158 +- | |
| application/modules/admin/models/widget_model_core.php | 134 +- | |
| application/modules/admin/views/default/blog/allposts_view.php | 303 +- | |
| application/modules/admin/views/default/blog/categories/allcategories_view.php | 124 +- | |
| application/modules/admin/views/default/blog/categories/editcategory_view.php | 148 +- | |
| application/modules/admin/views/default/blog/categories/featured_img_uploader_view.php | 156 +- | |
| application/modules/admin/views/default/blog/categories/newcategory_view.php | 108 +- | |
| application/modules/admin/views/default/blog/featured_img_uploader_view.php | 156 +- | |
| application/modules/admin/views/default/blog/post_view.php | 772 +-- | |
| application/modules/admin/views/default/business/all_claimed_email_view.php | 346 +- | |
| application/modules/admin/views/default/business/all_emails_view.php | 328 +- | |
| application/modules/admin/views/default/business/all_locations_view.php | 414 +- | |
| application/modules/admin/views/default/business/all_payments_view.php | 282 +- | |
| application/modules/admin/views/default/business/all_posts_ajax_view.php | 212 +- | |
| application/modules/admin/views/default/business/all_posts_view.php | 386 +- | |
| application/modules/admin/views/default/business/all_reported_posts_ajax_view.php | 200 +- | |
| application/modules/admin/views/default/business/all_reported_posts_view.php | 386 +- | |
| application/modules/admin/views/default/business/all_reviews_view.php | 344 +- | |
| application/modules/admin/views/default/business/all_videos_view.php | 406 +- | |
| application/modules/admin/views/default/business/approve_payment_view.php | 282 +- | |
| application/modules/admin/views/default/business/banner_settings_view.php | 496 +- | |
| application/modules/admin/views/default/business/blog/all_blogs_view.php | 326 +- | |
| application/modules/admin/views/default/business/blog/blog_view.php | 656 +-- | |
| application/modules/admin/views/default/business/blog/featured_img_uploader_view.php | 156 +- | |
| application/modules/admin/views/default/business/bulk_email_view.php | 170 +- | |
| application/modules/admin/views/default/business/bulk_uploader_view.php | 198 +- | |
| application/modules/admin/views/default/business/edit_ad_view.php | 2172 +++---- | |
| application/modules/admin/views/default/business/edit_location_view.php | 162 +- | |
| application/modules/admin/views/default/business/feature_payment_view.php | 104 +- | |
| application/modules/admin/views/default/business/multiple-uploader.php | 368 +- | |
| application/modules/admin/views/default/business/new_location_view.php | 158 +- | |
| application/modules/admin/views/default/business/paypalsettings_view.php | 214 +- | |
| application/modules/admin/views/default/business/searchbg_uploader_view.php | 154 +- | |
| application/modules/admin/views/default/business/settings_view.php | 736 +-- | |
| application/modules/admin/views/default/business/single_review_view.php | 36 +- | |
| application/modules/admin/views/default/business/video_view.php | 620 +- | |
| application/modules/admin/views/default/categories/allcategories_view.php | 130 +- | |
| application/modules/admin/views/default/categories/editcategory_view.php | 186 +- | |
| application/modules/admin/views/default/categories/featured_img_uploader_view.php | 156 +- | |
| application/modules/admin/views/default/categories/newcategory_view.php | 190 +- | |
| application/modules/admin/views/default/confirmation_view.php | 8 +- | |
| application/modules/admin/views/default/emailtmp/debug_view.php | 72 +- | |
| application/modules/admin/views/default/emailtmp/edit_as_new_lang_view.php | 114 +- | |
| application/modules/admin/views/default/emailtmp/email_view.php | 222 +- | |
| application/modules/admin/views/default/emailtmp/newlang_view.php | 68 +- | |
| application/modules/admin/views/default/forgot_password_view.php | 120 +- | |
| application/modules/admin/views/default/index.html | 18 +- | |
| application/modules/admin/views/default/langeditor/edit_as_new_lang_view.php | 248 +- | |
| application/modules/admin/views/default/langeditor/lang_view.php | 464 +- | |
| application/modules/admin/views/default/langeditor/newlang_view.php | 130 +- | |
| application/modules/admin/views/default/langeditor/translate_view.php | 98 +- | |
| application/modules/admin/views/default/login_view.php | 160 +- | |
| application/modules/admin/views/default/pages/allpages_view.php | 260 +- | |
| application/modules/admin/views/default/pages/menu_view.php | 196 +- | |
| application/modules/admin/views/default/pages/page_view.php | 1250 ++-- | |
| application/modules/admin/views/default/plugins/allplugins_view.php | 122 +- | |
| application/modules/admin/views/default/plugins/default_view.php | 44 +- | |
| application/modules/admin/views/default/plugins/index.html | 18 +- | |
| application/modules/admin/views/default/profile/changepassword_view.php | 110 +- | |
| application/modules/admin/views/default/profile/editprofile_view.php | 958 ++-- | |
| application/modules/admin/views/default/regdomain_view.php | 82 +- | |
| application/modules/admin/views/default/register_view.bak.php | 196 +- | |
| application/modules/admin/views/default/register_view.php | 254 +- | |
| application/modules/admin/views/default/settings/default_view.php | 126 +- | |
| application/modules/admin/views/default/settings/index.html | 18 +- | |
| application/modules/admin/views/default/settings/logo_uploader_view.php | 142 +- | |
| application/modules/admin/views/default/settings/site_view.php | 382 +- | |
| application/modules/admin/views/default/settings/smtp_view.php | 326 +- | |
| application/modules/admin/views/default/sitemap/site_map_panel_view.php | 108 +- | |
| application/modules/admin/views/default/slider/allposts_view.php | 320 +- | |
| application/modules/admin/views/default/slider/featured_img_uploader_view.php | 156 +- | |
| application/modules/admin/views/default/slider/post_view.php | 468 +- | |
| application/modules/admin/views/default/system/allbackups_view.php | 108 +- | |
| application/modules/admin/views/default/system/index.html | 18 +- | |
| application/modules/admin/views/default/template/dashboard_view.php | 680 +-- | |
| application/modules/admin/views/default/template/footer.php | 10 +- | |
| application/modules/admin/views/default/template/header.php | 122 +- | |
| application/modules/admin/views/default/template/includes_bottom-original.php | 158 +- | |
| application/modules/admin/views/default/template/includes_bottom.php | 26 +- | |
| application/modules/admin/views/default/template/includes_top.php | 86 +- | |
| application/modules/admin/views/default/template/navigation.php | 682 +-- | |
| application/modules/admin/views/default/template/template_view.php | 84 +- | |
| application/modules/admin/views/default/themes/index_view.php | 166 +- | |
| application/modules/admin/views/default/users/all_videos_view.php | 398 +- | |
| application/modules/admin/views/default/users/allbucketlist_view.php | 166 +- | |
| application/modules/admin/views/default/users/alleducation_view.php | 128 +- | |
| application/modules/admin/views/default/users/allexperience_view.php | 128 +- | |
| application/modules/admin/views/default/users/allfavorite_view.php | 186 +- | |
| application/modules/admin/views/default/users/allusers_view.php | 456 +- | |
| application/modules/admin/views/default/users/blog/all_blogs_view.php | 327 +- | |
| application/modules/admin/views/default/users/blog/blog_view.php | 654 +-- | |
| application/modules/admin/views/default/users/blog/featured_img_uploader_view.php | 156 +- | |
| application/modules/admin/views/default/users/bulk_uploader_view.php | 198 +- | |
| application/modules/admin/views/default/users/createuser_view.php | 540 +- | |
| application/modules/admin/views/default/users/detail_view.php | 102 +- | |
| application/modules/admin/views/default/users/editbucketlist_view.php | 330 +- | |
| application/modules/admin/views/default/users/editeducation_view.php | 310 +- | |
| application/modules/admin/views/default/users/editexperience_view.php | 396 +- | |
| application/modules/admin/views/default/users/editfavorite_view.php | 484 +- | |
| application/modules/admin/views/default/users/editimages_view.php | 446 +- | |
| application/modules/admin/views/default/users/menu_view.php | 180 +- | |
| application/modules/admin/views/default/users/multiple-uploader.php | 86 +- | |
| application/modules/admin/views/default/users/neweducation_view.php | 260 +- | |
| application/modules/admin/views/default/users/newexperience_view.php | 338 +- | |
| application/modules/admin/views/default/users/page_view.php | 294 +- | |
| application/modules/admin/views/default/users/profile_photo_uploader_view.php | 308 +- | |
| application/modules/admin/views/default/users/video_view.php | 618 +- | |
| application/modules/admin/views/default/widgets/allwidgets_view.php | 240 +- | |
| application/modules/admin/views/default/widgets/editwidget_view.php | 96 +- | |
| application/modules/admin/views/default/widgets/widgetpositions_view.php | 428 +- | |
| application/modules/show/controllers/review_core.php | 7 +- | |
| application/modules/show/controllers/show_core.php | 633 +- | |
| application/modules/show/models/show_model_core.php | 13 + | |
| application/modules/themes/views/default/404_view.php | 46 +- | |
| application/modules/themes/views/default/adsearch_view.php | 26 +- | |
| application/modules/themes/views/default/agent_email_view.php | 122 +- | |
| application/modules/themes/views/default/all_post_reviews_view.php | 192 +- | |
| application/modules/themes/views/default/assets/css/all-css.php | 54 +- | |
| application/modules/themes/views/default/assets/css/bootstrap-select.min.css | 10 +- | |
| application/modules/themes/views/default/assets/css/bootstrap-theme.css | 1174 ++-- | |
| application/modules/themes/views/default/assets/css/bootstrap-theme.min.css | 10 +- | |
| application/modules/themes/views/default/assets/css/bootstrap.min.css | 10 +- | |
| application/modules/themes/views/default/assets/css/build.css | 536 +- | |
| application/modules/themes/views/default/assets/css/chosen.css | 806 +-- | |
| application/modules/themes/views/default/assets/css/custom.css | 2596 ++++----- | |
| application/modules/themes/views/default/assets/css/developer.css | 287 +- | |
| application/modules/themes/views/default/assets/css/font-awesome.css | 3602 ++++++------ | |
| application/modules/themes/views/default/assets/css/font-awesome.min.css | 6 +- | |
| application/modules/themes/views/default/assets/css/icons.css | 168 +- | |
| application/modules/themes/views/default/assets/css/jquery.mCustomScrollbar.css | 2544 ++++----- | |
| application/modules/themes/views/default/assets/css/lightGallery.css | 2170 +++---- | |
| application/modules/themes/views/default/assets/css/map-icons.css | 1136 ++-- | |
| application/modules/themes/views/default/assets/css/owl.theme.default.min.css | 102 +- | |
| application/modules/themes/views/default/assets/css/parallax-slider.css | 1388 ++--- | |
| application/modules/themes/views/default/assets/css/rtl-fix.css | 456 +- | |
| application/modules/themes/views/default/assets/css/select2.css | 822 +-- | |
| application/modules/themes/views/default/assets/css/stylein.css | 490 +- | |
| application/modules/themes/views/default/assets/css/styles/parallax.css | 496 +- | |
| application/modules/themes/views/default/assets/css/styles/real-estate.css | 614 +- | |
| application/modules/themes/views/default/assets/css/styles/restaurant.css | 334 +- | |
| application/modules/themes/views/default/assets/css/styles/skin-lblue.css | 1250 ++-- | |
| application/modules/themes/views/default/assets/css/styles/style.css | 16306 ++++++++++++++++++++++++++-------------------------- | |
| application/modules/themes/views/default/assets/css/swipebox.css | 590 +- | |
| application/modules/themes/views/default/assets/fonts/fonts.css | 122 +- | |
| application/modules/themes/views/default/assets/fonts/generator_config.txt | 8 +- | |
| application/modules/themes/views/default/assets/fonts/semi/preview.html | 8356 +++++++++++++-------------- | |
| application/modules/themes/views/default/assets/fonts/semi/semi.css | 4062 ++++++------- | |
| application/modules/themes/views/default/assets/jquery-ui/jquery-ui.css | 2476 ++++---- | |
| application/modules/themes/views/default/assets/jquery-ui/jquery-ui.js | 32298 +++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------- | |
| application/modules/themes/views/default/assets/jquery-ui/timepicker.js | 4446 +++++++-------- | |
| application/modules/themes/views/default/assets/js/bootstrap-select.js | 3606 ++++++------ | |
| application/modules/themes/views/default/assets/js/bootstrap-tag-cloud.js | 198 +- | |
| application/modules/themes/views/default/assets/js/bootstrap.min.js | 12 +- | |
| application/modules/themes/views/default/assets/js/chosen.jquery.min.js | 2180 +++---- | |
| application/modules/themes/views/default/assets/js/ecommerce.js | 48 +- | |
| application/modules/themes/views/default/assets/js/excanvas.js | 1848 +++--- | |
| application/modules/themes/views/default/assets/js/form-additional-methods.js | 6 +- | |
| application/modules/themes/views/default/assets/js/html5shiv.js | 14 +- | |
| application/modules/themes/views/default/assets/js/imagesloaded.min.js | 12 +- | |
| application/modules/themes/views/default/assets/js/ion.rangeSlider.min.js | 50 +- | |
| application/modules/themes/views/default/assets/js/ios-orientationchange-fix.js | 110 +- | |
| application/modules/themes/views/default/assets/js/isotope.js | 14 +- | |
| application/modules/themes/views/default/assets/js/jquery-2.1.0.min.js | 6 +- | |
| application/modules/themes/views/default/assets/js/jquery-2.1.1.min.js | 8 +- | |
| application/modules/themes/views/default/assets/js/jquery-migrate-1.2.1.min.js | 2 +- | |
| application/modules/themes/views/default/assets/js/jquery-ui-1.10.4.custom.min.js | 12 +- | |
| application/modules/themes/views/default/assets/js/jquery-ui-monthpicker.min.js | 12 +- | |
| application/modules/themes/views/default/assets/js/jquery-ui-timepicker.min.js | 8 +- | |
| application/modules/themes/views/default/assets/js/jquery-ui-touch-punch.min.js | 20 +- | |
| application/modules/themes/views/default/assets/js/jquery.arbitrary-anchor.js | 208 +- | |
| application/modules/themes/views/default/assets/js/jquery.countTo.js | 160 +- | |
| application/modules/themes/views/default/assets/js/jquery.countdown.min.js | 50 +- | |
| application/modules/themes/views/default/assets/js/jquery.cslider.js | 638 +-- | |
| application/modules/themes/views/default/assets/js/jquery.easing.1.3.js | 408 +- | |
| application/modules/themes/views/default/assets/js/jquery.form.js | 1822 +++--- | |
| application/modules/themes/views/default/assets/js/jquery.gmap.min.js | 18 +- | |
| application/modules/themes/views/default/assets/js/jquery.js | 6 +- | |
| application/modules/themes/views/default/assets/js/jquery.knob.js | 1600 +++--- | |
| application/modules/themes/views/default/assets/js/jquery.lightSlider.min.js | 896 +-- | |
| application/modules/themes/views/default/assets/js/jquery.mCustomScrollbar.concat.min.js | 8 +- | |
| application/modules/themes/views/default/assets/js/jquery.magnific-popup.min.js | 6 +- | |
| application/modules/themes/views/default/assets/js/jquery.maskedinput.js | 674 +-- | |
| application/modules/themes/views/default/assets/js/jquery.min.js | 10 +- | |
| application/modules/themes/views/default/assets/js/jquery.spectrum.min.js | 12 +- | |
| application/modules/themes/views/default/assets/js/jquery.sticky.js | 320 +- | |
| application/modules/themes/views/default/assets/js/jquery.swipebox.js | 1916 +++---- | |
| application/modules/themes/views/default/assets/js/jquery.themepunch.revolution.min.js | 12 +- | |
| application/modules/themes/views/default/assets/js/jquery.themepunch.tools.min.js | 284 +- | |
| application/modules/themes/views/default/assets/js/jquery.validate.js | 6 +- | |
| application/modules/themes/views/default/assets/js/jquery.waypoints.min.js | 12 +- | |
| application/modules/themes/views/default/assets/js/lightGallery.min.js | 2 +- | |
| application/modules/themes/views/default/assets/js/lightbox.min.js | 18 +- | |
| application/modules/themes/views/default/assets/js/main.js | 392 +- | |
| application/modules/themes/views/default/assets/js/map-icons.min.js | 146 +- | |
| application/modules/themes/views/default/assets/js/map_config.js | 182 +- | |
| application/modules/themes/views/default/assets/js/markercluster.min.js | 40 +- | |
| application/modules/themes/views/default/assets/js/masonry.js | 16 +- | |
| application/modules/themes/views/default/assets/js/modernizr-2.6.2.min.js | 6 +- | |
| application/modules/themes/views/default/assets/js/modernizr.custom.28468.js | 6 +- | |
| application/modules/themes/views/default/assets/js/npm.js | 24 +- | |
| application/modules/themes/views/default/assets/js/owl.carousel.min.js | 2 +- | |
| application/modules/themes/views/default/assets/js/placeholders.js | 2 +- | |
| application/modules/themes/views/default/assets/js/real-estate.js | 140 +- | |
| application/modules/themes/views/default/assets/js/respond.min.js | 8 +- | |
| application/modules/themes/views/default/assets/js/select2.js | 10548 +++++++++++++++++----------------- | |
| application/modules/themes/views/default/assets/js/support-filter.js | 66 +- | |
| application/modules/themes/views/default/assets/js/waypoints.min.js | 14 +- | |
| application/modules/themes/views/default/blog/blog-sidebar-left.php | 14 +- | |
| application/modules/themes/views/default/blog/blog_detail_view.php | 245 +- | |
| application/modules/themes/views/default/blog/blogs_view.php | 94 +- | |
| application/modules/themes/views/default/bulk_uploader_view.php | 198 +- | |
| application/modules/themes/views/default/business/all_blog_view.php | 92 +- | |
| application/modules/themes/views/default/business/all_image_view.php | 100 +- | |
| application/modules/themes/views/default/business/all_video_view.php | 120 +- | |
| application/modules/themes/views/default/business/blog_detail.php | 170 +- | |
| application/modules/themes/views/default/business/random_video_view.php | 72 +- | |
| application/modules/themes/views/default/category_posts_view.php | 214 +- | |
| application/modules/themes/views/default/claim_business_view.php | 130 +- | |
| application/modules/themes/views/default/grid_view.php | 120 +- | |
| application/modules/themes/views/default/home_custom_search.php | 264 +- | |
| application/modules/themes/views/default/home_view.php | 5 + | |
| application/modules/themes/views/default/includes/header.php | 17 +- | |
| application/modules/themes/views/default/includes/includes_bottom.php | 7 +- | |
| application/modules/themes/views/default/includes/includes_top.php | 5 +- | |
| application/modules/themes/views/default/list_view.php | 130 +- | |
| application/modules/themes/views/default/load_write_review.php | 5 +- | |
| application/modules/themes/views/default/location_posts_view.php | 140 +- | |
| application/modules/themes/views/default/login_view.php | 168 +- | |
| application/modules/themes/views/default/map_search_view.php | 798 +-- | |
| application/modules/themes/views/default/map_view.php | 216 +- | |
| application/modules/themes/views/default/member_posts_view.php | 133 +- | |
| application/modules/themes/views/default/msg_view.php | 16 +- | |
| application/modules/themes/views/default/multiple-uploader.php | 368 +- | |
| application/modules/themes/views/default/page_view.php | 134 +- | |
| application/modules/themes/views/default/pages/contact_view.php | 180 +- | |
| application/modules/themes/views/default/pages/page_about_view.php | 116 +- | |
| application/modules/themes/views/default/pages/page_contact_view.php | 38 +- | |
| application/modules/themes/views/default/plain_search_view.php | 466 +- | |
| application/modules/themes/views/default/post_ad_view.php | 2 +- | |
| application/modules/themes/views/default/print_view.php | 1264 ++-- | |
| application/modules/themes/views/default/recover_view.php | 64 +- | |
| application/modules/themes/views/default/review_form.php | 14 +- | |
| application/modules/themes/views/default/single_review_view.php | 80 +- | |
| application/modules/themes/views/default/sitemap_view.php | 72 +- | |
| application/modules/themes/views/default/success_view.php | 20 +- | |
| application/modules/themes/views/default/template_view.php | 5 + | |
| application/modules/themes/views/default/top_search.php | 274 +- | |
| application/modules/themes/views/default/user/blog_detail.php | 106 +- | |
| application/modules/user/controllers/user_core.php | 251 + | |
| application/modules/user/models/user_model_core.php | 213 +- | |
| 316 files changed, 89817 insertions(+), 87497 deletions(-) | |
| mozilla-21477:cat-in-a-bag mozilla$ git checkout -b jps-test-update | |
| Switched to a new branch 'jps-test-update' | |
| mozilla-21477:cat-in-a-bag mozilla$ git checkout -b issue15-addreadme | |
| Switched to a new branch 'issue15-addreadme' | |
| mozilla-21477:cat-in-a-bag mozilla$ #THE ABOVE COMMAND CREATES A BRANCH, BRANCHED FROM THE vv BRANCH (OUR MASTER BRANCH, SO TO SPEAK) | |
| mozilla-21477:cat-in-a-bag mozilla$ | |
| mozilla-21477:cat-in-a-bag mozilla$ | |
| mozilla-21477:cat-in-a-bag mozilla$ git status # HAVE I UPDATED ANY FILES? | |
| On branch issue15-addreadme | |
| Untracked files: | |
| (use "git add <file>..." to include in what will be committed) | |
| README.md | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| mozilla-21477:cat-in-a-bag mozilla$ | |
| mozilla-21477:cat-in-a-bag mozilla$ | |
| mozilla-21477:cat-in-a-bag mozilla$ git add README.md # OK, I DID UPDATE A FILE SINCE I BRANCHED. LET'S TELL GIT TO 'TRACK' THAT FILES CHANGES WITH 'git add filename' | |
| mozilla-21477:cat-in-a-bag mozilla$ | |
| mozilla-21477:cat-in-a-bag mozilla$ | |
| mozilla-21477:cat-in-a-bag mozilla$ git status | |
| On branch issue15-addreadme | |
| Changes to be committed: | |
| (use "git reset HEAD <file>..." to unstage) | |
| new file: README.md | |
| mozilla-21477:cat-in-a-bag mozilla$ #OK THE ABOVE SHOWS ME THAT I HAVE A SAVED CHANGE ON A TRACKED FILE WHICH DIFFERS FROM WHEN I STARTED.... | |
| mozilla-21477:cat-in-a-bag mozilla$ # I WANT TO PUSH THIS UP TO THE REPO! | |
| mozilla-21477:cat-in-a-bag mozilla$ | |
| mozilla-21477:cat-in-a-bag mozilla$ | |
| mozilla-21477:cat-in-a-bag mozilla$ git commit -a -m "This adds a README file, addressing issue15"; | |
| [issue15-addreadme ade4e39] This adds a README file, addressing issue15 | |
| 1 file changed, 2 insertions(+) | |
| create mode 100644 README.md | |
| mozilla-21477:cat-in-a-bag mozilla$ | |
| mozilla-21477:cat-in-a-bag mozilla$ | |
| mozilla-21477:cat-in-a-bag mozilla$ #IT'S NOW COMMITTED, BUT NOT UP ON THE REPO...LET'S PUSH IT UP | |
| mozilla-21477:cat-in-a-bag mozilla$ git push origin issue15-addreadme #SYNTAX IS: git push $repo $branch-name (note: repo will usually be origin for you) | |
| Counting objects: 3, done. | |
| Delta compression using up to 8 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (3/3), 359 bytes | 0 bytes/s, done. | |
| Total 3 (delta 1), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (1/1), completed with 1 local objects. | |
| To [email protected]:jdotpz/cat-in-a-bag.git | |
| * [new branch] issue15-addreadme -> issue15-addreadme | |
| mozilla-21477:cat-in-a-bag mozilla$ | |
| mozilla-21477:cat-in-a-bag mozilla$ | |
| mozilla-21477:cat-in-a-bag mozilla$ | |
| mozilla-21477:cat-in-a-bag mozilla$ #NOW, I GO FILE A PULL REQUEST TO MAKE MY CHANGES IN THE issue15-addreadme branch INTO THE vv BRANCH | |
| mozilla-21477:cat-in-a-bag mozilla$ | |
| mozilla-21477:cat-in-a-bag mozilla$ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment