SmartDukaan – /

Rev 7318 – Added logos for hotspot and saholic

rajveer — Wed, 22 May 2013 14:39:16 +0530

rajveer – 3 file(s) modified
Added logos for hotspot and saholic

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
+ /trunk/HotspotDashboard/src/main/resources/Hotspot-Logo.jpg
+ /trunk/HotspotDashboard/src/main/resources/Saholic-Logo.jpg

Rev 7317 – Made offertext unavailable for stores.

amit.gupta — Wed, 22 May 2013 14:20:58 +0530

amit.gupta – 4 file(s) modified
Made offertext unavailable for stores.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/velocity/CategorySnippet.vm
~ /trunk/ContentStore/src/velocity/HomeSnippet.vm
~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 7316 – Handled null cases and minor enhancements.

kshitij.sood — Wed, 22 May 2013 12:28:14 +0530

kshitij.sood – 3 file(s) modified
Handled null cases and minor enhancements.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm

Rev 7315 – minor bug fix

amit.gupta — Wed, 22 May 2013 11:56:50 +0530

amit.gupta – 1 file(s) modified
minor bug fix

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py

Rev 7314 – Handled case of empty list.

kshitij.sood — Tue, 21 May 2013 20:09:54 +0530

kshitij.sood – 1 file(s) modified
Handled case of empty list.

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

Rev 7313 – Handle Prepaid case.

rajveer — Tue, 21 May 2013 19:43:04 +0530

rajveer – 1 file(s) modified
Handle Prepaid case.

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

Rev 7312 – Changes requested by Pramit.

amit.gupta — Tue, 21 May 2013 19:33:34 +0530

amit.gupta – 6 file(s) modified
Changes requested by Pramit.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ExpertReviewController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-edit-new.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-index.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-show.vm
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/ExpertReview.java
~ /trunk/ContentStore/src/xml/model/users.xml

Rev 7311 – Changes regarding amazon order processing.

kshitij.sood — Tue, 21 May 2013 18:55:40 +0530

kshitij.sood – 9 file(s) modified
Changes regarding amazon order processing.

~ /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/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7310 – Made small changes.

rajveer — Tue, 21 May 2013 18:10:04 +0530

rajveer – 1 file(s) modified
Made small changes.

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

Rev 7309 – Display cancellation in case of website only.

rajveer — Tue, 21 May 2013 17:36:18 +0530

rajveer – 1 file(s) modified
Display cancellation in case of website only.

~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java

Rev 7308 – Added support to send mail for verification.

rajveer — Tue, 21 May 2013 17:35:05 +0530

rajveer – 16 file(s) modified
Added support to send mail for verification.

~ /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/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StoreAdminController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/store-admin-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/StorePricing.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/HotspotStore.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7307 – Other features - No learned

amit.gupta — Tue, 21 May 2013 11:42:02 +0530

amit.gupta – 1 file(s) modified
Other features - No learned

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

Rev 7306 – Added more code for store pricing.

rajveer — Mon, 20 May 2013 18:55:03 +0530

rajveer – 8 file(s) modified
Added more code for store pricing.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StoreAdminController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/store-admin-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 7305 – Hold and default Inventory Changes

amit.gupta — Mon, 20 May 2013 17:44:49 +0530

amit.gupta – 1 file(s) modified
Hold and default Inventory Changes

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java

Rev 7304 – If no circle is selected, use store's circle Id.

rajveer — Mon, 20 May 2013 17:15:27 +0530

rajveer – 1 file(s) modified
If no circle is selected, use store's circle Id.

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

Rev 7303 – Removing spelling mistake fulfillmentWarehouseId-->fulfilmentWarehouseId

amar.kumar — Mon, 20 May 2013 16:49:53 +0530

amar.kumar – 1 file(s) modified
Removing spelling mistake fulfillmentWarehouseId-->fulfilmentWarehouseId

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

Rev 7302 – Avinash new user.

amit.gupta — Mon, 20 May 2013 15:57:59 +0530

amit.gupta – 1 file(s) modified
Avinash new user.

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

Rev 7301 – Content model for powerbanks.

amit.gupta — Mon, 20 May 2013 15:35:52 +0530

amit.gupta – 1 file(s) modified
Content model for powerbanks.

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

Rev 7300 – Content model for powerbanks.

amit.gupta — Mon, 20 May 2013 14:04:29 +0530

amit.gupta – 1 file(s) modified
Content model for powerbanks.

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

Rev 7299 – Content model for powerbanks.

amit.gupta — Mon, 20 May 2013 13:56:05 +0530

amit.gupta – 1 file(s) modified
Content model for powerbanks.

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

Rev 7298 – Content model for powerbanks.

amit.gupta — Mon, 20 May 2013 11:08:27 +0530

amit.gupta – 4 file(s) modified
Content model for powerbanks.

~ /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 7297 – Upon encountering an Exception we mark that mail as processed

anupam.singh — Fri, 17 May 2013 16:59:26 +0530

anupam.singh – 1 file(s) modified
Upon encountering an Exception we mark that mail as processed

~ /trunk/Crm/src/main/java/in/shop2020/util/EmailReader.java

Rev 7296 – fixed namespace import issues related to datetime.

amit.gupta — Fri, 17 May 2013 16:50:30 +0530

amit.gupta – 1 file(s) modified
fixed namespace import issues related to datetime.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 7295 – Not displaying shipment updates of redexpress.

kshitij.sood — Fri, 17 May 2013 16:01:11 +0530

kshitij.sood – 1 file(s) modified
Not displaying shipment updates of redexpress.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java

Rev 7294 – Moved static block to index() method for deleteFrcController

anupam.singh — Fri, 17 May 2013 14:50:51 +0530

anupam.singh – 1 file(s) modified
Moved static block to index() method for deleteFrcController

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/DeleteFrcController.java

Rev 7293 – - Changes related to StoreWebsite - Added source to ...

anupam.singh — Fri, 17 May 2013 13:30:57 +0530

anupam.singh – 23 file(s) modified
- Changes related to StoreWebsite
- Added source to "change_transaction_status" method

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
x /StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm (copied from /StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm@7272)
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.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/model/v1/order/script/CreateRTGSBulkOrders.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
~ /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/services/CommonPaymentService.java

Rev 7292 – changing method name of scanFreebie to scanfreebie

amar.kumar — Fri, 17 May 2013 12:52:55 +0530

amar.kumar – 1 file(s) modified
changing method name of scanFreebie to scanfreebie

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

Rev 7291 – Changes For Hold Inventory,Default Inventory and ASIN to add on ...

vikram.raghav — Thu, 16 May 2013 17:14:45 +0530

vikram.raghav – 17 file(s) modified
Changes For Hold Inventory,Default Inventory and ASIN to add on CATALOG DASHBOARD.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportGenerator.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportSender.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
~ /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/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 7290 – Added price approval mechanism.

rajveer — Thu, 16 May 2013 14:36:36 +0530

rajveer – 2 file(s) modified
Added price approval mechanism.

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PriceApprovalController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/price-approval-index.vm

Rev 7289 – DTH maxlength was limited to 10. Fixing that

anupam.singh — Thu, 16 May 2013 12:22:27 +0530

anupam.singh – 6 file(s) modified
DTH maxlength was limited to 10. Fixing that

x /RechargeDashboard/src/main/webapp/js/rechargewebapp_07052013.js
+ /RechargeDashboard/src/main/webapp/js/rechargewebapp_16052013.js (copied from /RechargeDashboard/src/main/webapp/js/rechargewebapp_07052013.js@7236)
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/home-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/recharge-result.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/report-index.vm

Rev 7288 – Added pramit as Content Reviewer

amit.gupta — Thu, 16 May 2013 06:51:06 +0530

amit.gupta – 1 file(s) modified
Added pramit as Content Reviewer

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

Rev 7287 – Added store.

amit.gupta — Wed, 15 May 2013 14:59:20 +0530

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

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java

Rev 7286 – Expert Review Code.

amit.gupta — Wed, 15 May 2013 14:58:16 +0530

amit.gupta – 145 file(s) modified
Expert Review Code.

+ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ExpertReviewController.java
+ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ExpertReviewSourceController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/LoginController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SlidesController.java
+ /trunk/ContentCreation/src/main/webapp/js/tinymce
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/license.txt
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/advlist
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/advlist/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/anchor
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/anchor/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/autolink
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/autolink/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/autoresize
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/autoresize/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/autosave
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/autosave/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/bbcode
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/bbcode/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/charmap
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/charmap/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/code
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/code/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/compat3x
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/compat3x/editable_selects.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/compat3x/form_utils.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/compat3x/mctabs.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/compat3x/tiny_mce_popup.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/compat3x/validate.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/contextmenu
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/contextmenu/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/directionality
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/directionality/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-cool.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-cry.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-embarassed.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-frown.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-innocent.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-kiss.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-laughing.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-money-mouth.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-sealed.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-smile.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-surprised.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-tongue-out.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-undecided.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-wink.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-yell.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/example
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/example/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/example_dependency
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/example_dependency/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/fullpage
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/fullpage/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/fullscreen
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/fullscreen/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/hr
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/hr/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/image
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/image/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/insertdatetime
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/insertdatetime/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/layer
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/layer/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/legacyoutput
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/legacyoutput/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/link
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/link/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/lists
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/lists/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/media
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/media/moxieplayer.swf
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/media/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/nonbreaking
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/nonbreaking/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/noneditable
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/noneditable/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/pagebreak
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/pagebreak/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/paste
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/paste/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/preview
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/preview/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/print
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/print/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/save
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/save/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/searchreplace
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/searchreplace/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/spellchecker
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/spellchecker/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/tabfocus
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/tabfocus/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/table
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/table/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/template
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/template/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/textcolor
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/textcolor/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/visualblocks
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/visualblocks/css
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/visualblocks/css/visualblocks.css
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/visualblocks/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/visualchars
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/visualchars/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/wordcount
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/wordcount/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/content.min.css
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/fonts
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/fonts/icomoon.eot
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/fonts/icomoon.svg
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/fonts/icomoon.ttf
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/fonts/icomoon.woff
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/img
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/img/anchor.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/img/loader.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/img/object.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/img/trans.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/img/wline.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/skin.classic.min.css
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/skin.ie7.min.css
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/skin.min.css
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/themes
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/themes/modern
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/themes/modern/theme.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/tinymce.min.js
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-edit-new.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-index.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-show.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-source-index.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-edit.vm
~ /trunk/ContentStore/src/main/java/in/shop2020/content/security/Action.java
~ /trunk/ContentStore/src/main/java/in/shop2020/content/security/Role.java
~ /trunk/ContentStore/src/main/java/in/shop2020/content/security/RoleManager.java
~ /trunk/ContentStore/src/main/java/in/shop2020/content/security/UserManager.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/ExpertReview.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/ExpertReviewSource.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/ExpertReviewStatus.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java

Rev 7285 – Added support to add balance in wallet for spice

rajveer — Tue, 14 May 2013 19:04:39 +0530

rajveer – 11 file(s) modified
Added support to add balance in wallet for spice

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessRechargeTransaction.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/RechargeTopupController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/StoreAdminController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/recharge-topup-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/store-admin-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7284 – Added horizontal rule.

kshitij.sood — Tue, 14 May 2013 18:56:44 +0530

kshitij.sood – 1 file(s) modified
Added horizontal rule.

~ /trunk/Support/src/main/webapp/WEB-INF/content/reports-authsuccess.vm

Rev 7283 – Amazon dashboard.

kshitij.sood — Tue, 14 May 2013 18:20:26 +0530

kshitij.sood – 22 file(s) modified
Amazon dashboard.

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/AmazonListController.java
+ /trunk/Support/src/main/webapp/css/demo_page_amazon.css
+ /trunk/Support/src/main/webapp/css/demo_table_amazon.css
+ /trunk/Support/src/main/webapp/css/jquery.alerts.css
+ /trunk/Support/src/main/webapp/css/style.css
+ /trunk/Support/src/main/webapp/images/back_disabled.png
+ /trunk/Support/src/main/webapp/images/back_enabled.png
+ /trunk/Support/src/main/webapp/images/back_enabled_hover.png
+ /trunk/Support/src/main/webapp/images/bottom-line.png
+ /trunk/Support/src/main/webapp/images/center-bcg.png
+ /trunk/Support/src/main/webapp/images/center-blue.png
+ /trunk/Support/src/main/webapp/images/forward_disabled.png
+ /trunk/Support/src/main/webapp/images/forward_enabled.png
+ /trunk/Support/src/main/webapp/images/forward_enabled_hover.png
+ /trunk/Support/src/main/webapp/images/head-bcg.jpg
+ /trunk/Support/src/main/webapp/images/spinner.gif
+ /trunk/Support/src/main/webapp/images/top-light-blue.png
+ /trunk/Support/src/main/webapp/js/jquery.alerts.js
+ /trunk/Support/src/main/webapp/WEB-INF/content/amaon-list-index.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-index.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/reports-authsuccess.vm

Rev 7282 – Added refund time in downloadable report Handled null description

anupam.singh — Tue, 14 May 2013 18:18:42 +0530

anupam.singh – 2 file(s) modified
Added refund time in downloadable report
Handled null description

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ReportController.java
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/report-index.vm

Rev 7281 – Changes in Pyproj and thrift for amazon.

kshitij.sood — Tue, 14 May 2013 18:17:31 +0530

kshitij.sood – 18 file(s) modified
Changes in Pyproj and thrift for amazon.

~ /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/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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Amazonlisted.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/AmazonInventorySnapshot.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 7280 – Added content generation for store website.

amit.gupta — Tue, 14 May 2013 15:58:18 +0530

amit.gupta – 1 file(s) modified
Added content generation for store website.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 7279 – Added content generation for store website.

amit.gupta — Tue, 14 May 2013 15:47:28 +0530

amit.gupta – 2 file(s) modified
Added content generation for store website.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java