Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
20224 3461 d 17 h aman.kumar /trunk/Website/src/main/java/in/shop2020/serving/controllers/ update  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
20222 3461 d 17 h aman.kumar /trunk/Website/src/main/ code update  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/js/loginregister.js
20202 3462 d 0 h aman.kumar /trunk/Website/src/main/ facebook login code update  
/trunk/Website/src/main/resources/templates/login-response.vm
/trunk/Website/src/main/resources/templates/register-response.vm
/trunk/Website/src/main/webapp/images/facebookconnect.png
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
/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/webapp/js/facebook.js
20184 3466 d 16 h aman.kumar /trunk/Website/src/main/java/in/shop2020/serving/controllers/ fblogin update  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
20180 3466 d 17 h aman.kumar /trunk/Website/src/main/ Login facebook test  
/trunk/Website/src/main/java/in/shop2020/serving/utils/FacebookUtility.java
/trunk/Website/src/main/webapp/WEB-INF/content/login-response.vm
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
/trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
/trunk/Website/src/main/webapp/js/facebook.js
20178 3467 d 16 h aman.kumar /trunk/Website/src/main/java/in/shop2020/serving/controllers/ LoginFacebook  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
20177 3467 d 17 h aman.kumar /trunk/Website/src/main/java/in/shop2020/serving/controllers/ logs  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
20176 3467 d 17 h aman.kumar /trunk/Website/src/main/java/in/shop2020/serving/controllers/ logs checked in  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
12788 4129 d 13 h amit.gupta /trunk/ Added Website  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/OrderController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PayuPayResponseController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
12616 4144 d 23 h anikendra /trunk/Website/src/main/java/in/shop2020/serving/ disabling data logging for now  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/AddressController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.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/InnovitiPayResponseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PayErrorController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PayuPayResponseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PromotionController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
11918 4214 d 0 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
11808 4220 d 19 h amit.gupta /trunk/Website/src/main/java/in/shop2020/serving/ Added PrivateDeal User to userinfo  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PrivateDealsController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
11747 4224 d 18 h amit.gupta /trunk/Website/src/ JS load optimization  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/resources/templates/commonjsfiles.vm
/trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
/trunk/Website/src/main/webapp/js/common.js
/trunk/Website/src/production/resources/templates/commonjsfiles.vm
11688 4230 d 18 h amit.gupta /trunk/Website/src/main/java/in/shop2020/serving/controllers/  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
7825 4557 d 19 h amar.kumar /trunk/ Changes for Facebook Login  
/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/impl/UserDataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
/trunk/Website/pom.xml
/trunk/Website/src/main/filters/dev/filters.properties
/trunk/Website/src/main/filters/staging/filters.properties
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/utils/UserMessage.java
/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/css/common.css
/trunk/Website/src/main/webapp/css/signinsignup.css
/trunk/Website/src/main/webapp/js/facebook.js
/trunk/Website/src/main/webapp/js/loginregister.js
7039 4680 d 19 h anupam.singh /trunk/ Removing all changes related to facebook login because i dont like them ;)  
/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/impl/UserDataAccessors.py
/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/user/User.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
/trunk/Website/build.xml
/trunk/Website/pom.xml
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
/trunk/Website/src/main/webapp/WEB-INF/content/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/css/common.css
/trunk/Website/src/main/webapp/js/loginregister.js
7023 4683 d 16 h amar.kumar /trunk/Website/src/main/java/in/shop2020/serving/controllers/ Checking for dummy call to login through facebook  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
7007 4684 d 18 h amar.kumar /trunk/ Changes to allow login through facebook and storing user's facebook credentials to be able to post on user's behalf on facebook  
/trunk/Website/src/main/webapp/channel.html
/trunk/Website/src/main/webapp/images/facebooklogin.png
/trunk/Website/src/main/webapp/js/facebook.js
/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/impl/UserDataAccessors.py
/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/user/User.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
/trunk/Website/src/main/filters/prod/filters.properties
/trunk/Website/src/main/filters/staging/filters.properties
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
/trunk/Website/src/main/webapp/WEB-INF/content/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/css/common.css
/trunk/Website/src/main/webapp/js/loginregister.js
6903 4705 d 10 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
5510 4949 d 20 h rajveer /trunk/Website/src/main/ Added authentication api for spicedeck.com  
/trunk/Website/src/main/webapp/WEB-INF/content/login-result.vm
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java

←Prev12Next→

Show All