SmartDukaan – /

Rev 7036 – Added new content model for tablets.

amit.gupta — Fri, 22 Mar 2013 20:34:54 +0530

amit.gupta – 5 file(s) modified
Added new content model for tablets.

~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/categoryslidesequence.xml
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 7035 – Added dealtext to partner feed

amit.gupta — Fri, 22 Mar 2013 19:46:32 +0530

amit.gupta – 1 file(s) modified
Added dealtext to partner feed

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java

Rev 7034 –

amit.gupta — Fri, 22 Mar 2013 19:21:08 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java

Rev 7033 – Setting default insurer and insuranceAmount as 0

anupam.singh — Fri, 22 Mar 2013 17:40:33 +0530

anupam.singh – 3 file(s) modified
Setting default insurer and insuranceAmount as 0

~ /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

Rev 7032 – Removed unused package.

rajveer — Fri, 22 Mar 2013 17:30:29 +0530

rajveer – 1 file(s) modified
Removed unused package.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py

Rev 7031 – Corrected.

rajveer — Fri, 22 Mar 2013 17:06:12 +0530

rajveer – 1 file(s) modified
Corrected.

~ /trunk/Common/src/main/java/in/shop2020/serving/services/RedExpressTrackingService.java

Rev 7030 – Seprated service and controller.

rajveer — Fri, 22 Mar 2013 16:37:30 +0530

rajveer – 2 file(s) modified
Seprated service and controller.

+ /trunk/Common/src/main/java/in/shop2020/serving/services/RedExpressTrackingService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RedexpressUpdatesController.java

Rev 7029 – Add some spaces in the red express updates controller

rajveer — Fri, 22 Mar 2013 16:30:00 +0530

rajveer – 1 file(s) modified
Add some spaces in the red express updates controller

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

Rev 7028 – RedExpress Service in package.

rajveer — Fri, 22 Mar 2013 16:10:24 +0530

rajveer – 1 file(s) modified
RedExpress Service in package.

+ /trunk/PyProj/src/shop2020/model/v1/order/impl/RedExpressUpdateService.py

Rev 7027 – Added method for re

rajveer — Fri, 22 Mar 2013 15:42:37 +0530

rajveer – 2 file(s) modified
Added method for re

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm

Rev 7026 – Added code for Redexpress to diaplay on website.

rajveer — Fri, 22 Mar 2013 15:41:04 +0530

rajveer – 7 file(s) modified
Added code for Redexpress to diaplay on website.

~ /trunk/PyProj/src/shop2020/model/v1/order/script/RedExpressLogisticsReconciliation.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/RedexpressUpdatesController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/redexpress-updates-show.vm

Rev 7025 – Added codes for all courier tracking statuses for red express.

rajveer — Fri, 22 Mar 2013 12:16:58 +0530

rajveer – 1 file(s) modified
Added codes for all courier tracking statuses for red express.

~ /trunk/PyProj/src/shop2020/model/v1/order/script/RedExpressLogisticsReconciliation.py

Rev 7024 – Now only asking for emailAddress instead of publish actions

amar.kumar — Fri, 22 Mar 2013 11:27:51 +0530

amar.kumar – 1 file(s) modified
Now only asking for emailAddress instead of publish actions

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

Rev 7023 – Checking for dummy call to login through facebook

amar.kumar — Thu, 21 Mar 2013 19:33:39 +0530

amar.kumar – 1 file(s) modified
Checking for dummy call to login through facebook

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

Rev 7022 – Added logic of 5K and 10K for red express.

rajveer — Thu, 21 Mar 2013 18:28:05 +0530

rajveer – 1 file(s) modified
Added logic of 5K and 10K for red express.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 7021 – Added the Red express as courier partner.

rajveer — Thu, 21 Mar 2013 18:06:53 +0530

rajveer – 1 file(s) modified
Added the Red express as courier partner.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 7020 – Rearranging FB.init() code to avoid popup being prevented

amar.kumar — Thu, 21 Mar 2013 18:05:44 +0530

amar.kumar – 1 file(s) modified
Rearranging FB.init() code to avoid popup being prevented

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

Rev 7019 – Remove code to check insurer at the time of receive ...

rajveer — Thu, 21 Mar 2013 18:03:50 +0530

rajveer – 1 file(s) modified
Remove code to check insurer at the time of receive return.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 7018 – Insurance return to be setup.

rajveer — Thu, 21 Mar 2013 17:43:50 +0530

rajveer – 1 file(s) modified
Insurance return to be setup.

~ /trunk/PyProj/src/shop2020/model/v1/order/script/InsuranceDeclaration.py

Rev 7017 – Updated

kshitij.sood — Thu, 21 Mar 2013 17:07:33 +0530

kshitij.sood – 1 file(s) modified
Updated

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

Rev 7016 –

amar.kumar — Thu, 21 Mar 2013 16:02:37 +0530

amar.kumar – 1 file(s) modified

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

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 7014 – Store invoices at the required place.

rajveer — Thu, 21 Mar 2013 14:39:34 +0530

rajveer – 1 file(s) modified
Store invoices at the required place.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java

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 7009 – Added more recipients.

amit.gupta — Wed, 20 Mar 2013 18:47:41 +0530

amit.gupta – 1 file(s) modified
Added more recipients.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CouponAlert.py

Rev 7008 – Added alerts for expiring coupons.

amit.gupta — Wed, 20 Mar 2013 18:41:47 +0530

amit.gupta – 1 file(s) modified
Added alerts for expiring coupons.

+ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CouponAlert.py

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 7000 – added memory specific details for java run.

amit.gupta — Mon, 18 Mar 2013 20:48:57 +0530

amit.gupta – 1 file(s) modified
added memory specific details for java run.

~ /trunk/runutils/generate-content-from-cms.sh

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 6997 – Added new facets.

amit.gupta — Mon, 18 Mar 2013 17:11:23 +0530

amit.gupta – 6 file(s) modified
Added new facets.

+ /trunk/ContentStore/src/jython/irdatarules/laptops/screensize.py
~ /trunk/ContentStore/src/jython/irdatarules/laptops/storage.py
+ /trunk/ContentStore/src/jython/irdatarules/tablets
+ /trunk/ContentStore/src/jython/irdatarules/tablets/screensize.py
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/irdatarules.xml