SmartDukaan – /

Rev 1338 – Moved action message to proper place

rajveer — Fri, 08 Apr 2011 18:42:11 +0530

rajveer – 1 file(s) modified
Moved action message to proper place

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

Rev 1337 – Removed password from web.xml. Corrected title of Forgot password page

rajveer — Fri, 08 Apr 2011 18:16:31 +0530

rajveer – 2 file(s) modified
Removed password from web.xml. Corrected title of Forgot password page

~ /trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/web.xml

Rev 1336 – Added orphan files

rajveer — Fri, 08 Apr 2011 17:56:59 +0530

rajveer – 18 file(s) modified
Added orphan files

+ /prototype/consetup.py
+ /prototype/description
+ /prototype/extra
+ /prototype/forms.py
+ /prototype/forms_initiate.py
+ /prototype/mail.py
+ /prototype/mail.pyc
+ /prototype/runindiaplaza.py
+ /prototype/runinfibeam.py
+ /prototype/runmobstore.py
+ /prototype/test.py
+ /prototype/tg2/src/devdata.db
~ /prototype/tg2/src/development.ini
~ /prototype/tg2/src/wiki20/controllers/root.py
~ /prototype/tg2/src/wiki20/development.ini
~ /prototype/tg2/src/wiki20/launch_tg.py
+ /prototype/tg2/src/wiki20/templates/about1.html
~ /prototype/tg2/src/wiki20/templates/index.html

Rev 1335 – compress js and css.

vikas — Fri, 08 Apr 2011 16:43:39 +0530

vikas – 1 file(s) modified
compress js and css.

~ /trunk/Website/pom.xml

Rev 1334 – Added the catalog for 7th April

chandranshu — Fri, 08 Apr 2011 16:39:41 +0530

chandranshu – 6 file(s) modified
Added the catalog for 7th April

+ /trunk/PyProj/src/samplesheets/ItemList-Handset-07-Apr-2011.xls
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py

Rev 1333 – Fixed CSS and JS

varun.gupta — Fri, 08 Apr 2011 15:22:50 +0530

varun.gupta – 3 file(s) modified
Fixed CSS and JS

~ /trunk/Website/src/main/webapp/css/contactus.css
~ /trunk/Website/src/main/webapp/js/custom-jquery.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm

Rev 1332 – remove empty lines and extra bullets.

vikas — Fri, 08 Apr 2011 14:22:10 +0530

vikas – 1 file(s) modified
remove empty lines and extra bullets.

~ /trunk/ContentStore/src/velocity/slideguide_img_video.vm

Rev 1331 –

varun.gupta — Fri, 08 Apr 2011 13:28:47 +0530

varun.gupta – 1 file(s) modified

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

Rev 1330 – Added new catalog service types

chandranshu — Fri, 08 Apr 2011 13:28:33 +0530

chandranshu – 1 file(s) modified
Added new catalog service types

~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 1329 – Committing new catalog types

chandranshu — Fri, 08 Apr 2011 13:27:47 +0530

chandranshu – 5 file(s) modified
Committing new catalog types

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/status.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Vendor.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseLocation.java

Rev 1328 – Committing new catalog types

chandranshu — Fri, 08 Apr 2011 13:27:24 +0530

chandranshu – 2 file(s) modified
Committing new catalog types

+ /trunk/PyProj/src/shop2020/model/v1/catalog/script/VendorItemKeyGenerator.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py

Rev 1327 – Added logic to populate transfer price while creating order

rajveer — Fri, 08 Apr 2011 13:03:31 +0530

rajveer – 1 file(s) modified
Added logic to populate transfer price while creating order

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 1326 – Remove empty li's appearing in product slides.

vikas — Fri, 08 Apr 2011 12:56:45 +0530

vikas – 1 file(s) modified
Remove empty li's appearing in product slides.

~ /trunk/ContentStore/src/velocity/slideguide_img_video.vm

Rev 1325 – 'Like Button' behaviour rolled back

varun.gupta — Fri, 08 Apr 2011 12:43:51 +0530

varun.gupta – 3 file(s) modified
'Like Button' behaviour rolled back

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/resources/templates/socialutils.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 1324 – Added logic to populate transfer price while creating order

rajveer — Fri, 08 Apr 2011 12:36:25 +0530

rajveer – 1 file(s) modified
Added logic to populate transfer price while creating order

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 1323 – OG tags commented

varun.gupta — Fri, 08 Apr 2011 12:11:30 +0530

varun.gupta – 1 file(s) modified
OG tags commented

~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 1322 – Changed Invoice format as per the new requirements

chandranshu — Fri, 08 Apr 2011 11:23:30 +0530

chandranshu – 1 file(s) modified
Changed Invoice format as per the new requirements

~ /trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java

Rev 1321 – Started escaping XML entities for brand and model as well

chandranshu — Fri, 08 Apr 2011 11:22:02 +0530

chandranshu – 1 file(s) modified
Started escaping XML entities for brand and model as well

~ /trunk/ClientAgent/src/main/java/in/shop2020/agent/utils/Agent.java

Rev 1320 – Removed the check about increasing MRPs

chandranshu — Fri, 08 Apr 2011 11:20:40 +0530

chandranshu – 1 file(s) modified
Removed the check about increasing MRPs

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

Rev 1319 – Changed the best selling loader as per the received info

chandranshu — Thu, 07 Apr 2011 18:09:10 +0530

chandranshu – 1 file(s) modified
Changed the best selling loader as per the received info

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

Rev 1318 – Moved hdfcpayment service from controller to Service class

rajveer — Thu, 07 Apr 2011 17:27:09 +0530

rajveer – 3 file(s) modified
Moved hdfcpayment service from controller to Service class

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/order-success.vm

Rev 1317 –

varun.gupta — Thu, 07 Apr 2011 16:09:48 +0530

varun.gupta – 1 file(s) modified

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

Rev 1316 – Fixed 'Shipping Updates' issue (#Ticket 269). Fixed 'Completed Orders' page.

varun.gupta — Thu, 07 Apr 2011 16:09:06 +0530

varun.gupta – 5 file(s) modified
Fixed 'Shipping Updates' issue (#Ticket 269). Fixed 'Completed Orders' page.

~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/completedorders.vm
~ /trunk/Website/src/main/resources/templates/myaccount.vm
~ /trunk/Website/src/main/resources/templates/orderdetails.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/bluedart-updates-show.vm

Rev 1315 – updated XSD for new facet metamodel

rajveer — Thu, 07 Apr 2011 15:47:29 +0530

rajveer – 1 file(s) modified
updated XSD for new facet metamodel

~ /trunk/ContentStore/src/xml/metamodel/facets.xsd

Rev 1314 – Definitions and other utility file changes for new facet metamodel

rajveer — Thu, 07 Apr 2011 15:46:22 +0530

rajveer – 13 file(s) modified
Definitions and other utility file changes for new facet metamodel

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/definitions/CategoryFacetDefinition.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/definitions/DefinitionsContainer.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/definitions/FacetDefinition.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/definitions/FacetSlideDefinition.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ExpandedCategoryFacetDefinition.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ExpandedFacetDefinition.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ExpandedFacetSlideDefinition.java (copied from /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ExpandedFacetDefinition.java@1231)
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ExpandedFeature.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/MM.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/IR.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/IRDataJythonWrapper.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/IRMetaDataJythonWrapper.java

Rev 1313 – jaxb model changes corresponding to new facet model

rajveer — Thu, 07 Apr 2011 15:44:59 +0530

rajveer – 8 file(s) modified
jaxb model changes corresponding to new facet model

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/jaxb/facets/CategoryFacetDefinitionType.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/jaxb/facets/FacetDefinitionType.java
x /trunk/ContentStore/src/main/java/in/shop2020/metamodel/jaxb/facets/FacetRuleDefinitionType.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/jaxb/facets/FacetSlideDefinitionType.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/jaxb/facets/IRDefinitionType.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/jaxb/facets/ObjectFactory.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/jaxb/facets/package-info.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/jaxb/facets/RuleDefinitionType.java

Rev 1312 – Updated Jython scripts according to new facet definitions model

rajveer — Thu, 07 Apr 2011 15:38:49 +0530

rajveer – 30 file(s) modified
Updated Jython scripts according to new facet definitions model

+ /trunk/ContentStore/src/jython/irdatarules/basic-data-connectivity.py
~ /trunk/ContentStore/src/jython/irdatarules/battery-capacity-talktime.py
~ /trunk/ContentStore/src/jython/irdatarules/brand.py
~ /trunk/ContentStore/src/jython/irdatarules/built-in-memory.py
~ /trunk/ContentStore/src/jython/irdatarules/camera-resolution.py
+ /trunk/ContentStore/src/jython/irdatarules/cellular-technologies.py
+ /trunk/ContentStore/src/jython/irdatarules/data-connectivity.py
+ /trunk/ContentStore/src/jython/irdatarules/form-factor.py
~ /trunk/ContentStore/src/jython/irdatarules/main-category.py
~ /trunk/ContentStore/src/jython/irdatarules/price.py
~ /trunk/ContentStore/src/jython/irdatarules/sub-category.py
+ /trunk/ContentStore/src/jython/irmetadatarules/basic-data-connectivity.py
+ /trunk/ContentStore/src/jython/irmetadatarules/battery-capacity-talktime.py (copied from /trunk/ContentStore/src/jython/irmetadatarules/talk_time.py@1231)
+ /trunk/ContentStore/src/jython/irmetadatarules/brand.py
+ /trunk/ContentStore/src/jython/irmetadatarules/built-in-memory.py (copied from /trunk/ContentStore/src/jython/irmetadatarules/built_in_memory.py@1231)
x /trunk/ContentStore/src/jython/irmetadatarules/built_in_memory.py
+ /trunk/ContentStore/src/jython/irmetadatarules/camera-resolution.py (copied from /trunk/ContentStore/src/jython/irmetadatarules/camera_resolution.py@1231)
x /trunk/ContentStore/src/jython/irmetadatarules/camera_resolution.py
+ /trunk/ContentStore/src/jython/irmetadatarules/carry-in-pocket.py (copied from /trunk/ContentStore/src/jython/irmetadatarules/carry_in_pocket.py@1231)
x /trunk/ContentStore/src/jython/irmetadatarules/carry_in_pocket.py
+ /trunk/ContentStore/src/jython/irmetadatarules/cellular-technologies.py
+ /trunk/ContentStore/src/jython/irmetadatarules/data-connectivity.py
+ /trunk/ContentStore/src/jython/irmetadatarules/form-factor.py
+ /trunk/ContentStore/src/jython/irmetadatarules/irmeta-featuredefinition.py (copied from /trunk/ContentStore/src/jython/irmetadatarules/irmeta_featuredefinition.py@1231)
+ /trunk/ContentStore/src/jython/irmetadatarules/irmeta-slidedefinition.py (copied from /trunk/ContentStore/src/jython/irmetadatarules/irmeta_slidedefinition.py@1231)
x /trunk/ContentStore/src/jython/irmetadatarules/irmeta_featuredefinition.py
x /trunk/ContentStore/src/jython/irmetadatarules/irmeta_slidedefinition.py
+ /trunk/ContentStore/src/jython/irmetadatarules/main-category.py
+ /trunk/ContentStore/src/jython/irmetadatarules/sub-category.py
x /trunk/ContentStore/src/jython/irmetadatarules/talk_time.py

Rev 1311 – modified facet definitions for new structure

rajveer — Thu, 07 Apr 2011 15:36:21 +0530

rajveer – 7 file(s) modified
modified facet definitions for new structure

~ /trunk/ContentStore/src/xml/model/categoryfacetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/irdatarules.xml
~ /trunk/ContentStore/src/xml/model/irmetadatarules.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml
~ /trunk/ContentStore/src/xml/model/users.xml

Rev 1310 – Display related bugs fixed for 'Completed Orders' page.

varun.gupta — Thu, 07 Apr 2011 13:26:28 +0530

varun.gupta – 2 file(s) modified
Display related bugs fixed for 'Completed Orders' page.

~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/completedorders.vm

Rev 1309 –

varun.gupta — Thu, 07 Apr 2011 11:51:53 +0530

varun.gupta – 1 file(s) modified

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

Rev 1308 – Added the new tables needed to move vendor specific information ...

chandranshu — Thu, 07 Apr 2011 11:46:36 +0530

chandranshu – 5 file(s) modified
Added the new tables needed to move vendor specific information out of the item table

~ /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
x /trunk/PyProj/src/shop2020/model/v1/catalog/impl/inventory.sqlite
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py

Rev 1307 – Validation added for Contact Us form

varun.gupta — Wed, 06 Apr 2011 19:36:39 +0530

varun.gupta – 2 file(s) modified
Validation added for Contact Us form

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

Rev 1306 – Added /screen-guard as a URL to the category controller

chandranshu — Wed, 06 Apr 2011 18:50:35 +0530

chandranshu – 1 file(s) modified
Added /screen-guard as a URL to the category controller

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

Rev 1305 – Added SQL script to recreate all test databases. Added config ...

chandranshu — Wed, 06 Apr 2011 17:54:12 +0530

chandranshu – 2 file(s) modified
Added SQL script to recreate all test databases. Added config file from Common Temp to ensure that all services start against test databases

+ /trunk/Website/src/test/resources/db/create-databases.sql
~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 1304 – Added screen guard in the list of categories

chandranshu — Wed, 06 Apr 2011 17:52:13 +0530

chandranshu – 1 file(s) modified
Added screen guard in the list of categories

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

Rev 1303 –

varun.gupta — Wed, 06 Apr 2011 17:23:10 +0530

varun.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py

Rev 1302 –

varun.gupta — Wed, 06 Apr 2011 17:20:13 +0530

varun.gupta – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserCommunication.java

Rev 1301 – Current timestamp now getting stored with every new user communication

varun.gupta — Wed, 06 Apr 2011 17:16:58 +0530

varun.gupta – 2 file(s) modified
Current timestamp now getting stored with every new user communication

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py

Rev 1300 – Added provision to generate content for one item

rajveer — Wed, 06 Apr 2011 17:13:22 +0530

rajveer – 1 file(s) modified
Added provision to generate content for one item

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

Rev 1299 – field renamed to 'communication_timestamp'

varun.gupta — Wed, 06 Apr 2011 17:04:33 +0530

varun.gupta – 1 file(s) modified
field renamed to 'communication_timestamp'

~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift