SmartDukaan – /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 19685 – Entity upload

kshitij.sood — Wed, 04 May 2016 13:49:10 +0530

kshitij.sood – 11 file(s) modified
Entity upload

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
+ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityUploadController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-upload-deny.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-upload-result.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-upload.vm
~ /trunk/ContentStore/src/main/java/in/shop2020/content/security/Action.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/util/EntityUtils.java

Rev 13035 – Added Logic handling for partially active items.

amit.gupta — Mon, 10 Nov 2014 16:22:31 +0530

amit.gupta – 1 file(s) modified
Added Logic handling for partially active items.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 11873 – Added Url for entities in content

amit.gupta — Thu, 03 Jul 2014 10:38:19 +0530

amit.gupta – 2 file(s) modified
Added Url for entities in content

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 10912 – Updated titles

amit.gupta — Mon, 05 May 2014 14:20:57 +0530

amit.gupta – 1 file(s) modified
Updated titles

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 8749 – Migration to mongo checked in.

amit.gupta — Mon, 11 Nov 2013 14:52:30 +0530

amit.gupta – 23 file(s) modified
Migration to mongo checked in.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ExpertReviewController.java
~ /trunk/ContentStore/pom.xml
~ /trunk/ContentStore/src/main/java/in/shop2020/content/security/UserManager.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/FreeformContent.java
x /trunk/ContentStore/src/main/java/in/shop2020/metamodel/definitions/OldEntityContainer.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CN.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils1.java
+ /trunk/ContentStore/src/main/java/in/shop2020/storage/mongo
+ /trunk/ContentStore/src/main/java/in/shop2020/storage/mongo/adapters
+ /trunk/ContentStore/src/main/java/in/shop2020/storage/mongo/adapters/BDOAdapter.java
+ /trunk/ContentStore/src/main/java/in/shop2020/storage/mongo/adapters/FFCAdapter.java
+ /trunk/ContentStore/src/main/java/in/shop2020/storage/mongo/ContentViews.java
+ /trunk/ContentStore/src/main/java/in/shop2020/storage/mongo/StorageManager.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigratorToBDB.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/MobileSiteDataXMLGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewCMP.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/ContentStore/src/velocity/MyResearchSnippet.vm
~ /trunk/ContentStore/src/velocity/store/SlideGuide.vm
~ /trunk/ContentStore/src/xml/model/categories.xml

Rev 8659 – Changed category to 10006

amit.gupta — Fri, 01 Nov 2013 14:40:08 +0530

amit.gupta – 1 file(s) modified
Changed category to 10006

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 8025 – Bug fixed in cmp scores

amit.gupta — Tue, 27 Aug 2013 17:45:41 +0530

amit.gupta – 3 file(s) modified
Bug fixed in cmp scores

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/cmp-scores-show.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 8024 – Comparisions are now editable

amit.gupta — Tue, 27 Aug 2013 16:28:34 +0530

amit.gupta – 7 file(s) modified
Comparisions are now editable

+ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/CmpScoresController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/cmp-scores-show.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/ContentStore/src/jython/comparisonrules/display_math.py
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewCMP.java

Rev 7975 – Added dummy method for comparables.

amit.gupta — Wed, 14 Aug 2013 12:12:45 +0530

amit.gupta – 3 file(s) modified
Added dummy method for comparables.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewCMP.java

Rev 7973 – Changes related to migration step 2 and 3.

amit.gupta — Wed, 14 Aug 2013 10:45:31 +0530

amit.gupta – 11 file(s) modified
Changes related to migration step 2 and 3.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentStore/src/jython/comparisonrules/data_connectivity_math.py
~ /trunk/ContentStore/src/jython/comparisonrules/display_math.py
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/categoryslidesequence.xml
~ /trunk/ContentStore/src/xml/model/comparisonbuckets.xml
~ /trunk/ContentStore/src/xml/model/comparisondefinitions.xml
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 7971 – Minor bugfixes.

amit.gupta — Tue, 13 Aug 2013 14:41:44 +0530

amit.gupta – 1 file(s) modified
Minor bugfixes.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 7966 – Minor bugfixes.

amit.gupta — Mon, 12 Aug 2013 18:18:49 +0530

amit.gupta – 1 file(s) modified
Minor bugfixes.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 7965 – bug fix.

amit.gupta — Mon, 12 Aug 2013 17:58:48 +0530

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

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 7964 – Only scores will be shown for ready and completed entities.

amit.gupta — Mon, 12 Aug 2013 16:43:01 +0530

amit.gupta – 1 file(s) modified
Only scores will be shown for ready and completed entities.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 7963 – non comparable entites are ignored.

amit.gupta — Mon, 12 Aug 2013 16:32:22 +0530

amit.gupta – 1 file(s) modified
non comparable entites are ignored.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 7962 – scores are formatted and summary shows the final score.

amit.gupta — Mon, 12 Aug 2013 15:59:59 +0530

amit.gupta – 1 file(s) modified
scores are formatted and summary shows the final score.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 7958 – Added info related to score.

amit.gupta — Mon, 12 Aug 2013 11:33:33 +0530

amit.gupta – 3 file(s) modified
Added info related to score.

Rev 7100 – Changed 1hour to 15 mins

amit.gupta — Thu, 04 Apr 2013 17:35:10 +0530

amit.gupta – 1 file(s) modified
Changed 1hour to 15 mins

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 7099 – Changed 1hour to 15 mins

amit.gupta — Thu, 04 Apr 2013 17:27:52 +0530

amit.gupta – 1 file(s) modified
Changed 1hour to 15 mins

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 6894 – Entites creation will take place once in every hour.

amit.gupta — Wed, 27 Feb 2013 12:37:06 +0530

amit.gupta – 1 file(s) modified
Entites creation will take place once in every hour.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 6877 – added ready on removed created on.

amit.gupta — Mon, 25 Feb 2013 14:42:07 +0530

amit.gupta – 3 file(s) modified
added ready on removed created on.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/webapp/js/entity-index.js
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm

Rev 6041 – Fixed NPE in case of accessories.

amit.gupta — Mon, 24 Sep 2012 17:27:04 +0530

amit.gupta – 1 file(s) modified
Fixed NPE in case of accessories.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 6012 – Escaped html in values

amit.gupta — Fri, 14 Sep 2012 14:24:35 +0530

amit.gupta – 1 file(s) modified
Escaped html in values

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 5945 – Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

mandeep.dhir — Fri, 07 Sep 2012 16:37:44 +0530

mandeep.dhir – 99 file(s) modified
Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

~ /trunk/Common/src/main/java/in/shop2020/thrift/clients/CatalogClient.java
+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/InventoryClient.java
~ /trunk/Common/src/main/java/in/shop2020/utils/CategoryManager.java
~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/CatalogUploderToGAE.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/MobileSiteDataXMLGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCartController.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BillOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /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/java/in/shop2020/inventory/controllers/DoaOutController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/IgnoredItemMappingController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
+ /trunk/runutils/.project
+ /trunk/runutils/.pydevproject
+ /trunk/runutils/init.d/inventory-server
+ /trunk/Support/Converted-2-2012-08-06-16:29:31.xls
+ /trunk/Support/Converted-2-2012-08-11-14:58:00.xls
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ProductNotificationsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/AvailableAndReservedStock.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BillingType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogServiceException.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/HolidayType.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryServiceException.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventory.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventoryHistory.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemNotificationRequestCount.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ProductNotification.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Vendor.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemMapping.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemPricing.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseLocation.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/AvailableAndReservedStock.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/BillingType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/HolidayType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryServiceException.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventoryHistory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Vendor.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemMapping.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemPricing.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Warehouse.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseLocation.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseType.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
+ /trunk/ThriftGen/thriftsrc/InventoryService
+ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestDealsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestSellersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ClearanceSaleController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ComingSoonController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProductNotificationController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 5914 – Fixed minor bug related to the Auto update of Title ...

amit.gupta — Thu, 30 Aug 2012 17:16:17 +0530

amit.gupta – 1 file(s) modified
Fixed minor bug related to the Auto update of Title and metadescription

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 5906 – Corrected bug for entity controller.

rajveer — Wed, 29 Aug 2012 12:13:57 +0530

rajveer – 1 file(s) modified
Corrected bug for entity controller.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 5760 – #1537 Page title and meta description has to be automatically ...

amit.gupta — Thu, 09 Aug 2012 19:44:36 +0530

amit.gupta – 7 file(s) modified
#1537
Page title and meta description has to be automatically created and updated
Reviewer: amar

Rev 5180 – Made "Brand/ModelName/ModelNumber" javascript safe

amit.gupta — Tue, 15 May 2012 12:50:31 +0530

amit.gupta – 2 file(s) modified
Made "Brand/ModelName/ModelNumber" javascript safe

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm

Rev 5178 – Undid the changes

amit.gupta — Tue, 15 May 2012 11:55:26 +0530

amit.gupta – 1 file(s) modified
Undid the changes

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 5176 – Made "Brand/ModelName/ModelNumber" htmlsafe

amit.gupta — Tue, 15 May 2012 11:46:30 +0530

amit.gupta – 1 file(s) modified
Made "Brand/ModelName/ModelNumber" htmlsafe

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 4959 – Added support for child slide being optional #1108

amit.gupta — Thu, 12 Apr 2012 12:29:32 +0530

amit.gupta – 12 file(s) modified
Added support for child slide being optional
#1108

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-editSlide.vm
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/definitions/ChildSlideDefinition.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/definitions/DefinitionsContainer.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/definitions/SlideDefinition.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/jaxb/core/ChildSlideType.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/jaxb/core/SlideDefinitionType.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ExpandedChildSlideDefinition.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ExpandedSlideDefinition.java
x /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/MM.java
~ /trunk/ContentStore/src/xml/metamodel/core.xsd
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 4129 – Showing item details like color, start date, status etc. for ...

mandeep.dhir — Thu, 24 Nov 2011 16:02:31 +0530

mandeep.dhir – 12 file(s) modified
Showing item details like color, start date, status etc. for each entity
Adding NFC feature in Data connectivity slide (Modified comparison rules)
Fixed a bug to pass appropriate item_id in ProductDetail snippet

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
+ /trunk/ContentCreation/src/main/webapp/css/colorbox.css
+ /trunk/ContentCreation/src/main/webapp/jquery/thirdparty
+ /trunk/ContentCreation/src/main/webapp/jquery/thirdparty/jquery.colorbox-min.js
+ /trunk/ContentCreation/src/main/webapp/js/common.js
+ /trunk/ContentCreation/src/main/webapp/js/events.js
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-catalog-details.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
~ /trunk/ContentStore/src/jython/comparisonrules/data_connectivity_math.py
~ /trunk/ContentStore/src/velocity/ProductDetail.vm
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 3127 – Side effect of name changing of clients.

rajveer — Wed, 31 Aug 2011 20:14:56 +0530

rajveer – 5 file(s) modified
Side effect of name changing of clients.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/CatalogUploderToGAE.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java

Rev 2607 – Remove the empty space from the brand name, model number, ...

rajveer — Fri, 15 Jul 2011 16:39:45 +0530

rajveer – 1 file(s) modified
Remove the empty space from the brand name, model number, model name while storing in bdb

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 2424 – Modified to handle category at different levels

rajveer — Tue, 05 Jul 2011 11:37:52 +0530

rajveer – 5 file(s) modified
Modified to handle category at different levels

~ /trunk/ContentCreation/.classpath
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SlidesController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-edit.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-editNew.vm

Rev 2095 – 1) Display entities to be made ready. 2) Not allow ...

rajveer — Tue, 07 Jun 2011 15:14:07 +0530

rajveer – 3 file(s) modified
1) Display entities to be made ready. 2) Not allow to assign ready entities between 2 to 4

Rev 1176 – removed borrowed categoryid

rajveer — Tue, 29 Mar 2011 11:41:46 +0530

rajveer – 1 file(s) modified
removed borrowed categoryid

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 1152 – Modified the Login interceptor to point at root location. added ...

rajveer — Fri, 25 Mar 2011 17:36:47 +0530

rajveer – 21 file(s) modified
Modified the Login interceptor to point at root location. added images and css for view. Updated slidescontroller to remove duplicate slides problem. Update velocity files and EntityController to get only entitystate for view.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SlidesController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/interceptors/LoginInterceptor.java
~ /trunk/ContentCreation/src/main/webapp/css/common.css
+ /trunk/ContentCreation/src/main/webapp/images
+ /trunk/ContentCreation/src/main/webapp/images/actionbar-hor-bar.jpg
+ /trunk/ContentCreation/src/main/webapp/images/actionbar-left.jpg
+ /trunk/ContentCreation/src/main/webapp/images/actionbar-right.jpg
+ /trunk/ContentCreation/src/main/webapp/images/black-bullet.gif
+ /trunk/ContentCreation/src/main/webapp/images/grey-bullet.gif
+ /trunk/ContentCreation/src/main/webapp/images/mehron-square-bullet.gif
+ /trunk/ContentCreation/src/main/webapp/images/slideguide-content-bottom-center.jpg
+ /trunk/ContentCreation/src/main/webapp/images/slideguide-content-bottom-left.jpg
+ /trunk/ContentCreation/src/main/webapp/images/slideguide-content-bottom-right.jpg
+ /trunk/ContentCreation/src/main/webapp/images/slideguide-content-top-center.jpg
+ /trunk/ContentCreation/src/main/webapp/images/slideguide-content-top-left.jpg
+ /trunk/ContentCreation/src/main/webapp/images/slideguide-content-top-right.jpg
+ /trunk/ContentCreation/src/main/webapp/images/slideguide-nav-arrow.jpg
+ /trunk/ContentCreation/src/main/webapp/images/slideguide-nav-ver-bar.jpg
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 1081 – Moved Java sources to src/main/java

chandranshu — Mon, 21 Mar 2011 19:13:24 +0530

chandranshu – 9 file(s) modified
Moved Java sources to src/main/java

~ /trunk/ContentCreation/build.xml
x /trunk/ContentCreation/src/in
+ /trunk/ContentCreation/src/main
+ /trunk/ContentCreation/src/main/java
+ /trunk/ContentCreation/src/main/java/in (copied from /trunk/ContentCreation/src/in@1080)
+ /trunk/ContentCreation/src/main/resources
+ /trunk/ContentCreation/src/main/webapp
+ /trunk/ContentCreation/src/test
+ /trunk/ContentCreation/src/test/java

Rev 1051 – CMS tool updates after Bdb storage. Also added user management.

rajveer — Fri, 18 Mar 2011 13:04:49 +0530

rajveer – 19 file(s) modified
CMS tool updates after Bdb storage. Also added user management.

~ /trunk/ContentCreation/build.xml
+ /trunk/ContentCreation/src/in/shop2020/creation/controllers/BaseController.java
~ /trunk/ContentCreation/src/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/in/shop2020/creation/controllers/ItemUpdateController.java
+ /trunk/ContentCreation/src/in/shop2020/creation/controllers/LoginController.java
+ /trunk/ContentCreation/src/in/shop2020/creation/controllers/LogoutController.java
~ /trunk/ContentCreation/src/in/shop2020/creation/controllers/MediaController.java
~ /trunk/ContentCreation/src/in/shop2020/creation/controllers/SlidesController.java
+ /trunk/ContentCreation/src/in/shop2020/creation/interceptors
+ /trunk/ContentCreation/src/in/shop2020/creation/interceptors/LoginInterceptor.java
~ /trunk/ContentCreation/src/in/shop2020/creation/util/ContentValidator.java
~ /trunk/ContentCreation/src/jsp/index.jsp
~ /trunk/ContentCreation/src/velocity/entity-editSlide.vm
~ /trunk/ContentCreation/src/velocity/entity-index.vm
~ /trunk/ContentCreation/src/velocity/entity-show.vm
+ /trunk/ContentCreation/src/velocity/login-index.vm
~ /trunk/ContentCreation/src/velocity/media-index.vm
~ /trunk/ContentCreation/src/velocity/slides-edit.vm
~ /trunk/ContentCreation/src/xml/config/struts.xml