SmartDukaan – /trunk/Website/

Rev 7015 – adding "/" in front of images to allow versioning

amar.kumar — Thu, 21 Mar 2013 14:41:29 +0530

amar.kumar – 2 file(s) modified
adding "/" in front of images to allow versioning

~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm

Rev 7013 – Filtering related changes for facebook appId and appsecret

amar.kumar — Thu, 21 Mar 2013 14:15:37 +0530

amar.kumar – 2 file(s) modified
Filtering related changes for facebook appId and appsecret

~ /trunk/Website/build.xml
~ /trunk/Website/pom.xml

Rev 7012 – Width change and removed right padding.

kshitij.sood — Thu, 21 Mar 2013 12:52:48 +0530

kshitij.sood – 1 file(s) modified
Width change and removed right padding.

~ /trunk/Website/src/main/resources/templates/cartwidget.vm

Rev 7011 – Added hdfc 18 months.

kshitij.sood — Thu, 21 Mar 2013 12:30:01 +0530

kshitij.sood – 1 file(s) modified
Added hdfc 18 months.

~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 7010 – Added konka again

amit.gupta — Thu, 21 Mar 2013 11:05:04 +0530

amit.gupta – 1 file(s) modified
Added konka again

~ /trunk/Website/src/main/resources/templates/header.vm

Rev 7007 – Changes to allow login through facebook and storing user's facebook ...

amar.kumar — Wed, 20 Mar 2013 17:05:22 +0530

amar.kumar – 21 file(s) modified
Changes to allow login through facebook and storing user's facebook credentials to be able to post on user's behalf on facebook

~ /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/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.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/channel.html
~ /trunk/Website/src/main/webapp/css/common.css
+ /trunk/Website/src/main/webapp/images/facebooklogin.png
+ /trunk/Website/src/main/webapp/js/facebook.js
~ /trunk/Website/src/main/webapp/js/loginregister.js
~ /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

Rev 7006 – Facebook appId and appSecret for dev environment, used in login ...

anupam.singh — Wed, 20 Mar 2013 17:04:29 +0530

anupam.singh – 1 file(s) modified
Facebook appId and appSecret for dev environment, used in login via facebook feature.

~ /trunk/Website/src/main/filters/dev/filters.properties

Rev 7005 – Removed konka as requested.

amit.gupta — Tue, 19 Mar 2013 20:34:25 +0530

amit.gupta – 1 file(s) modified
Removed konka as requested.

~ /trunk/Website/src/main/resources/templates/header.vm

Rev 7004 – Added konka.

amit.gupta — Tue, 19 Mar 2013 17:39:42 +0530

amit.gupta – 1 file(s) modified
Added konka.

~ /trunk/Website/src/main/resources/templates/header.vm

Rev 7003 – changed minor Anchor text.

amit.gupta — Tue, 19 Mar 2013 01:23:04 +0530

amit.gupta – 1 file(s) modified
changed minor Anchor text.

~ /trunk/Website/src/main/resources/templates/header.vm

Rev 7002 – fixed js bug

amit.gupta — Tue, 19 Mar 2013 01:15:14 +0530

amit.gupta – 1 file(s) modified
fixed js bug

~ /trunk/Website/src/main/webapp/js/common.js

Rev 7001 – Adding direction code for hdfc 18 month emi

rajveer — Mon, 18 Mar 2013 22:48:42 +0530

rajveer – 1 file(s) modified
Adding direction code for hdfc 18 month emi

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java

Rev 6999 – Removed z10 from mobiles tab.

amit.gupta — Mon, 18 Mar 2013 17:29:53 +0530

amit.gupta – 1 file(s) modified
Removed z10 from mobiles tab.

~ /trunk/Website/src/main/resources/templates/header.vm

Rev 6998 – Search is now optimised and is more controllable.

amit.gupta — Mon, 18 Mar 2013 17:27:22 +0530

amit.gupta – 8 file(s) modified
Search is now optimised and is more controllable.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GlossaryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/js/common.js

Rev 6996 – Added RechargeAgain button on my recharges page

anupam.singh — Mon, 18 Mar 2013 14:40:48 +0530

anupam.singh – 5 file(s) modified
Added RechargeAgain button on my recharges page

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GeneratedController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyRechargesController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-recharges.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm

Rev 6993 – Updated variable name.

rajveer — Fri, 15 Mar 2013 12:33:00 +0530

rajveer – 1 file(s) modified
Updated variable name.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InvoiceController.java

Rev 6992 – Enable invoice download from my purchase.

rajveer — Fri, 15 Mar 2013 12:26:09 +0530

rajveer – 1 file(s) modified
Enable invoice download from my purchase.

~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm

Rev 6991 – Updated invoice controller.

rajveer — Fri, 15 Mar 2013 12:25:17 +0530

rajveer – 1 file(s) modified
Updated invoice controller.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InvoiceController.java

Rev 6989 – added imports.

rajveer — Thu, 14 Mar 2013 18:15:09 +0530

rajveer – 1 file(s) modified
added imports.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InvoiceController.java

Rev 6988 – Added support to fetch invoice number

rajveer — Thu, 14 Mar 2013 17:12:18 +0530

rajveer – 9 file(s) modified
Added support to fetch invoice number

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InvoiceController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/invoice-show.vm

Rev 6981 – Press section modification

kshitij.sood — Tue, 12 Mar 2013 17:07:52 +0530

kshitij.sood – 4 file(s) modified
Press section modification

~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css
~ /trunk/Website/src/main/webapp/images/press-logos-sprite.jpg
~ /trunk/Website/src/main/webapp/js/common.js

Rev 6976 – Added pagination for category pages.

amit.gupta — Mon, 11 Mar 2013 12:37:39 +0530

amit.gupta – 3 file(s) modified
Added pagination for category pages.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/webapp/js/productCategory.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm

Rev 6975 – Made special pages sortable, and accessories page wont show classes.

amit.gupta — Thu, 07 Mar 2013 19:03:31 +0530

amit.gupta – 3 file(s) modified
Made special pages sortable, and accessories page wont show classes.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm

Rev 6973 – Made special pages sortable.

amit.gupta — Thu, 07 Mar 2013 16:29:49 +0530

amit.gupta – 4 file(s) modified
Made special pages sortable.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/webapp/css/style.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 6971 – Removed alerts and added error message div for insurance details. ...

anupam.singh — Thu, 07 Mar 2013 14:28:27 +0530

anupam.singh – 2 file(s) modified
Removed alerts and added error message div for insurance details. Now tracking the number of time we show alert when user doesn't agree to Insurance T&C and tries to go to shipping page.

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 6970 – Insurance widget and minor changes in emi widget.

kshitij.sood — Thu, 07 Mar 2013 14:00:57 +0530

kshitij.sood – 2 file(s) modified
Insurance widget and minor changes in emi widget.

~ /trunk/Website/src/main/resources/templates/cartwidget.vm
~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 6968 – Typo mistake

kshitij.sood — Thu, 07 Mar 2013 00:50:01 +0530

kshitij.sood – 1 file(s) modified
Typo mistake

~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 6967 – Emi widget new banks added.

kshitij.sood — Thu, 07 Mar 2013 00:34:40 +0530

kshitij.sood – 2 file(s) modified
Emi widget new banks added.

~ /trunk/Website/src/main/resources/templates/cartwidget.vm
~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 6959 – Emi widget

kshitij.sood — Wed, 06 Mar 2013 14:38:39 +0530

kshitij.sood – 2 file(s) modified
Emi widget

~ /trunk/Website/src/main/resources/templates/cartwidget.vm
~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 6958 – Mark payments as captured in case of innoviti PG.

rajveer — Wed, 06 Mar 2013 12:39:08 +0530

rajveer – 1 file(s) modified
Mark payments as captured in case of innoviti PG.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InnovitiPayResponseController.java

Rev 6954 – Fixed missing images when less banks are populated.

amit.gupta — Wed, 06 Mar 2013 11:54:55 +0530

amit.gupta – 1 file(s) modified
Fixed missing images when less banks are populated.

~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 6953 – added comma

amit.gupta — Tue, 05 Mar 2013 18:32:50 +0530

amit.gupta – 1 file(s) modified
added comma

~ /trunk/Website/src/main/webapp/css/style.css

Rev 6951 – added high resolution icons for banks

amit.gupta — Tue, 05 Mar 2013 18:17:35 +0530

amit.gupta – 2 file(s) modified
added high resolution icons for banks

~ /trunk/Website/src/main/webapp/images/icici-icon.png
~ /trunk/Website/src/main/webapp/images/std-chartered-icon.png

Rev 6949 – modified styles and added cached snippets.

amit.gupta — Tue, 05 Mar 2013 18:03:19 +0530

amit.gupta – 3 file(s) modified
modified styles and added cached snippets.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/webapp/css/style.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm

Rev 6948 – Removed Bharat Bandh message from contact us page...Was checked in ...

anupam.singh — Tue, 05 Mar 2013 17:56:00 +0530

anupam.singh – 1 file(s) modified
Removed Bharat Bandh message from contact us page...Was checked in by mistake

~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm

Rev 6946 – Removed coming soon variable.

amit.gupta — Tue, 05 Mar 2013 15:11:37 +0530

amit.gupta – 1 file(s) modified
Removed coming soon variable.

~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js

Rev 6945 – Removed coming soon from emi.

amit.gupta — Tue, 05 Mar 2013 14:48:44 +0530

amit.gupta – 1 file(s) modified
Removed coming soon from emi.

~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 6944 – added images with better resolution.

amit.gupta — Tue, 05 Mar 2013 14:48:22 +0530

amit.gupta – 3 file(s) modified
added images with better resolution.

~ /trunk/Website/src/main/webapp/images/axis-icon.png
~ /trunk/Website/src/main/webapp/images/hsbc-icon.png
+ /trunk/Website/src/main/webapp/images/indusind-icon.png

Rev 6942 – now search results have 20 products in a page.

amit.gupta — Tue, 05 Mar 2013 13:51:29 +0530

amit.gupta – 4 file(s) modified
now search results have 20 products in a page.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm

Rev 6936 – Fixed alignment issues in cartFlowHeader and PickupStore Tab

anupam.singh — Tue, 05 Mar 2013 11:29:17 +0530

anupam.singh – 2 file(s) modified
Fixed alignment issues in cartFlowHeader and PickupStore Tab

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css