SmartDukaan – /

Rev 8183 – Changes for Sending Report for HotspotStock to Chaitanya

amar.kumar — Tue, 24 Sep 2013 19:50:58 +0530

amar.kumar – 2 file(s) modified
Changes for Sending Report for HotspotStock to Chaitanya

+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/HotspotStockReportSender.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/OosStatusMarker.java

Rev 8182 – Changes related to EBAY and minor changes related to use ...

amar.kumar — Tue, 24 Sep 2013 19:33:26 +0530

amar.kumar – 80 file(s) modified
Changes related to EBAY and minor changes related to use of rto orders for PO creation

Reviewed By: Rajveer Singh

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SplitEbayOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SplitEbayOrderEventHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SplitEbayOrderBox.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayAramexInvoiceHelper.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayBluedartInvoiceHelper.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayDTDCInvoiceHelper.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayFedexInvoiceHelper.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayHeaderFooterProvider.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayInvoiceGenerationService.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ChooseColorHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SplitEbayOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SplitEbayOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SplitEbayOrderResponse.java
+ /trunk/HotspotDashboard/src/main/resources/ebay-logo-grey-bg.jpg
+ /trunk/HotspotDashboard/src/main/resources/ebay-logo.jpg
+ /trunk/HotspotDashboard/src/main/resources/paisapay-logo.jpg
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
~ /trunk/InventoryManager/src/main/webapp/js/current-inventory.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /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/model/v1/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.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/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayColorChangeController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayDashboardController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayListingUploaderController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderUpdateController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbaySubsidyUploaderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/SourceOrderCreationController.java
+ /trunk/Support/src/main/webapp/css/ebay.css
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-color-change-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-dashboard-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-listing-uploader-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-normal-order-creator-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-ps-order-creator-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-ps-order-update-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-subsidy-uploader-authsuccess.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/source-order-creation-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/EbayItem.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/holdInventoryDetail.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/HoldInventoryDetail.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventory.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/OOSStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/EbayOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 8181 – Send forgot password mail through email sender.

rajveer — Tue, 24 Sep 2013 15:08:21 +0530

rajveer – 1 file(s) modified
Send forgot password mail through email sender.

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

Rev 8180 – Added category laptop chargers.

amit.gupta — Tue, 24 Sep 2013 12:16:57 +0530

amit.gupta – 1 file(s) modified
Added category laptop chargers.

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

Rev 8179 – Mobile Phones changed to Mobile Phone

amit.gupta — Tue, 24 Sep 2013 12:03:09 +0530

amit.gupta – 3 file(s) modified
Mobile Phones changed to Mobile Phone

~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm

Rev 8178 – Added sub-category mobile phones id 10006

amit.gupta — Tue, 24 Sep 2013 11:47:14 +0530

amit.gupta – 4 file(s) modified
Added sub-category mobile phones id 10006

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

Rev 8177 –

kshitij.sood — Tue, 24 Sep 2013 00:07:03 +0530

kshitij.sood – 1 file(s) modified

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

Rev 8176 – Update summary for available and not in stock products.

rajveer — Mon, 23 Sep 2013 19:23:58 +0530

rajveer – 1 file(s) modified
Update summary for available and not in stock products.

~ /trunk/PyProj/src/shop2020/model/v1/inventory/script/DailyStockReportGenerator.py

Rev 8175 – FTP password updated

amit.gupta — Mon, 23 Sep 2013 18:08:29 +0530

amit.gupta – 1 file(s) modified
FTP password updated

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

Rev 8174 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Mon, 23 Sep 2013 18:01:18 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Sep-23-2013

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

Rev 8173 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Mon, 23 Sep 2013 17:48:59 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Sep-23-2013

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

Rev 8172 –

kshitij.sood — Mon, 23 Sep 2013 17:06:37 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-index.vm

Rev 8171 –

kshitij.sood — Mon, 23 Sep 2013 17:00:16 +0530

kshitij.sood – 1 file(s) modified

+ /trunk/Support/src/main/webapp/js/jquery-1.5.1.min.js

Rev 8170 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Mon, 23 Sep 2013 16:56:14 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Sep-23-2013

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

Rev 8169 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Mon, 23 Sep 2013 16:45:13 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Sep-23-2013

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

Rev 8168 – Bulk update for amazon and some other changes.

kshitij.sood — Mon, 23 Sep 2013 16:23:20 +0530

kshitij.sood – 13 file(s) modified
Bulk update for amazon and some other changes.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
+ /trunk/PyProj/src/shop2020/model/v1/catalog/script/91MobilesScraper.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AmazonListController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-bulk-upload.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-shipping-upload.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/asinjob.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/options.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/reports-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 8167 –

kshitij.sood — Mon, 23 Sep 2013 14:56:55 +0530

kshitij.sood – 1 file(s) modified

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

Rev 8166 – Changes suggested by Pramit.

amit.gupta — Mon, 23 Sep 2013 11:21:00 +0530

amit.gupta – 1 file(s) modified
Changes suggested by Pramit.

~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-overview.vm

Rev 8165 – updated other para

amit.gupta — Sat, 21 Sep 2013 22:52:33 +0530

amit.gupta – 1 file(s) modified
updated other para

~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm

Rev 8164 – updated and checked in nursery rhymes.

amit.gupta — Sat, 21 Sep 2013 21:33:27 +0530

amit.gupta – 1 file(s) modified
updated and checked in nursery rhymes.

~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-apps.vm

Rev 8163 – Removed

amit.gupta — Sat, 21 Sep 2013 21:25:00 +0530

amit.gupta – 1 file(s) modified
Removed

x /trunk/Website/src/main/webapp/images/arrow_tab_yellow (1).png

Rev 8162 – Final changes

amit.gupta — Sat, 21 Sep 2013 21:21:44 +0530

amit.gupta – 9 file(s) modified
Final changes

~ /trunk/Website/src/main/webapp/css/androidland/style.css
~ /trunk/Website/src/main/webapp/images/androidland/device1.png
+ /trunk/Website/src/main/webapp/images/androidland/horoscope-guru.png
+ /trunk/Website/src/main/webapp/images/androidland/nursery-rhymes.png
+ /trunk/Website/src/main/webapp/images/androidland/rail-yatra.png
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-apps.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-devices.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-overview.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm

Rev 8161 – updated device 1 to FHD

amit.gupta — Sat, 21 Sep 2013 19:50:58 +0530

amit.gupta – 1 file(s) modified
updated device 1 to FHD

~ /trunk/Website/src/main/webapp/images/device1.png

Rev 8160 – used commonjsfiles.vm and commoncssfiles.vm

amit.gupta — Sat, 21 Sep 2013 18:52:49 +0530

amit.gupta – 4 file(s) modified
used commonjsfiles.vm and commoncssfiles.vm

~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-apps.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-devices.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-overview.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm

Rev 8159 – map + youtube for store, facebook plugin for overview

amit.gupta — Sat, 21 Sep 2013 15:59:33 +0530

amit.gupta – 3 file(s) modified
map + youtube for store, facebook plugin for overview

~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-apps.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-overview.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm

Rev 8158 – Added images Changes to store page

anupam.singh — Sat, 21 Sep 2013 14:13:05 +0530

anupam.singh – 44 file(s) modified
Added images
Changes to store page

+ /trunk/Website/src/main/webapp/images/androidland/accessories1.png
+ /trunk/Website/src/main/webapp/images/androidland/accessories2.png
+ /trunk/Website/src/main/webapp/images/androidland/accessories3.png
+ /trunk/Website/src/main/webapp/images/androidland/Android-Land.png
+ /trunk/Website/src/main/webapp/images/androidland/android-store-thumbs.png
+ /trunk/Website/src/main/webapp/images/androidland/app-business.png
+ /trunk/Website/src/main/webapp/images/androidland/app-communication.png
+ /trunk/Website/src/main/webapp/images/androidland/app-education.png
+ /trunk/Website/src/main/webapp/images/androidland/app-entertainment.png
+ /trunk/Website/src/main/webapp/images/androidland/app-games.png
+ /trunk/Website/src/main/webapp/images/androidland/app-health.png
+ /trunk/Website/src/main/webapp/images/androidland/app-photography.png
+ /trunk/Website/src/main/webapp/images/androidland/app-social.png
+ /trunk/Website/src/main/webapp/images/androidland/app-sports.png
+ /trunk/Website/src/main/webapp/images/androidland/app-travel.png
+ /trunk/Website/src/main/webapp/images/androidland/apps-homepage.png
+ /trunk/Website/src/main/webapp/images/androidland/apps-page1.png
+ /trunk/Website/src/main/webapp/images/androidland/apps-page2.png
+ /trunk/Website/src/main/webapp/images/androidland/apps-page3.png
+ /trunk/Website/src/main/webapp/images/androidland/apps-widget-image.png
~ /trunk/Website/src/main/webapp/images/androidland/arrow_tab_yellow.png
+ /trunk/Website/src/main/webapp/images/androidland/btn_3d_mid.png
+ /trunk/Website/src/main/webapp/images/androidland/btn_large_sides.png
+ /trunk/Website/src/main/webapp/images/androidland/device-homepage.png
+ /trunk/Website/src/main/webapp/images/androidland/device1.png
+ /trunk/Website/src/main/webapp/images/androidland/device2.png
+ /trunk/Website/src/main/webapp/images/androidland/device3.png
+ /trunk/Website/src/main/webapp/images/androidland/devices-widget-image.png
+ /trunk/Website/src/main/webapp/images/androidland/general_sprite_sheet.png
+ /trunk/Website/src/main/webapp/images/androidland/home-page-apps.png
+ /trunk/Website/src/main/webapp/images/androidland/home-page-device.png
+ /trunk/Website/src/main/webapp/images/androidland/icon01.png
+ /trunk/Website/src/main/webapp/images/androidland/icon02.png
+ /trunk/Website/src/main/webapp/images/androidland/icon03.png
+ /trunk/Website/src/main/webapp/images/androidland/main-banner.jpg
+ /trunk/Website/src/main/webapp/images/androidland/store-image-1.png
+ /trunk/Website/src/main/webapp/images/androidland/store-image-2.png
+ /trunk/Website/src/main/webapp/images/androidland/store-widget-image.png
+ /trunk/Website/src/main/webapp/images/androidland/tablet1.png
+ /trunk/Website/src/main/webapp/images/androidland/tablet2.png
+ /trunk/Website/src/main/webapp/images/androidland/tablet3.png
~ /trunk/Website/src/main/webapp/images/androidland/tab_yellow_mid.png
~ /trunk/Website/src/main/webapp/images/androidland/tab_yellow_sides.png
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm

Rev 8157 –

amit.gupta — Sat, 21 Sep 2013 12:50:55 +0530

amit.gupta – 46 file(s) modified

+ /trunk/Website/src/main/webapp/images/androidland/androidify.jpg
+ /trunk/Website/src/main/webapp/images/androidland/blood.jpg
+ /trunk/Website/src/main/webapp/images/androidland/callertune.jpg
+ /trunk/Website/src/main/webapp/images/androidland/cymera.jpg
+ /trunk/Website/src/main/webapp/images/androidland/deezer.jpg
+ /trunk/Website/src/main/webapp/images/androidland/despicable.jpg
+ /trunk/Website/src/main/webapp/images/androidland/dictionary.jpg
+ /trunk/Website/src/main/webapp/images/androidland/digimusic.jpg
+ /trunk/Website/src/main/webapp/images/androidland/dropbox.jpg
+ /trunk/Website/src/main/webapp/images/androidland/euro.jpg
+ /trunk/Website/src/main/webapp/images/androidland/evernote.jpg
+ /trunk/Website/src/main/webapp/images/androidland/fb.jpg
+ /trunk/Website/src/main/webapp/images/androidland/fbmsg.jpg
+ /trunk/Website/src/main/webapp/images/androidland/gmail.jpg
+ /trunk/Website/src/main/webapp/images/androidland/goal.jpg
+ /trunk/Website/src/main/webapp/images/androidland/google.jpg
+ /trunk/Website/src/main/webapp/images/androidland/googleplus.jpg
+ /trunk/Website/src/main/webapp/images/androidland/hangout.jpg
+ /trunk/Website/src/main/webapp/images/androidland/instagram.jpg
+ /trunk/Website/src/main/webapp/images/androidland/ironman.jpg
+ /trunk/Website/src/main/webapp/images/androidland/map.jpg
+ /trunk/Website/src/main/webapp/images/androidland/mydigi.jpg
+ /trunk/Website/src/main/webapp/images/androidland/norton.jpg
+ /trunk/Website/src/main/webapp/images/androidland/opera.jpg
+ /trunk/Website/src/main/webapp/images/androidland/photogrid.jpg
+ /trunk/Website/src/main/webapp/images/androidland/pose.jpg
+ /trunk/Website/src/main/webapp/images/androidland/pushup.jpg
+ /trunk/Website/src/main/webapp/images/androidland/racing.jpg
+ /trunk/Website/src/main/webapp/images/androidland/run.jpg
+ /trunk/Website/src/main/webapp/images/androidland/sc.jpg
+ /trunk/Website/src/main/webapp/images/androidland/scrabble.jpg
+ /trunk/Website/src/main/webapp/images/androidland/skype.jpg
+ /trunk/Website/src/main/webapp/images/androidland/track.jpg
+ /trunk/Website/src/main/webapp/images/androidland/tradisi.jpg
+ /trunk/Website/src/main/webapp/images/androidland/translate.jpg
+ /trunk/Website/src/main/webapp/images/androidland/tripit.jpg
+ /trunk/Website/src/main/webapp/images/androidland/twitter.jpg
+ /trunk/Website/src/main/webapp/images/androidland/viki.jpg
+ /trunk/Website/src/main/webapp/images/androidland/whatsapp.jpg
+ /trunk/Website/src/main/webapp/images/androidland/wikipedia.jpg
+ /trunk/Website/src/main/webapp/images/androidland/xe.jpg
+ /trunk/Website/src/main/webapp/images/androidland/yahoos.jpg
+ /trunk/Website/src/main/webapp/images/androidland/yo.jpg
+ /trunk/Website/src/main/webapp/images/androidland/youtube.jpg
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-apps.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-overview.vm

Rev 8156 – Adding new images Adding store page Changes to css

anupam.singh — Sat, 21 Sep 2013 03:01:35 +0530

anupam.singh – 50 file(s) modified
Adding new images
Adding store page
Changes to css

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AndroidLandStoreController.java
~ /trunk/Website/src/main/webapp/css/androidland/style.css
+ /trunk/Website/src/main/webapp/images/accessories1.png
+ /trunk/Website/src/main/webapp/images/accessories2.png
+ /trunk/Website/src/main/webapp/images/accessories3.png
+ /trunk/Website/src/main/webapp/images/Android-Land.png
+ /trunk/Website/src/main/webapp/images/android-store-thumbs.png
+ /trunk/Website/src/main/webapp/images/app-business.png
+ /trunk/Website/src/main/webapp/images/app-communication.png
+ /trunk/Website/src/main/webapp/images/app-education.png
+ /trunk/Website/src/main/webapp/images/app-entertainment.png
+ /trunk/Website/src/main/webapp/images/app-games.png
+ /trunk/Website/src/main/webapp/images/app-health.png
+ /trunk/Website/src/main/webapp/images/app-photography.png
+ /trunk/Website/src/main/webapp/images/app-social.png
+ /trunk/Website/src/main/webapp/images/app-sports.png
+ /trunk/Website/src/main/webapp/images/app-travel.png
+ /trunk/Website/src/main/webapp/images/apps-homepage.png
+ /trunk/Website/src/main/webapp/images/apps-page1.png
+ /trunk/Website/src/main/webapp/images/apps-page2.png
+ /trunk/Website/src/main/webapp/images/apps-page3.png
+ /trunk/Website/src/main/webapp/images/apps-widget-image.png
+ /trunk/Website/src/main/webapp/images/arrow_tab_yellow (1).png
+ /trunk/Website/src/main/webapp/images/arrow_tab_yellow.png
+ /trunk/Website/src/main/webapp/images/btn_3d_mid.png
+ /trunk/Website/src/main/webapp/images/btn_large_sides.png
+ /trunk/Website/src/main/webapp/images/device-homepage.png
+ /trunk/Website/src/main/webapp/images/device1.png
+ /trunk/Website/src/main/webapp/images/device2.png
+ /trunk/Website/src/main/webapp/images/device3.png
+ /trunk/Website/src/main/webapp/images/devices-widget-image.png
+ /trunk/Website/src/main/webapp/images/general_sprite_sheet.png
+ /trunk/Website/src/main/webapp/images/home-page-apps.png
+ /trunk/Website/src/main/webapp/images/home-page-device.png
+ /trunk/Website/src/main/webapp/images/icon01.png
+ /trunk/Website/src/main/webapp/images/icon02.png
+ /trunk/Website/src/main/webapp/images/icon03.png
+ /trunk/Website/src/main/webapp/images/main-banner.jpg
+ /trunk/Website/src/main/webapp/images/store-widget-image.png
+ /trunk/Website/src/main/webapp/images/tablet1.png
+ /trunk/Website/src/main/webapp/images/tablet2.png
+ /trunk/Website/src/main/webapp/images/tablet3.png
+ /trunk/Website/src/main/webapp/images/tab_yellow_mid.png
+ /trunk/Website/src/main/webapp/images/tab_yellow_sides.png
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-apps.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-devices.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-overview.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipment-show.vm

Rev 8155 – previous changes checked in

amit.gupta — Fri, 20 Sep 2013 17:25:04 +0530

amit.gupta – 1 file(s) modified
previous changes checked in

~ /trunk/ContentStore/src/jython/comparisonrules/software_math.py

Rev 8154 – Added Blackberry OS 10.2

amit.gupta — Fri, 20 Sep 2013 17:17:15 +0530

amit.gupta – 2 file(s) modified
Added Blackberry OS 10.2

~ /trunk/ContentStore/src/jython/comparisonrules/software_math.py
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 8153 –

amit.gupta — Fri, 20 Sep 2013 17:05:58 +0530

amit.gupta – 2 file(s) modified

x /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm
x /trunk/Website/src/main/webapp/WEB-INF/content/note2-exchange-offer.vm

Rev 8152 – Added android overview

amit.gupta — Fri, 20 Sep 2013 17:04:20 +0530

amit.gupta – 3 file(s) modified
Added android overview

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AndroidLandOverviewController.java (copied from /trunk/Website/src/main/java/in/shop2020/serving/controllers/AndroidLandStoreController.java@8146)
x /trunk/Website/src/main/java/in/shop2020/serving/controllers/AndroidLandStoreController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-overview.vm (copied from /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm@8147)

Rev 8151 – Added android land apps page

anupam.singh — Fri, 20 Sep 2013 17:02:22 +0530

anupam.singh – 2 file(s) modified
Added android land apps page

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AndroidLandAppsController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-apps.vm

Rev 8150 – removed $ from css.

amit.gupta — Thu, 19 Sep 2013 19:27:21 +0530

amit.gupta – 1 file(s) modified
removed $ from css.

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

Rev 8149 – Added battery type for Headset

amit.gupta — Thu, 19 Sep 2013 18:00:20 +0530

amit.gupta – 1 file(s) modified
Added battery type for Headset

~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 8148 – Adding page for android land devices

anupam.singh — Thu, 19 Sep 2013 17:54:21 +0530

anupam.singh – 2 file(s) modified
Adding page for android land devices

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AndroidLandDevicesController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-devices.vm

Rev 8147 – Android land more features checked in.

amit.gupta — Thu, 19 Sep 2013 16:37:24 +0530

amit.gupta – 9 file(s) modified
Android land more features checked in.

~ /trunk/Website/src/main/webapp/css/androidland/style.css
+ /trunk/Website/src/main/webapp/images/androidland
+ /trunk/Website/src/main/webapp/images/androidland/130_811_myandroid_topbanner.jpg
+ /trunk/Website/src/main/webapp/images/androidland/arrow_tab_yellow.png
+ /trunk/Website/src/main/webapp/images/androidland/tab_grey_mid.png
+ /trunk/Website/src/main/webapp/images/androidland/tab_grey_sides.png
+ /trunk/Website/src/main/webapp/images/androidland/tab_yellow_mid.png
+ /trunk/Website/src/main/webapp/images/androidland/tab_yellow_sides.png
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm

Rev 8146 – Added android land.

amit.gupta — Wed, 18 Sep 2013 19:44:25 +0530

amit.gupta – 8 file(s) modified
Added android land.

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AndroidLandStoreController.java
+ /trunk/Website/src/main/webapp/css/androidland
+ /trunk/Website/src/main/webapp/css/androidland/counter013.css
+ /trunk/Website/src/main/webapp/css/androidland/main.css
+ /trunk/Website/src/main/webapp/css/androidland/style.css
+ /trunk/Website/src/main/webapp/css/androidland/widget115.css
+ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/discounts-on-harmon-kardon-speakers.vm

Rev 8145 – Changes suggested by Vrinda

amit.gupta — Wed, 18 Sep 2013 11:00:23 +0530

amit.gupta – 3 file(s) modified
Changes suggested by Vrinda

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

Rev 8144 –

amit.gupta — Tue, 17 Sep 2013 15:27:40 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ContentStore/src/xml/model/categories.xml