SmartDukaan – /

Rev 839 – validations for new address.

vikas — Tue, 22 Feb 2011 17:34:05 +0530

vikas – 8 file(s) modified
validations for new address.

~ /trunk/Website/conf/templates/shippingaddressdetails.vm
~ /trunk/Website/conf/templates/shippingdetails.vm
~ /trunk/Website/src/in/shop2020/serving/controllers/AddressController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/WebContent/css/common.css
~ /trunk/Website/WebContent/js/custom-jquery.js
~ /trunk/Website/WebContent/WEB-INF/content/shipping-index.vm

Rev 838 – Change url "/home" to "/"

vikas — Tue, 22 Feb 2011 14:45:15 +0530

vikas – 1 file(s) modified
Change url "/home" to "/"

~ /trunk/Website/conf/templates/header.vm

Rev 837 – Create permanent cookie and set path to "/".

vikas — Tue, 22 Feb 2011 13:44:52 +0530

vikas – 2 file(s) modified
Create permanent cookie and set path to "/".

~ /trunk/Website/src/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 836 – test thrift server and client

rajveer — Tue, 22 Feb 2011 12:54:35 +0530

rajveer – 2 file(s) modified
test thrift server and client

+ /trunk/Common/src/in/shop2020/thrift/clients/TestClient.java
+ /trunk/Common/src/in/shop2020/thrift/clients/TestOfTestServer.java

Rev 835 – Updated the classpath to use log4j.jar from the thirdparty project ...

chandranshu — Tue, 22 Feb 2011 12:31:55 +0530

chandranshu – 1 file(s) modified
Updated the classpath to use log4j.jar from the thirdparty project rather than from the file system

~ /trunk/Website/.classpath

Rev 834 – css changes by ebizon

rajveer — Tue, 22 Feb 2011 12:30:01 +0530

rajveer – 5 file(s) modified
css changes by ebizon

~ /trunk/Website/WebContent/css/cart.css
~ /trunk/Website/WebContent/css/ie7.css
~ /trunk/Website/WebContent/css/nav.css
~ /trunk/Website/WebContent/css/product.css
~ /trunk/Website/WebContent/css/style.css

Rev 833 – added log4j jar

rajveer — Mon, 21 Feb 2011 19:56:00 +0530

rajveer – 2 file(s) modified
added log4j jar

+ /trunk/thirdparty/readonly/apache/log4j
+ /trunk/thirdparty/readonly/apache/log4j/log4j-1.2.16.jar

Rev 832 – Added log4j logging framework

rajveer — Mon, 21 Feb 2011 19:55:04 +0530

rajveer – 39 file(s) modified
Added log4j logging framework

~ /trunk/Website/.classpath
~ /trunk/Website/build.xml
+ /trunk/Website/conf/log4j.properties
~ /trunk/Website/conf/velocity.properties
~ /trunk/Website/src/in/shop2020/serving/controllers/AddressController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/AramexUpdatesController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/BestDealsController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/BestSellersController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/BluedartUpdatesController.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/EmailAvailabilityController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/EstimateController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/ExceptionController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/ForgotPasswordController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/LatestArrivalsController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/LoginDetailsController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/LogoutController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/MyaccountController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/MyresearchController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/OrderController.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/SearchController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/SendMailController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/StaticController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/TestController.java
~ /trunk/Website/src/in/shop2020/serving/interceptors/LoginInterceptor.java
x /trunk/Website/src/in/shop2020/serving/rest
~ /trunk/Website/src/in/shop2020/serving/services/AramexTrackingService.java
~ /trunk/Website/src/in/shop2020/serving/services/BlueDartTrackingService.java
~ /trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/in/shop2020/serving/services/SolrSearchService.java

Rev 831 – * To show error message in case of wrong username/password. ...

vikas — Mon, 21 Feb 2011 18:48:09 +0530

vikas – 3 file(s) modified
* To show error message in case of wrong username/password.
* Redirect to last page in case of successful login.

~ /trunk/Website/src/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 830 –

vikas — Mon, 21 Feb 2011 17:07:19 +0530

vikas – 3 file(s) modified

~ /trunk/Website/conf/struts.xml
~ /trunk/Website/src/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 829 – added user paymentid in error url

rajveer — Mon, 21 Feb 2011 16:22:47 +0530

rajveer – 1 file(s) modified
added user paymentid in error url

~ /trunk/Website/src/in/shop2020/serving/controllers/HdfcPayController.java

Rev 828 – Cookie problem resolved.

rajveer — Mon, 21 Feb 2011 15:54:15 +0530

rajveer – 3 file(s) modified
Cookie problem resolved.

~ /trunk/Website/conf/struts.xml
~ /trunk/Website/src/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 827 – terms conditions and contact us updates

rajveer — Mon, 21 Feb 2011 15:03:28 +0530

rajveer – 2 file(s) modified
terms conditions and contact us updates

~ /trunk/Website/WebContent/WEB-INF/content/send-mail-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/terms-conditions.vm

Rev 826 – changes by ebizon

rajveer — Mon, 21 Feb 2011 15:01:53 +0530

rajveer – 2 file(s) modified
changes by ebizon

~ /trunk/Website/WebContent/css/cart.css
~ /trunk/Website/WebContent/css/style.css

Rev 825 – changes for customer service and shipping details

rajveer — Mon, 21 Feb 2011 15:01:05 +0530

rajveer – 2 file(s) modified
changes for customer service and shipping details

~ /trunk/Website/conf/templates/customerservice.vm
~ /trunk/Website/conf/templates/shippingdetails.vm

Rev 824 – Fix logout exception.

vikas — Mon, 21 Feb 2011 11:43:48 +0530

vikas – 1 file(s) modified
Fix logout exception.

~ /trunk/Website/src/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 823 – fix home actionName

vikas — Mon, 21 Feb 2011 11:17:37 +0530

vikas – 1 file(s) modified
fix home actionName

~ /trunk/Website/src/in/shop2020/serving/controllers/LogoutController.java

Rev 822 – * Adding login interceptors where only authenticated user should be ...

vikas — Fri, 18 Feb 2011 20:49:04 +0530

vikas – 14 file(s) modified
* Adding login interceptors where only authenticated user should be allowed.
* Adding Address validation.

~ /trunk/Website/conf/struts.xml
~ /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/LoginController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/LoginDetailsController.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/PayErrorController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/in/shop2020/serving/interceptors/UserInterceptor.java
~ /trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/in/shop2020/serving/utils/Utils.java

Rev 821 – Create browse history widget, if not available.

vikas — Fri, 18 Feb 2011 19:56:48 +0530

vikas – 1 file(s) modified
Create browse history widget, if not available.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/WidgetDataAccessor.py

Rev 820 – removed unwanted vm files. redirect to category if empty string ...

rajveer — Fri, 18 Feb 2011 17:41:07 +0530

rajveer – 15 file(s) modified
removed unwanted vm files. redirect to category if empty string is searched in search

x /trunk/Website/conf/templates/entity_snippet_fro_categorypage.vm
x /trunk/Website/conf/templates/myorders.vm
x /trunk/Website/conf/templates/pricediv.vm
x /trunk/Website/conf/templates/productsummary.vm
x /trunk/Website/conf/templates/shoppingcart.vm
x /trunk/Website/conf/templates/slideguide-17Sep.vm
x /trunk/Website/conf/templates/slideguide.vm
x /trunk/Website/conf/templates/slideguide_backup.vm
x /trunk/Website/conf/templates/widgetdiv.vm
~ /trunk/Website/src/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/in/shop2020/serving/services/CategoryManager.java
x /trunk/Website/WebContent/WEB-INF/content/auth-lfail.vm
x /trunk/Website/WebContent/WEB-INF/content/auth-lsuccess.vm
x /trunk/Website/WebContent/WEB-INF/content/pay-success.vm

Rev 819 – /home -> /

vikas — Fri, 18 Feb 2011 15:50:24 +0530

vikas – 1 file(s) modified
/home -> /

~ /trunk/Website/src/in/shop2020/serving/controllers/RegisterController.java

Rev 818 – /home -> /

vikas — Fri, 18 Feb 2011 15:42:40 +0530

vikas – 1 file(s) modified
/home -> /

~ /trunk/Website/src/in/shop2020/serving/controllers/LogoutController.java

Rev 817 – plain uid was being compared against encrypted one. Fixed it.

vikas — Fri, 18 Feb 2011 15:37:28 +0530

vikas – 1 file(s) modified
plain uid was being compared against encrypted one. Fixed it.

~ /trunk/Website/src/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 816 – Use constant instead of string literal.

vikas — Fri, 18 Feb 2011 15:34:51 +0530

vikas – 1 file(s) modified
Use constant instead of string literal.

~ /trunk/Website/src/in/shop2020/serving/interceptors/LoginInterceptor.java

Rev 815 – Added logic to encrypt password

rajveer — Fri, 18 Feb 2011 11:52:17 +0530

rajveer – 3 file(s) modified
Added logic to encrypt password

~ /trunk/Website/src/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/MyresearchController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/RegisterController.java

Rev 814 – Changes by ebizon

rajveer — Fri, 18 Feb 2011 11:31:10 +0530

rajveer – 3 file(s) modified
Changes by ebizon

~ /trunk/Website/WebContent/WEB-INF/content/login-details-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/personal-details-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/register-index.vm

Rev 813 – removed inline js files

rajveer — Fri, 18 Feb 2011 11:26:17 +0530

rajveer – 1 file(s) modified
removed inline js files

~ /trunk/Website/WebContent/WEB-INF/content/entity-show.vm

Rev 812 – templates changes ebizon

rajveer — Fri, 18 Feb 2011 11:24:32 +0530

rajveer – 2 file(s) modified
templates changes ebizon

~ /trunk/Website/conf/templates/header.vm
~ /trunk/Website/conf/templates/shippingaddressdetails.vm

Rev 811 – templates changes ebizon

rajveer — Fri, 18 Feb 2011 11:23:06 +0530

rajveer – 3 file(s) modified
templates changes ebizon

~ /trunk/Website/conf/templates/commoncssfiles.vm
~ /trunk/Website/conf/templates/orderdetails.vm
~ /trunk/Website/conf/templates/shippingdetails.vm

Rev 810 – my research updates

rajveer — Fri, 18 Feb 2011 11:13:12 +0530

rajveer – 1 file(s) modified
my research updates

~ /trunk/Website/conf/templates/myresearch.vm

Rev 809 – js changes

rajveer — Fri, 18 Feb 2011 11:11:39 +0530

rajveer – 2 file(s) modified
js changes

~ /trunk/Website/WebContent/js/all.js
~ /trunk/Website/WebContent/js/custom-jquery.js

Rev 808 – Css changes by ebizon

rajveer — Fri, 18 Feb 2011 11:08:24 +0530

rajveer – 5 file(s) modified
Css changes by ebizon

~ /trunk/Website/WebContent/css/cart.css
~ /trunk/Website/WebContent/css/common.css
~ /trunk/Website/WebContent/css/ie7.css
~ /trunk/Website/WebContent/css/myaccount.css
~ /trunk/Website/WebContent/css/style.css

Rev 807 – post to login action instead of ./login which is relative ...

vikas — Thu, 17 Feb 2011 17:48:16 +0530

vikas – 1 file(s) modified
post to login action instead of ./login which is relative and causes problem in some pages.

~ /trunk/Website/conf/templates/header.vm

Rev 806 – added product id for my research button

rajveer — Thu, 17 Feb 2011 16:39:44 +0530

rajveer – 2 file(s) modified
added product id for my research button

~ /trunk/ContentStore/src/in/shop2020/ui/util/VUI.java
~ /trunk/ContentStore/src/velocity/product_summary.vm

Rev 805 – Privacy policy and terms and conditions

rajveer — Thu, 17 Feb 2011 15:56:25 +0530

rajveer – 12 file(s) modified
Privacy policy and terms and conditions

~ /trunk/Website/conf/templates/cartdetails.vm
~ /trunk/Website/conf/templates/footer.vm
~ /trunk/Website/conf/templates/mainmenu.vm
~ /trunk/Website/conf/templates/registrationform.vm
~ /trunk/Website/conf/templates/shippingdetails.vm
+ /trunk/Website/src/in/shop2020/serving/controllers/StaticController.java
~ /trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/WebContent/js/custom-jquery.js
~ /trunk/Website/WebContent/WEB-INF/content/exception.vm
+ /trunk/Website/WebContent/WEB-INF/content/privacy-policy.vm
~ /trunk/Website/WebContent/WEB-INF/content/register-index.vm
+ /trunk/Website/WebContent/WEB-INF/content/terms-conditions.vm

Rev 804 – button changes on product page

rajveer — Thu, 17 Feb 2011 14:01:18 +0530

rajveer – 1 file(s) modified
button changes on product page

~ /trunk/ContentStore/src/velocity/product_summary.vm

Rev 803 – Fix the social networks buttons issue i IE8.

vikas — Wed, 16 Feb 2011 20:08:27 +0530

vikas – 2 file(s) modified
Fix the social networks buttons issue i IE8.

~ /trunk/Website/conf/templates/socialutils.vm
~ /trunk/Website/WebContent/css/product.css

Rev 802 – Added order status description

rajveer — Wed, 16 Feb 2011 18:59:23 +0530

rajveer – 1 file(s) modified
Added order status description

~ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/OrderStatus.java

Rev 801 – Bug fixing for beta

rajveer — Wed, 16 Feb 2011 18:56:21 +0530

rajveer – 9 file(s) modified
Bug fixing for beta

~ /trunk/Website/conf/templates/cartheader.vm
~ /trunk/Website/conf/templates/myaccount.vm
~ /trunk/Website/conf/templates/orderdetails.vm
~ /trunk/Website/conf/templates/shippingheader.vm
~ /trunk/Website/src/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/in/shop2020/serving/interceptors/UserInterceptor.java
~ /trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/in/shop2020/serving/services/UserSessionInfo.java
~ /trunk/Website/WebContent/js/cart-details.js

Rev 800 – Fix a javascript error when there are no results in ...

vikas — Wed, 16 Feb 2011 17:39:14 +0530

vikas – 1 file(s) modified
Fix a javascript error when there are no results in search page.

~ /trunk/Website/WebContent/js/priceSlider.js