Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
5552 5048 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
4931 5139 d 17 h varun.gupta /trunk/Website/src/main/resources/templates/ Ticket #1086 - added <span> for showing count of selected items in Compare List widget  
/trunk/Website/src/main/resources/templates/myresearch.vm
3830 5311 d 12 h chandranshu /trunk/Website/ Merged the Website1 code back into the website  
/trunk/Website/src/main/resources/templates/cartwidget.vm
/trunk/Website/src/main/webapp/WEB-INF/content/careers.vm
/trunk/Website/src/main/webapp/css/cartflow.css
/trunk/Website/src/main/webapp/css/entity.css
/trunk/Website/src/main/webapp/css/header-footer.css
/trunk/Website/src/main/webapp/css/home.css
/trunk/Website/src/main/webapp/css/widgets.css
/trunk/Website/src/main/webapp/images/Arrow_OrangeButton_AllScreens.png
/trunk/Website/src/main/webapp/images/BG_NavBar.png
/trunk/Website/src/main/webapp/images/ButtonAddtoCart_ALLSTATES.png
/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_MakePayment_ALLSTATES-copy.png
/trunk/Website/src/main/webapp/images/Button_ProceedToPayment_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_DEF.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/FooterBG.png
/trunk/Website/src/main/webapp/images/FooterFootBG.png
/trunk/Website/src/main/webapp/images/IconAddtoCompare_ProdArea.png
/trunk/Website/src/main/webapp/images/IconBestDeals_NavBar.png
/trunk/Website/src/main/webapp/images/IconCompareWith_ProdArea.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_UnselectedTab.png
/trunk/Website/src/main/webapp/images/IconDownArrow_WhiteButton.png
/trunk/Website/src/main/webapp/images/IconEmptyCart_CartSummary.png
/trunk/Website/src/main/webapp/images/IconFreeDelivery_TopBar.png
/trunk/Website/src/main/webapp/images/IconOfferPack_ProdList.png
/trunk/Website/src/main/webapp/images/IconOfferPack_ProdPage.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_DeliveryTime.png
/trunk/Website/src/main/webapp/images/Icon_ShareOnFacebook.png
/trunk/Website/src/main/webapp/images/Icons_CreditCardsPayment.png
/trunk/Website/src/main/webapp/images/Icons_Security.png
/trunk/Website/src/main/webapp/images/LeftTab_Selected.png
/trunk/Website/src/main/webapp/images/LeftTab_Unselected.png
/trunk/Website/src/main/webapp/images/ListIcon_Cart_Default.png
/trunk/Website/src/main/webapp/images/ListIcon_Cart_Mouseover.png
/trunk/Website/src/main/webapp/images/MidTab_Selected.png
/trunk/Website/src/main/webapp/images/MidTab_Unselected.png
/trunk/Website/src/main/webapp/images/RadioButton_Selected.png
/trunk/Website/src/main/webapp/images/RadioButton_Unselected.png
/trunk/Website/src/main/webapp/images/RightTab_Selected.png
/trunk/Website/src/main/webapp/images/RightTab_Unselected.png
/trunk/Website/src/main/webapp/images/VerticalSeparator_NavBar.png
/trunk/Website/src/main/webapp/images/button-glass-bg.png
/trunk/Website/src/main/webapp/images/number_Unselected.png
/trunk/Website/src/main/webapp/images/number_selected.png
/trunk/Website/src/main/webapp/images/saholic-logo.jpg
/trunk/Website/src/main/webapp/images/sprite.png
/trunk/Website/src/main/webapp/js/common.js
/trunk/Website/src/main/resources/templates/searchbar.vm
/trunk/Website/pom.xml
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
/trunk/Website/src/main/java/in/shop2020/serving/utils/FormattingUtils.java
/trunk/Website/src/main/resources/templates/accessories.vm
/trunk/Website/src/main/resources/templates/browsehistory.vm
/trunk/Website/src/main/resources/templates/commoncssfiles.vm
/trunk/Website/src/main/resources/templates/commonjsfiles.vm
/trunk/Website/src/main/resources/templates/footer.vm
/trunk/Website/src/main/resources/templates/header.vm
/trunk/Website/src/main/resources/templates/mainbanner.vm
/trunk/Website/src/main/resources/templates/mostcompared.vm
/trunk/Website/src/main/resources/templates/myresearch.vm
/trunk/Website/src/main/resources/templates/orderdetails.vm
/trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
/trunk/Website/src/main/resources/templates/shippingdetails.vm
/trunk/Website/src/main/webapp/WEB-INF/content/aboutus.vm
/trunk/Website/src/main/webapp/WEB-INF/content/address-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/best-sellers-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/browse-history-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/estimate-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/exception.vm
/trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-success.vm
/trunk/Website/src/main/webapp/WEB-INF/content/glossary-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/most-compared-products-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/myresearch-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/order-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/pay-error-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/privacy-policy.vm
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/related-accessories-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/terms-conditions.vm
/trunk/Website/src/main/webapp/WEB-INF/content/updates-psuccess.vm
/trunk/Website/src/main/webapp/css/cart.css
/trunk/Website/src/main/webapp/css/common.css
/trunk/Website/src/main/webapp/css/comparision.css
/trunk/Website/src/main/webapp/css/contactus.css
/trunk/Website/src/main/webapp/css/myaccount.css
/trunk/Website/src/main/webapp/css/proceed-to-pay.css
/trunk/Website/src/main/webapp/css/product.css
/trunk/Website/src/main/webapp/css/style.css
/trunk/Website/src/main/webapp/css/widget.css
/trunk/Website/src/main/webapp/js/all.js
/trunk/Website/src/main/webapp/js/cart-details.js
/trunk/Website/src/main/webapp/js/custom-jquery.js
/trunk/Website/src/main/webapp/js/entity.js
/trunk/Website/src/main/webapp/js/loginregister.js
/trunk/Website/src/main/webapp/js/my-notes.js
/trunk/Website/src/main/webapp/js/productCategory.js
3059 5366 d 12 h vikas /trunk/Website/src/main/resources/templates/ will not be set at this stage.  
/trunk/Website/src/main/resources/templates/myresearch.vm
1956 5458 d 13 h vikas /trunk/Website/src/main/resources/templates/ Remove border from loading img.  
/trunk/Website/src/main/resources/templates/myresearch.vm
1934 5460 d 18 h vikas /trunk/Website/src/main/ Show loding image in my research and browse history widgets while it loads the items.  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/main/resources/templates/browsehistory.vm
/trunk/Website/src/main/resources/templates/myresearch.vm
/trunk/Website/src/main/webapp/WEB-INF/content/address-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/best-sellers-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/brand-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/contact-us-success.vm
/trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/exception.vm
/trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-success.vm
/trunk/Website/src/main/webapp/WEB-INF/content/index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/order-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
1778 5475 d 18 h rajveer /trunk/Website/src/main/ Added basic comparison feature  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
/trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm
/trunk/Website/src/main/webapp/css/comparision.css
/trunk/Website/src/main/webapp/css/scroller.css
/trunk/Website/src/main/webapp/images/blackbullet.jpg
/trunk/Website/src/main/webapp/images/column-right-border.jpg
/trunk/Website/src/main/webapp/images/comp-header-bg.png
/trunk/Website/src/main/webapp/images/scroll-450.png
/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-568.png
/trunk/Website/src/main/webapp/images/scroll-577.png
/trunk/Website/src/main/webapp/images/scroll.png
/trunk/Website/src/main/webapp/images/scroller-bg.jpg
/trunk/Website/src/main/webapp/images/scroller-left.png
/trunk/Website/src/main/webapp/images/scroller-mid.png
/trunk/Website/src/main/webapp/images/scroller-right.png
/trunk/Website/src/main/webapp/js/jquery.jscrollpane.js
/trunk/Website/src/main/resources/templates/commoncssfiles.vm
/trunk/Website/src/main/resources/templates/footer.vm
/trunk/Website/src/main/resources/templates/myresearch.vm
/trunk/Website/src/main/webapp/WEB-INF/content/myresearch-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/test-index.vm
/trunk/Website/src/main/webapp/js/custom-jquery.js
1618 5485 d 14 h rajveer /trunk/Website/src/ modified test cases  
/trunk/Website/src/main/resources/templates/myresearch.vm
/trunk/Website/src/test/samples/accessories-category-page/test1.html
/trunk/Website/src/test/samples/accessories-category-page/test31.javascript
/trunk/Website/src/test/samples/accessories-category-page/test37.javascript
/trunk/Website/src/test/samples/accessories-category-page/test63.html
/trunk/Website/src/test/samples/accessories-category-page/test75.html
/trunk/Website/src/test/samples/accessories-category-page/test76.html
/trunk/Website/src/test/samples/accessories-category-page/test77.html
/trunk/Website/src/test/samples/accessories-category-page/test78.html
/trunk/Website/src/test/samples/accessories-category-page/test79.html
/trunk/Website/src/test/samples/accessories-category-page/test81.html
/trunk/Website/src/test/samples/categorypage/test50.html
/trunk/Website/src/test/samples/forgotpass/test49.html
/trunk/Website/src/test/samples/register/test49.html
/trunk/Website/src/test/samples/register/test64.html
/trunk/Website/src/test/samples/register/test68.html
1614 5485 d 15 h rajveer /trunk/Website/src/main/ Anonymous user will not be created until a user add to cart or add to research. User will be able to add to research wothout logging in.  
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/CreateUserInterceptor.java
/trunk/Website/src/main/webapp/WEB-INF/content/browse-history-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/browse-history-success.vm
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BrowseHistoryController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/main/resources/struts.xml
/trunk/Website/src/main/resources/templates/mainmenu.vm
/trunk/Website/src/main/resources/templates/myresearch.vm
/trunk/Website/src/main/webapp/js/all.js
/trunk/Website/src/main/webapp/js/custom-jquery.js
/trunk/Website/src/main/webapp/js/entity.js
1372 5502 d 16 h vikas /trunk/Website/ Store myresearch and browsehistory widgets in browser.  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BrowseHistoryController.java
/trunk/Website/src/main/webapp/WEB-INF/content/browse-history-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/myresearch-index.vm
/trunk/Website/src/main/webapp/js/jquery.Storage.js
/trunk/Website/src/main/webapp/js/jquery.cookie.js
/trunk/Website/build.xml
/trunk/Website/pom.xml
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
/trunk/Website/src/main/resources/templates/browsehistory.vm
/trunk/Website/src/main/resources/templates/commonjsfiles.vm
/trunk/Website/src/main/resources/templates/myresearch.vm
/trunk/Website/src/main/webapp/WEB-INF/content/address-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/best-sellers-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/contact-us-success.vm
/trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/exception.vm
/trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-success.vm
/trunk/Website/src/main/webapp/WEB-INF/content/index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/order-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
/trunk/Website/src/main/webapp/js/all.js
/trunk/Website/src/main/webapp/js/charLimit.js
/trunk/Website/src/main/webapp/js/custom-jquery.js
1038 5528 d 14 h chandranshu /trunk/Website/ Moved conf files to src/main/resources  
/trunk/Website/src/main/resources
/trunk/Website/src/main/resources/log4j.properties
/trunk/Website/src/main/resources/struts.properties
/trunk/Website/src/main/resources/struts.xml
/trunk/Website/src/main/resources/templates
/trunk/Website/src/main/resources/velocity.properties
/trunk/Website/conf/log4j.properties
/trunk/Website/conf/struts.properties
/trunk/Website/conf/struts.xml
/trunk/Website/conf/templates
/trunk/Website/conf/velocity.properties
1025 5528 d 18 h varun.gupta /trunk/Website/conf/templates/ Added message for empty research box for signed-in user and some formatting.  
/trunk/Website/conf/templates/myresearch.vm
850 5550 d 17 h rajveer /trunk/Website/conf/templates/ link to login page  
/trunk/Website/conf/templates/myresearch.vm
810 5555 d 20 h rajveer /trunk/Website/conf/templates/ my research updates  
/trunk/Website/conf/templates/myresearch.vm
794 5557 d 17 h rajveer /trunk/Website/ ebizon css and js changes  
/trunk/Website/WebContent/images/button-bg.jpg
/trunk/Website/WebContent/js/cart-details.js
/trunk/Website/WebContent/js/custom-jquery.js
/trunk/Website/WebContent/WEB-INF/content/best-deals-show.vm
/trunk/Website/WebContent/WEB-INF/content/best-sellers-show.vm
/trunk/Website/WebContent/WEB-INF/content/category-show.vm
/trunk/Website/WebContent/WEB-INF/content/index.vm
/trunk/Website/WebContent/WEB-INF/content/latest-arrivals-index.vm
/trunk/Website/WebContent/WEB-INF/content/latest-arrivals-show.vm
/trunk/Website/WebContent/WEB-INF/content/login-details-index.vm
/trunk/Website/WebContent/WEB-INF/content/login-index.vm
/trunk/Website/WebContent/WEB-INF/content/personal-details-index.vm
/trunk/Website/WebContent/WEB-INF/content/register-index.vm
/trunk/Website/WebContent/WEB-INF/content/search-index.vm
/trunk/Website/WebContent/WEB-INF/content/shipping-index.vm
/trunk/Website/WebContent/WEB-INF/content/test-index.vm
/trunk/Website/WebContent/css/cart.css
/trunk/Website/WebContent/css/common.css
/trunk/Website/WebContent/css/demoStyles.css
/trunk/Website/WebContent/css/gc_safari.css
/trunk/Website/WebContent/css/ie7.css
/trunk/Website/WebContent/css/ie8.css
/trunk/Website/WebContent/css/jquery-ui-1.8.6.custom.css
/trunk/Website/WebContent/css/lightbox_inline.css
/trunk/Website/WebContent/css/myaccount.css
/trunk/Website/WebContent/css/nav.css
/trunk/Website/WebContent/css/product.css
/trunk/Website/WebContent/css/style.css
/trunk/Website/WebContent/css/widget.css
/trunk/Website/conf/templates/bestdeals.vm
/trunk/Website/conf/templates/bestsellers.vm
/trunk/Website/conf/templates/cartdetails.vm
/trunk/Website/conf/templates/commonjsfiles.vm
/trunk/Website/conf/templates/completedorders.vm
/trunk/Website/conf/templates/header.vm
/trunk/Website/conf/templates/latestarrivals.vm
/trunk/Website/conf/templates/logindetails.vm
/trunk/Website/conf/templates/mainmenu.vm
/trunk/Website/conf/templates/myaccount.vm
/trunk/Website/conf/templates/myresearch.vm
/trunk/Website/conf/templates/personaldetails.vm
/trunk/Website/conf/templates/pricediv.vm
/trunk/Website/conf/templates/productsummary.vm
/trunk/Website/conf/templates/searchbar.vm
/trunk/Website/conf/templates/shippingaddressdetails.vm
/trunk/Website/conf/templates/shippingdetails.vm
620 5586 d 12 h rajveer /trunk/Website/ My account changes.  
/trunk/Website/WebContent/WEB-INF/content/address-index.vm
/trunk/Website/WebContent/WEB-INF/content/category-show.vm
/trunk/Website/WebContent/WEB-INF/content/completedorders-index.vm
/trunk/Website/WebContent/WEB-INF/content/login-details-index.vm
/trunk/Website/WebContent/WEB-INF/content/myaccount-index.vm
/trunk/Website/WebContent/WEB-INF/content/personal-details-index.vm
/trunk/Website/WebContent/WEB-INF/content/search-index.vm
/trunk/Website/WebContent/js/myaccount.js
/trunk/Website/conf/templates/commoncssfiles.vm
/trunk/Website/conf/templates/myaccountheader.vm
/trunk/Website/conf/templates/myresearch.vm
/trunk/Website/conf/templates/recommendations.vm
/trunk/Website/conf/templates/registrationform.vm
/trunk/Website/src/in/shop2020/serving/controllers/AddressController.java
/trunk/Website/src/in/shop2020/serving/controllers/CategoryController.java
/trunk/Website/src/in/shop2020/serving/controllers/CompletedordersController.java
/trunk/Website/src/in/shop2020/serving/controllers/EntityController.java
/trunk/Website/src/in/shop2020/serving/controllers/MyaccountController.java
/trunk/Website/src/in/shop2020/serving/controllers/PersonalDetailsController.java
/trunk/Website/src/in/shop2020/serving/controllers/SearchController.java
/trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
550 5599 d 20 h rajveer /trunk/Website/ UI changes for beta release. Search changes to handle category and subcategory as facets.  
/trunk/Website/WebContent/WEB-INF/content/best-deals-show.vm
/trunk/Website/WebContent/css/style.css
/trunk/Website/conf/templates/header.vm
/trunk/Website/conf/templates/locator.vm
/trunk/Website/conf/templates/mainmenu.vm
/trunk/Website/conf/templates/myresearch.vm
/trunk/Website/conf/templates/registrationform.vm
/trunk/Website/conf/templates/searchbar.vm
/trunk/Website/conf/templates/socialutils.vm
/trunk/Website/src/in/shop2020/serving/controllers/RegisterController.java
/trunk/Website/src/in/shop2020/serving/controllers/SearchController.java
/trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/in/shop2020/serving/services/SolrSearchService.java
535 5609 d 8 h rajveer /trunk/Website/conf/templates/ Website changes.  
/trunk/Website/conf/templates/cartdetails.vm
/trunk/Website/conf/templates/header.vm
/trunk/Website/conf/templates/myaccount.vm
/trunk/Website/conf/templates/myresearch.vm
/trunk/Website/conf/templates/orderdetails.vm
/trunk/Website/conf/templates/shippingdetails.vm
517 5615 d 20 h rajveer /trunk/Website/ Lot of website changes.  
/trunk/Website/WebContent/WEB-INF/content/aramax-updates-show.vm
/trunk/Website/WebContent/WEB-INF/content/login-details-index.vm
/trunk/Website/WebContent/WEB-INF/content/login-details-success.vm
/trunk/Website/WebContent/WEB-INF/content/order-success.vm
/trunk/Website/WebContent/WEB-INF/content/pay-response-show.vm
/trunk/Website/WebContent/WEB-INF/content/personal-details-index.vm
/trunk/Website/WebContent/WEB-INF/content/personal-details-success.vm
/trunk/Website/WebContent/WEB-INF/content/search-index_old.vm
/trunk/Website/conf/templates/entity_snippet_fro_categorypage.vm
/trunk/Website/src/in/shop2020/serving/controllers/AramaxUpdatesController.java
/trunk/Website/src/in/shop2020/serving/controllers/LoginDetailsController.java
/trunk/Website/src/in/shop2020/serving/controllers/PayErrorController.java
/trunk/Website/src/in/shop2020/serving/controllers/PayResponseController.java
/trunk/Website/src/in/shop2020/serving/controllers/PersonalDetailsController.java
/trunk/Website/WebContent/WEB-INF/content/logindetails-index.vm
/trunk/Website/WebContent/WEB-INF/content/logindetails-success.vm
/trunk/Website/WebContent/WEB-INF/content/personaldetails-index.vm
/trunk/Website/WebContent/WEB-INF/content/personaldetails-success.vm
/trunk/Website/src/in/shop2020/serving/controllers/LogindetailsController.java
/trunk/Website/src/in/shop2020/serving/controllers/PayerrorController.java
/trunk/Website/src/in/shop2020/serving/controllers/PayresponseController.java
/trunk/Website/src/in/shop2020/serving/controllers/PersonaldetailsController.java
/trunk/Website/WebContent/WEB-INF/content/category-show.vm
/trunk/Website/WebContent/WEB-INF/content/entity-show.vm
/trunk/Website/WebContent/WEB-INF/content/home-index.vm
/trunk/Website/WebContent/WEB-INF/content/order-show.vm
/trunk/Website/WebContent/WEB-INF/content/register-index.vm
/trunk/Website/WebContent/WEB-INF/content/search-index.vm
/trunk/Website/WebContent/WEB-INF/content/shipping-success.vm
/trunk/Website/WebContent/WEB-INF/content/test-index.vm
/trunk/Website/conf/templates/accessories.vm
/trunk/Website/conf/templates/browsehistory.vm
/trunk/Website/conf/templates/cartdetails.vm
/trunk/Website/conf/templates/completedorders.vm
/trunk/Website/conf/templates/header.vm
/trunk/Website/conf/templates/latestarrivals.vm
/trunk/Website/conf/templates/logindetails.vm
/trunk/Website/conf/templates/mainbanner.vm
/trunk/Website/conf/templates/mainmenu.vm
/trunk/Website/conf/templates/myaccount.vm
/trunk/Website/conf/templates/myresearch.vm
/trunk/Website/conf/templates/orderdetails.vm
/trunk/Website/conf/templates/personaldetails.vm
/trunk/Website/conf/templates/productsummary.vm
/trunk/Website/conf/templates/recommendations.vm
/trunk/Website/conf/templates/registrationform.vm
/trunk/Website/conf/templates/searchbar.vm
/trunk/Website/conf/templates/shippingaddressdetails.vm
/trunk/Website/conf/templates/shippingdetails.vm
/trunk/Website/conf/templates/similaritems.vm
/trunk/Website/src/in/shop2020/serving/controllers/AddressController.java
/trunk/Website/src/in/shop2020/serving/controllers/AuthController.java
/trunk/Website/src/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/in/shop2020/serving/controllers/CategoryController.java
/trunk/Website/src/in/shop2020/serving/controllers/CompletedordersController.java
/trunk/Website/src/in/shop2020/serving/controllers/MyaccountController.java
/trunk/Website/src/in/shop2020/serving/controllers/OrderController.java
/trunk/Website/src/in/shop2020/serving/controllers/PayController.java
/trunk/Website/src/in/shop2020/serving/controllers/SearchController.java
/trunk/Website/src/in/shop2020/serving/controllers/ShippingController.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/MyResearchPageFetcher.java
/trunk/Website/src/in/shop2020/serving/services/AramaxTrackingService.java
/trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/in/shop2020/serving/services/SolrSearchService.java
/trunk/Website/src/in/shop2020/serving/utils/Utils.java
507 5629 d 19 h rajveer /trunk/Website/ Velocity files for html generation in backend and page rendering with controllers.
Controllers to handle page requests.
Other supporting utilities.		  
/trunk/Website/WebContent/WEB-INF/content/address-index.vm
/trunk/Website/WebContent/WEB-INF/content/cart-delfailure.vm
/trunk/Website/WebContent/WEB-INF/content/cart-delsuccess.vm
/trunk/Website/WebContent/WEB-INF/content/completedorders-index.vm
/trunk/Website/WebContent/WEB-INF/content/home-index.vm
/trunk/Website/WebContent/WEB-INF/content/logindetails-index.vm
/trunk/Website/WebContent/WEB-INF/content/logindetails-success.vm
/trunk/Website/WebContent/WEB-INF/content/order-show.vm
/trunk/Website/WebContent/WEB-INF/content/personaldetails-index.vm
/trunk/Website/WebContent/WEB-INF/content/personaldetails-success.vm
/trunk/Website/WebContent/WEB-INF/content/register-index.vm
/trunk/Website/WebContent/WEB-INF/content/register-success.vm
/trunk/Website/WebContent/WEB-INF/content/shipment-show.vm
/trunk/Website/WebContent/WEB-INF/content/shipping-failure.vm
/trunk/Website/WebContent/WEB-INF/content/shipping-index.vm
/trunk/Website/WebContent/WEB-INF/content/shipping-success.vm
/trunk/Website/WebContent/WEB-INF/content/updates-lsuccess.vm
/trunk/Website/WebContent/WEB-INF/content/updates-psuccess.vm
/trunk/Website/conf/templates/accessories.vm
/trunk/Website/conf/templates/bestdeals.vm
/trunk/Website/conf/templates/bestsellers.vm
/trunk/Website/conf/templates/browsehistory.vm
/trunk/Website/conf/templates/cartdetails.vm
/trunk/Website/conf/templates/cartheader.vm
/trunk/Website/conf/templates/completedorders.vm
/trunk/Website/conf/templates/customerservice.vm
/trunk/Website/conf/templates/latestarrivals.vm
/trunk/Website/conf/templates/locator.vm
/trunk/Website/conf/templates/logindetails.vm
/trunk/Website/conf/templates/mainbanner.vm
/trunk/Website/conf/templates/mainmenu.vm
/trunk/Website/conf/templates/myaccount.vm
/trunk/Website/conf/templates/myaccountheader.vm
/trunk/Website/conf/templates/myorders.vm
/trunk/Website/conf/templates/myresearch.vm
/trunk/Website/conf/templates/orderdetails.vm
/trunk/Website/conf/templates/personaldetails.vm
/trunk/Website/conf/templates/pricediv.vm
/trunk/Website/conf/templates/productsummary.vm
/trunk/Website/conf/templates/recommendations.vm
/trunk/Website/conf/templates/registrationform.vm
/trunk/Website/conf/templates/registrationheader.vm
/trunk/Website/conf/templates/reviews.vm
/trunk/Website/conf/templates/searchbar.vm
/trunk/Website/conf/templates/shippingaddressdetails.vm
/trunk/Website/conf/templates/shippingdetails.vm
/trunk/Website/conf/templates/shippingheader.vm
/trunk/Website/conf/templates/shoppingcart.vm
/trunk/Website/conf/templates/similaritems.vm
/trunk/Website/conf/templates/slideguide-17Sep.vm
/trunk/Website/conf/templates/slideguide.vm
/trunk/Website/conf/templates/slideguide_backup.vm
/trunk/Website/conf/templates/socialutils.vm
/trunk/Website/conf/templates/velocity.properties
/trunk/Website/conf/templates/widgetdiv.vm
/trunk/Website/src/in/shop2020/serving/controllers/AddressController.java
/trunk/Website/src/in/shop2020/serving/controllers/CompletedordersController.java
/trunk/Website/src/in/shop2020/serving/controllers/HomeController.java
/trunk/Website/src/in/shop2020/serving/controllers/InventoryUpdate.java
/trunk/Website/src/in/shop2020/serving/controllers/LogindetailsController.java
/trunk/Website/src/in/shop2020/serving/controllers/PersonaldetailsController.java
/trunk/Website/src/in/shop2020/serving/controllers/RegisterController.java
/trunk/Website/src/in/shop2020/serving/controllers/ShipmentController.java
/trunk/Website/src/in/shop2020/serving/controllers/ShippingController.java
/trunk/Website/src/in/shop2020/serving/controllers/Update.java
/trunk/Website/src/in/shop2020/serving/controllers/UpdatesController.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/CompletedOrdersPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/HomePageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/LoginDetailsPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/OrderDetailsPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/PersonalDetailsPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/RegisterPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/ShippingAddressPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/ShippingPageFetcher.java
/trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/in/shop2020/serving/utils/FileUtils.java
/trunk/Website/WebContent/WEB-INF/content/cart-index.vm
/trunk/Website/WebContent/WEB-INF/content/entity-show.vm
/trunk/Website/WebContent/WEB-INF/content/myaccount-index.vm
/trunk/Website/WebContent/WEB-INF/content/order-index.vm
/trunk/Website/WebContent/WEB-INF/content/test-index.vm
/trunk/Website/WebContent/js/gallery.js
/trunk/Website/conf/templates/footer.vm
/trunk/Website/conf/templates/header.vm
/trunk/Website/src/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/in/shop2020/serving/controllers/EstimateController.java
/trunk/Website/src/in/shop2020/serving/controllers/MyaccountController.java
/trunk/Website/src/in/shop2020/serving/controllers/OrderController.java
/trunk/Website/src/in/shop2020/serving/controllers/PayresponseController.java
/trunk/Website/src/in/shop2020/serving/controllers/TestController.java
/trunk/Website/src/in/shop2020/serving/pages/PageContentKeys.java
/trunk/Website/src/in/shop2020/serving/pages/PageEnum.java
/trunk/Website/src/in/shop2020/serving/pages/PageFetcherFactory.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/MyAccountPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/ProductPageFetcher.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/ShoppingCartPageFetcher.java
/trunk/Website/src/in/shop2020/serving/services/UserSessionInfo.java
/trunk/Website/src/in/shop2020/serving/utils/Utils.java