Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
12010 4207 d 20 h amit.gupta /trunk/Website/src/main/java/in/shop2020/serving/controllers/  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
12009 4207 d 20 h amit.gupta /trunk/Website/src/main/java/in/shop2020/serving/controllers/  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
12001 4207 d 21 h amit.gupta /trunk/Website/src/main/java/in/shop2020/serving/controllers/  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
12000 4207 d 22 h amit.gupta /trunk/Website/src/main/java/in/shop2020/serving/controllers/  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
11925 4214 d 6 h amit.gupta /trunk/Website/src/main/ Fixed private deals  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/main/resources/templates/footer.vm
/trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/private-deals-show.vm
11918 4214 d 7 h amit.gupta /trunk/Website/src/main/ Added custom variable if user iprivate deal user.  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/resources/templates/footer.vm
11826 4218 d 19 h amit.gupta /trunk/Website/src/main/ Private Deal user can see the deal now  
/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/header.vm
11114 4265 d 20 h amit.gupta /trunk/Website/src/main/java/in/shop2020/serving/controllers/  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
10232 4325 d 7 h kshitij.sood /trunk/Website/src/main/ Separating caching of banners.  
/trunk/Website/src/main/java/in/shop2020/serving/cache/EhcacheWrapper.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Website/src/main/resources/ehcache.xml
10208 4326 d 6 h amit.gupta /trunk/Website/src/main/java/in/shop2020/serving/controllers/ Added logging  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
9155 4413 d 2 h kshitij.sood /trunk/ Added bannetr type and banners for mobile site (addition and retrieval logic)  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BannerType.java
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Banner.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BannerCongregate.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/main/webapp/WEB-INF/content/SideBanner-Edit.vm
/trunk/Website/src/main/webapp/WEB-INF/content/SideBanner-New.vm
/trunk/Website/src/main/webapp/WEB-INF/content/campaign-editNew.vm
/trunk/Website/src/main/webapp/WEB-INF/content/campaignEdit.vm
/trunk/Website/src/main/webapp/WEB-INF/content/user-image-edit.vm
/trunk/Website/src/main/webapp/WEB-INF/content/user-image-editNew.vm
/trunk/Website/src/main/webapp/WEB-INF/content/user-image-index.vm
8917 4432 d 4 h kshitij.sood /trunk/Website/src/ Changes in controllers and vm's for banner implementation.  
/trunk/Website/src/main/webapp/WEB-INF/content/SideBanner-Edit.vm
/trunk/Website/src/main/webapp/WEB-INF/content/SideBanner-New.vm
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/main/resources/templates/cartwidget.vm
/trunk/Website/src/main/resources/templates/commoncssfiles.vm
/trunk/Website/src/main/resources/templates/commonjsfiles.vm
/trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/campaign-editNew.vm
/trunk/Website/src/main/webapp/WEB-INF/content/campaignEdit.vm
/trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-faq.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/user-image-edit.vm
/trunk/Website/src/main/webapp/WEB-INF/content/user-image-editNew.vm
/trunk/Website/src/main/webapp/WEB-INF/content/user-image-index.vm
/trunk/Website/src/main/webapp/js/common.js
/trunk/Website/src/production/resources/templates/commoncssfiles.vm
/trunk/Website/src/production/resources/templates/commonjsfiles.vm
8578 4466 d 2 h kshitij.sood /trunk/Website/src/main/ Uri based banners implementation.  
/trunk/Website/src/main/webapp/WEB-INF/content/campaign-editNew.vm
/trunk/Website/src/main/webapp/WEB-INF/content/campaignEdit.vm
/trunk/Website/src/main/webapp/images/active.ico
/trunk/Website/src/main/webapp/images/inactive.ico
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/ScpService.java
/trunk/Website/src/main/webapp/WEB-INF/content/index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/user-image-edit.vm
/trunk/Website/src/main/webapp/WEB-INF/content/user-image-editNew.vm
/trunk/Website/src/main/webapp/WEB-INF/content/user-image-index.vm
6903 4705 d 17 h anupam.singh /trunk/ Insurance feature for our website  
/trunk/Website/src/main/resources/templates/thinheader.vm
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-result.vm
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
/trunk/Website/src/main/webapp/images/insurance.png
/trunk/Website/src/main/webapp/images/insuredStamp.png
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/order/test/Test.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
/trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_discount_to_specific_users.py
/trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_gift_voucher_to_specific_users.py
/trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py
/trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_emi_discount_on_specific_items.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Insurer.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Line.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
/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/EbsPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.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/resources/templates/shippingdetails.vm
/trunk/Website/src/main/webapp/WEB-INF/content/cart-index.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/my-purchases-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm
/trunk/Website/src/main/webapp/css/cartflow.css
/trunk/Website/src/main/webapp/css/myaccount.css
/trunk/Website/src/main/webapp/css/shipping.css
/trunk/Website/src/main/webapp/js/cart-details.js
/trunk/Website/src/main/webapp/js/recharge.js
6848 4714 d 5 h kshitij.sood /trunk/ Sliding Banner and its user interface implementation.  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/ScpService.java
/trunk/Website/src/main/webapp/WEB-INF/content/user-image-edit.vm
/trunk/Website/src/main/webapp/WEB-INF/content/user-image-editNew.vm
/trunk/Website/src/main/webapp/WEB-INF/content/user-image-index.vm
/trunk/Website/src/main/webapp/css/imgareaselect-default.css
/trunk/Website/src/main/webapp/css/jquery.slidy.css
/trunk/Website/src/main/webapp/images/add.png
/trunk/Website/src/main/webapp/images/background.gif
/trunk/Website/src/main/webapp/images/greendot.gif
/trunk/Website/src/main/webapp/images/red_dot.gif
/trunk/Website/src/main/webapp/images/reddot.gif
/trunk/Website/src/main/webapp/js/jquery.imgareaselect.pack.js
/trunk/Website/src/main/webapp/js/jquery.js
/trunk/Website/src/main/webapp/js/jquery.slidy.js
/trunk/Website/src/main/webapp/js/jquery.slidy.min.js
/trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/Website/pom.xml
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Website/src/main/webapp/WEB-INF/content/index.vm
/trunk/Website/src/main/webapp/css/common.css
6708 4746 d 5 h kshitij.sood /trunk/Website/src/main/ Otg widget (for all pages where cartwidget is shown except for homepage)  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Website/src/main/resources/templates/cartwidget.vm
6152 4846 d 0 h amit.gupta /trunk/Website/src/main/ improved cart related changes.  
/trunk/Website/src/main/webapp/images/Cart-Button.png
/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/HomeController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.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/resources/templates/cartwidget.vm
/trunk/Website/src/main/resources/templates/header.vm
/trunk/Website/src/main/webapp/css/header-footer.css
/trunk/Website/src/main/webapp/css/myaccount.css
/trunk/Website/src/main/webapp/css/widgets.css
4453 5091 d 22 h varun.gupta /trunk/Website/src/main/ Trac #852 and #869 - Full name field removed from Registration procedure. A/B test variants added for Login/Register popup vs redirect added.  
/trunk/Website/src/main/filters/staging/filters.properties
/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/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/ProceedToPayController.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/resources/templates/shippingdetails.vm
/trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm
/trunk/Website/src/main/webapp/js/cart-details.js
/trunk/Website/src/main/webapp/js/loginregister.js
4083 5175 d 0 h vikas /trunk/Website/src/main/java/in/shop2020/serving/controllers/ Fixing a bug. cookie was not actually decrypted even when isEncrypted boolean was set.  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
3903 5197 d 0 h varun.gupta /trunk/Website/src/main/ Modified the appearance of badge on Best Deals link in header menu  
/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/HomeController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.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/resources/templates/header.vm
/trunk/Website/src/main/resources/templates/shippingdetails.vm
/trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/css/header-footer.css

←Prev12Next→

Show All