Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
7317 4620 d 17 h amit.gupta /trunk/ContentStore/src/ Made offertext unavailable for stores.  
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
/trunk/ContentStore/src/velocity/CategorySnippet.vm
/trunk/ContentStore/src/velocity/HomeSnippet.vm
/trunk/ContentStore/src/velocity/ProductDetail.vm
5930 4880 d 14 h amit.gupta /trunk/ All entities are comparable irrespective of their scores.  
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
/trunk/ContentStore/src/main/java/in/shop2020/util/NewCMP.java
/trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
/trunk/ContentStore/src/velocity/CategorySnippet.vm
/trunk/ContentStore/src/velocity/HomeSnippet.vm
/trunk/ContentStore/src/velocity/MostComparedSnippet.vm
/trunk/ContentStore/src/velocity/MyResearchSnippet.vm
/trunk/ContentStore/src/velocity/SearchSnippet.vm
/trunk/ContentStore/src/velocity/SlideGuide.vm
/trunk/ContentStore/src/xml/model/categories.xml
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
/trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
5552 4937 d 18 h phani.kumar /trunk/ Ticket #1431 Data Tracking for Comparisons required [Product]
Ticket #1432 Product Changes to Comparison Feature Visibility[Product]
Ticket #1433 Changes to the Compare Page [Product]
reviewer: Rajveer Singh, Amar Kumar		  
/trunk/ContentStore/src/velocity/MostComparedSnippet.vm
/trunk/GoogleAppDatalog/src/main/webapp/jsp/comparison-stats.jsp
/trunk/Common/src/main/java/in/shop2020/datalogger/event/ProductCompare.java
/trunk/Common/src/main/java/in/shop2020/datalogger/event/ResearchAdd.java
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
/trunk/ContentStore/src/velocity/CategorySnippet.vm
/trunk/ContentStore/src/velocity/CompareProductSummarySnippet.vm
/trunk/ContentStore/src/velocity/HomeSnippet.vm
/trunk/ContentStore/src/velocity/SearchSnippet.vm
/trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/web.xml
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MostComparedProductsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
/trunk/Website/src/main/java/in/shop2020/serving/utils/SnippetType.java
/trunk/Website/src/main/resources/templates/myresearch.vm
/trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/myresearch-show.vm
/trunk/Website/src/main/webapp/css/comparision.css
/trunk/Website/src/main/webapp/css/entity.css
/trunk/Website/src/main/webapp/css/product.css
/trunk/Website/src/main/webapp/js/all.js
/trunk/Website/src/main/webapp/js/entity.js
/trunk/Website/src/main/webapp/js/widgets.js
5261 4983 d 18 h amit.gupta /trunk/ContentStore/src/ Removed Add to compare icon for entities that are not comparable.  
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
/trunk/ContentStore/src/velocity/CategorySnippet.vm
/trunk/ContentStore/src/velocity/HomeSnippet.vm
/trunk/ContentStore/src/velocity/SearchSnippet.vm
5162 4993 d 19 h phani.kumar /trunk/ Ticket #971 Versioning of website images, js and css
Ticket #1202 script to delete unused images
reviewer: Rajveer		  
/trunk/Website/scripts
/trunk/Website/scripts/image_delete.sh
/trunk/Website/scripts/image_version.sh
/trunk/Website/scripts/js_css_version.sh
/trunk/Website/src/main/webapp/images/Business_Std.jpg
/trunk/Website/src/main/webapp/images/ButtonWhite_ALLSTATES.png
/trunk/Website/src/main/webapp/images/Button_AddNewAddress_ALLSTATES.png
/trunk/Website/src/main/webapp/images/Button_Apply_ALLSTATES.png
/trunk/Website/src/main/webapp/images/Button_EnterShippingInfo_ALLSTATES.png
/trunk/Website/src/main/webapp/images/Button_UpdateDeliveryTime_ALLSTATES.png
/trunk/Website/src/main/webapp/images/Button_ViewAllOrders_ALLSTATES.png
/trunk/Website/src/main/webapp/images/Cross_DeleteRow_DWN.png
/trunk/Website/src/main/webapp/images/Cross_DeleteRow_OVR.png
/trunk/Website/src/main/webapp/images/FooterFootBG.png
/trunk/Website/src/main/webapp/images/IconBestDeals_NavBar.png
/trunk/Website/src/main/webapp/images/IconCross_Lists_DEF.png
/trunk/Website/src/main/webapp/images/IconCross_Lists_OVR.png
/trunk/Website/src/main/webapp/images/IconDownArrow_SelectedTab.png
/trunk/Website/src/main/webapp/images/IconDownArrow_WhiteButton.png
/trunk/Website/src/main/webapp/images/IconFreeDelivery_TopBar.png
/trunk/Website/src/main/webapp/images/IconSearchButton_ALLSTATES.png
/trunk/Website/src/main/webapp/images/IconSupport_TopBar.png
/trunk/Website/src/main/webapp/images/Icon_AddNewAddress_ALLSTATES.png
/trunk/Website/src/main/webapp/images/Icon_ShareOnFacebook.png
/trunk/Website/src/main/webapp/images/ListIcon_Cart_Default.png
/trunk/Website/src/main/webapp/images/Right flash.swf
/trunk/Website/src/main/webapp/images/SH911-widgetbar.jpg
/trunk/Website/src/main/webapp/images/VerticalSeparator_NavBar.png
/trunk/Website/src/main/webapp/images/actionbar-left.jpg
/trunk/Website/src/main/webapp/images/actionbar-right.jpg
/trunk/Website/src/main/webapp/images/add-to-cart.gif
/trunk/Website/src/main/webapp/images/add-to-cart.png
/trunk/Website/src/main/webapp/images/add-to-cart_bg.gif
/trunk/Website/src/main/webapp/images/addtoresch.gif
/trunk/Website/src/main/webapp/images/ask_frnd.gif
/trunk/Website/src/main/webapp/images/b_yellow.jpg
/trunk/Website/src/main/webapp/images/bg-btn-blue.png
/trunk/Website/src/main/webapp/images/bl.gif
/trunk/Website/src/main/webapp/images/black-bullet.gif
/trunk/Website/src/main/webapp/images/blackbullet.jpg
/trunk/Website/src/main/webapp/images/block1Bottom.png
/trunk/Website/src/main/webapp/images/block1Top.png
/trunk/Website/src/main/webapp/images/block3Bottom.jpg
/trunk/Website/src/main/webapp/images/block3Top.jpg
/trunk/Website/src/main/webapp/images/blue_arw.gif
/trunk/Website/src/main/webapp/images/br.gif
/trunk/Website/src/main/webapp/images/but_bg_tile19.jpg
/trunk/Website/src/main/webapp/images/but_bg_tile28.jpg
/trunk/Website/src/main/webapp/images/button-bg.jpg
/trunk/Website/src/main/webapp/images/button.gif
/trunk/Website/src/main/webapp/images/buttons/Thumbs.db
/trunk/Website/src/main/webapp/images/buttons/big-button-hor-bar.jpg
/trunk/Website/src/main/webapp/images/buttons/big-button-left.jpg
/trunk/Website/src/main/webapp/images/buttons/big-button-right.jpg
/trunk/Website/src/main/webapp/images/buttons/customer-service-mail.jpg
/trunk/Website/src/main/webapp/images/buttons/facebook-find-us-on.jpg
/trunk/Website/src/main/webapp/images/buttons/facebook-header.jpg
/trunk/Website/src/main/webapp/images/buttons/facebook-like.jpg
/trunk/Website/src/main/webapp/images/buttons/facebook.jpg
/trunk/Website/src/main/webapp/images/buttons/free-shipping.jpg
/trunk/Website/src/main/webapp/images/buttons/mail.jpg
/trunk/Website/src/main/webapp/images/buttons/orkut.jpg
/trunk/Website/src/main/webapp/images/buttons/phone-call.jpg
/trunk/Website/src/main/webapp/images/buttons/rating-star.jpg
/trunk/Website/src/main/webapp/images/buttons/search-sprite.jpg
/trunk/Website/src/main/webapp/images/buttons/twitter.jpg
/trunk/Website/src/main/webapp/images/c.png
/trunk/Website/src/main/webapp/images/cart_btn.gif
/trunk/Website/src/main/webapp/images/cc_logos.gif
/trunk/Website/src/main/webapp/images/center_bg.gif
/trunk/Website/src/main/webapp/images/check_out_account_close.gif
/trunk/Website/src/main/webapp/images/check_out_new_btn2.gif
/trunk/Website/src/main/webapp/images/cod.jpg
/trunk/Website/src/main/webapp/images/compare_btn.gif
/trunk/Website/src/main/webapp/images/contentMainbottom1.png
/trunk/Website/src/main/webapp/images/contentMaintop1.png
/trunk/Website/src/main/webapp/images/cotentBg3.jpg
/trunk/Website/src/main/webapp/images/cotentBgC.png
/trunk/Website/src/main/webapp/images/crumb_arw.gif
/trunk/Website/src/main/webapp/images/customer-service-hor-bar.jpg
/trunk/Website/src/main/webapp/images/customer-service-phone.jpg
/trunk/Website/src/main/webapp/images/default.jpg
/trunk/Website/src/main/webapp/images/delete-button-hor-bar.jpg
/trunk/Website/src/main/webapp/images/delete-button-left.jpg
/trunk/Website/src/main/webapp/images/delete-button-right.jpg
/trunk/Website/src/main/webapp/images/demo_panel_bg.gif
/trunk/Website/src/main/webapp/images/dot.gif
/trunk/Website/src/main/webapp/images/dot_.gif
/trunk/Website/src/main/webapp/images/down-arrow-blue.jpg
/trunk/Website/src/main/webapp/images/down-arrow-grey.jpg
/trunk/Website/src/main/webapp/images/down-arrow-menu.png
/trunk/Website/src/main/webapp/images/droid.gif
/trunk/Website/src/main/webapp/images/email-header.jpg
/trunk/Website/src/main/webapp/images/enabledisable-button-hor-bar.jpg
/trunk/Website/src/main/webapp/images/enabledisable-button-left.jpg
/trunk/Website/src/main/webapp/images/enabledisable-button-right.jpg
/trunk/Website/src/main/webapp/images/facebook.gif
/trunk/Website/src/main/webapp/images/facebook.png
/trunk/Website/src/main/webapp/images/filter-arrow.gif
/trunk/Website/src/main/webapp/images/findFacebook.png
/trunk/Website/src/main/webapp/images/findbox.gif
/trunk/Website/src/main/webapp/images/flowplayer-3.1.5.swf
/trunk/Website/src/main/webapp/images/flowplayer.controls-3.1.5.swf
/trunk/Website/src/main/webapp/images/fofb.gif
/trunk/Website/src/main/webapp/images/front-bg.gif
/trunk/Website/src/main/webapp/images/goButton.png
/trunk/Website/src/main/webapp/images/go_btn.gif
/trunk/Website/src/main/webapp/images/grey-bullet.gif
/trunk/Website/src/main/webapp/images/grey.gif
/trunk/Website/src/main/webapp/images/handle_bot.png
/trunk/Website/src/main/webapp/images/handle_mid.png
/trunk/Website/src/main/webapp/images/handle_top.png
/trunk/Website/src/main/webapp/images/icon_cart.jpg
/trunk/Website/src/main/webapp/images/icon_orkut.jpg
/trunk/Website/src/main/webapp/images/icon_research.jpg
/trunk/Website/src/main/webapp/images/icon_tweet.jpg
/trunk/Website/src/main/webapp/images/inp_bg.gif
/trunk/Website/src/main/webapp/images/lb_hdr_bg.gif
/trunk/Website/src/main/webapp/images/left_curv.gif
/trunk/Website/src/main/webapp/images/lgb_arw.gif
/trunk/Website/src/main/webapp/images/lgb_arw_cc.gif
/trunk/Website/src/main/webapp/images/logo.gif
/trunk/Website/src/main/webapp/images/maestro-logo.gif
/trunk/Website/src/main/webapp/images/maestro.png
/trunk/Website/src/main/webapp/images/mail_ico.gif
/trunk/Website/src/main/webapp/images/mastercard.png
/trunk/Website/src/main/webapp/images/mastercard_securecode.gif
/trunk/Website/src/main/webapp/images/mehron-square-bullet.gif
/trunk/Website/src/main/webapp/images/menu-hor-bar.jpg
/trunk/Website/src/main/webapp/images/menu-ver-bar.png
/trunk/Website/src/main/webapp/images/menubg.gif
/trunk/Website/src/main/webapp/images/moneycontrol.jpg
/trunk/Website/src/main/webapp/images/nav-img/1_black.png
/trunk/Website/src/main/webapp/images/nav-img/1gray.png
/trunk/Website/src/main/webapp/images/nav-img/2_black.png
/trunk/Website/src/main/webapp/images/nav-img/2_gray.png
/trunk/Website/src/main/webapp/images/nav-img/3_Gray.png
/trunk/Website/src/main/webapp/images/nav-img/3_black.png
/trunk/Website/src/main/webapp/images/nav-img/arrow.png
/trunk/Website/src/main/webapp/images/nav-img/free_shipping_cart.png
/trunk/Website/src/main/webapp/images/nav-img/remove.png
/trunk/Website/src/main/webapp/images/netbanking.gif
/trunk/Website/src/main/webapp/images/notification-close.gif
/trunk/Website/src/main/webapp/images/orkut.gif
/trunk/Website/src/main/webapp/images/osx_arrow_down.gif
/trunk/Website/src/main/webapp/images/osx_arrow_up.gif
/trunk/Website/src/main/webapp/images/osx_drag_bottom_OLD.gif
/trunk/Website/src/main/webapp/images/osx_drag_middle_OLD.gif
/trunk/Website/src/main/webapp/images/osx_drag_top_OLD.gif
/trunk/Website/src/main/webapp/images/p1.gif
/trunk/Website/src/main/webapp/images/p2.gif
/trunk/Website/src/main/webapp/images/phone-header.png
/trunk/Website/src/main/webapp/images/phoneReviewbottom.gif
/trunk/Website/src/main/webapp/images/phoneReviewtop.gif
/trunk/Website/src/main/webapp/images/phone_call.gif
/trunk/Website/src/main/webapp/images/pinloc_bg.gif
/trunk/Website/src/main/webapp/images/proceed.png
/trunk/Website/src/main/webapp/images/proceed_check_out.gif
/trunk/Website/src/main/webapp/images/proceed_to_pay.gif
/trunk/Website/src/main/webapp/images/product-banner.jpg
/trunk/Website/src/main/webapp/images/readmore.jpg
/trunk/Website/src/main/webapp/images/right-arrow-blue.jpg
/trunk/Website/src/main/webapp/images/right_curv.gif
/trunk/Website/src/main/webapp/images/scroll-462.png
/trunk/Website/src/main/webapp/images/scroll-560.png
/trunk/Website/src/main/webapp/images/scroll-565.png
/trunk/Website/src/main/webapp/images/scroll-577.png
/trunk/Website/src/main/webapp/images/scroll.png
/trunk/Website/src/main/webapp/images/secured.png
/trunk/Website/src/main/webapp/images/shipping.gif
/trunk/Website/src/main/webapp/images/side_arw_actv.gif
/trunk/Website/src/main/webapp/images/side_arw_actv_old.gif
/trunk/Website/src/main/webapp/images/side_arw_inact.gif
/trunk/Website/src/main/webapp/images/side_arw_inact_old.gif
/trunk/Website/src/main/webapp/images/side_hdr_bg.gif
/trunk/Website/src/main/webapp/images/sidebar-banner.jpg
/trunk/Website/src/main/webapp/images/sidebar-heading-hor-bar.jpg
/trunk/Website/src/main/webapp/images/sidenav_bg.gif
/trunk/Website/src/main/webapp/images/sidenav_bg_old.gif
/trunk/Website/src/main/webapp/images/signin-bottom.png
/trunk/Website/src/main/webapp/images/signin-button-left.gif
/trunk/Website/src/main/webapp/images/signin-button-right.gif
/trunk/Website/src/main/webapp/images/signin-container-bottom-left.png
/trunk/Website/src/main/webapp/images/signin-container-bottom-right.png
/trunk/Website/src/main/webapp/images/signin-container-top-left.png
/trunk/Website/src/main/webapp/images/signin-container-top-right.png
/trunk/Website/src/main/webapp/images/signin-nav-bg-hover-ie.png
/trunk/Website/src/main/webapp/images/signin-nav-bg-ie.png
/trunk/Website/src/main/webapp/images/signin-textbox-hor-bar.gif
/trunk/Website/src/main/webapp/images/signin-textbox-left.gif
/trunk/Website/src/main/webapp/images/signin-textbox-right.gif
/trunk/Website/src/main/webapp/images/signin_arw.gif
/trunk/Website/src/main/webapp/images/slideguide-content-bottom-left.jpg
/trunk/Website/src/main/webapp/images/slideguide-content-top-left.jpg
/trunk/Website/src/main/webapp/images/slideguide-nav-arrow.jpg
/trunk/Website/src/main/webapp/images/slideguide-nav-ver-bar.jpg
/trunk/Website/src/main/webapp/images/sprite.png
/trunk/Website/src/main/webapp/images/star-0.gif
/trunk/Website/src/main/webapp/images/star-1.0.gif
/trunk/Website/src/main/webapp/images/star-2.0.gif
/trunk/Website/src/main/webapp/images/star-4.0.gif
/trunk/Website/src/main/webapp/images/star-5.0.gif
/trunk/Website/src/main/webapp/images/star_off.gif
/trunk/Website/src/main/webapp/images/star_on.gif
/trunk/Website/src/main/webapp/images/sublink_arw.gif
/trunk/Website/src/main/webapp/images/tab-hor-bar.jpg
/trunk/Website/src/main/webapp/images/tab1-btn-hor-bar.png
/trunk/Website/src/main/webapp/images/tab1-btn-left.png
/trunk/Website/src/main/webapp/images/tab1-btn-right.png
/trunk/Website/src/main/webapp/images/tab2-btn-hor-bar.png
/trunk/Website/src/main/webapp/images/tab2-btn-left.png
/trunk/Website/src/main/webapp/images/tab2-btn-right.png
/trunk/Website/src/main/webapp/images/tab_unselc.gif
/trunk/Website/src/main/webapp/images/times-of-india.jpg
/trunk/Website/src/main/webapp/images/tipsy-east.gif
/trunk/Website/src/main/webapp/images/tipsy-north.gif
/trunk/Website/src/main/webapp/images/tipsy-south.gif
/trunk/Website/src/main/webapp/images/tipsy-west.gif
/trunk/Website/src/main/webapp/images/tipsy.gif
/trunk/Website/src/main/webapp/images/tl.gif
/trunk/Website/src/main/webapp/images/toggle_down_light.png
/trunk/Website/src/main/webapp/images/toggle_up_dark.png
/trunk/Website/src/main/webapp/images/tr.gif
/trunk/Website/src/main/webapp/images/track_bg.png
/trunk/Website/src/main/webapp/images/track_bot.png
/trunk/Website/src/main/webapp/images/track_bot1.png
/trunk/Website/src/main/webapp/images/track_top.png
/trunk/Website/src/main/webapp/images/track_top1.png
/trunk/Website/src/main/webapp/images/tweet.gif
/trunk/Website/src/main/webapp/images/twitter.png
/trunk/Website/src/main/webapp/images/util_bg.gif
/trunk/Website/src/main/webapp/images/v_line.gif
/trunk/Website/src/main/webapp/images/view_360.gif
/trunk/Website/src/main/webapp/images/visa-electron.png
/trunk/Website/src/main/webapp/images/visa-master-logo.jpg
/trunk/Website/src/main/webapp/images/visa-verified.jpg
/trunk/Website/src/main/webapp/images/visa.png
/trunk/ContentStore/src/velocity/CategorySnippet.vm
/trunk/ContentStore/src/velocity/HomeSnippet.vm
/trunk/ContentStore/src/velocity/ProductDetail.vm
/trunk/Website/pom.xml
4138 5164 d 16 h rajveer /trunk/ContentStore/src/velocity/ Align center if there is no offer.  
/trunk/ContentStore/src/velocity/HomeSnippet.vm
4131 5165 d 13 h rajveer /trunk/ContentStore/src/velocity/ Changes for best deal text on home page.  
/trunk/ContentStore/src/velocity/HomeSnippet.vm
3931 5192 d 17 h mandeep.dhir /trunk/ContentStore/src/velocity/ Trac#506 Making changes in vm files to read images etc. from new path and with versioned names  
/trunk/ContentStore/src/velocity/AfterSales.vm
/trunk/ContentStore/src/velocity/CategorySnippet.vm
/trunk/ContentStore/src/velocity/CompareProductSnippet.vm
/trunk/ContentStore/src/velocity/CompareProductSummarySnippet.vm
/trunk/ContentStore/src/velocity/HomeSnippet.vm
/trunk/ContentStore/src/velocity/MyResearchSnippet.vm
/trunk/ContentStore/src/velocity/PhonesIOwnSnippet.vm
/trunk/ContentStore/src/velocity/SearchSnippet.vm
/trunk/ContentStore/src/velocity/SlideGuide.vm
/trunk/ContentStore/src/velocity/WidgetSnippet.vm
3827 5200 d 12 h rajveer /trunk/ContentStore/src/velocity/ Updated snippets according to new design.  
/trunk/ContentStore/src/velocity/CategorySnippet.vm
/trunk/ContentStore/src/velocity/HomeSnippet.vm
/trunk/ContentStore/src/velocity/ProductDetail.vm
/trunk/ContentStore/src/velocity/SearchSnippet.vm
/trunk/ContentStore/src/velocity/SlideGuide.vm
2760 5283 d 17 h rajveer /trunk/ContentStore/src/velocity/ exposed the catalogid in add to cart button also.  
/trunk/ContentStore/src/velocity/CategorySnippet.vm
/trunk/ContentStore/src/velocity/CompareProductSnippet.vm
/trunk/ContentStore/src/velocity/CompareProductSummarySnippet.vm
/trunk/ContentStore/src/velocity/HomeSnippet.vm
/trunk/ContentStore/src/velocity/SearchSnippet.vm
2433 5306 d 18 h rajveer /trunk/ContentStore/src/ Modified to use only one velocity context. Also added product name in json object. Renamed name of velocity files to make them consistent with html filenames. Added proper javadocs  
/trunk/ContentStore/src/velocity/CategorySnippet.vm
/trunk/ContentStore/src/velocity/CompareProductSnippet.vm
/trunk/ContentStore/src/velocity/CompareProductSummarySnippet.vm
/trunk/ContentStore/src/velocity/ComparisonSnippet.vm
/trunk/ContentStore/src/velocity/HomeSnippet.vm
/trunk/ContentStore/src/velocity/PhonesIOwnSnippet.vm
/trunk/ContentStore/src/velocity/ProductDetail.vm
/trunk/ContentStore/src/velocity/SearchSnippet.vm
/trunk/ContentStore/src/velocity/SlideGuide.vm
/trunk/ContentStore/src/velocity/WidgetSnippet.vm
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
/trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
/trunk/ContentStore/src/velocity/slideguide_for_comparison.vm