SmartDukaan – /

Rev 1516 – Removed ga invocation from all.js so that it'll not be ...

chandranshu — Tue, 26 Apr 2011 10:39:19 +0530

chandranshu – 4 file(s) modified
Removed ga invocation from all.js so that it'll not be included in the dev environment

~ /trunk/Website/build.xml
~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/webapp/js/all.js
+ /trunk/Website/src/main/webapp/js/ga-invoker.js

Rev 1515 – added tarita as user

rajveer — Mon, 25 Apr 2011 15:32:30 +0530

rajveer – 1 file(s) modified
added tarita as user

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

Rev 1514 – Handle the case where user has not configured any address.

vikas — Mon, 25 Apr 2011 15:18:16 +0530

vikas – 1 file(s) modified
Handle the case where user has not configured any address.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java

Rev 1513 – Copy thumbnail.jpg. Needed for cart page

rajveer — Mon, 25 Apr 2011 15:16:21 +0530

rajveer – 1 file(s) modified
Copy thumbnail.jpg. Needed for cart page

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

Rev 1512 – New handsets list for 23rd April

chandranshu — Mon, 25 Apr 2011 13:58:29 +0530

chandranshu – 1 file(s) modified
New handsets list for 23rd April

+ /trunk/PyProj/src/samplesheets/ItemList-Handset-23-Apr-2011.xls

Rev 1511 – Website should create users for only requests coming from browsers

rajveer — Mon, 25 Apr 2011 13:54:20 +0530

rajveer – 4 file(s) modified
Website should create users for only requests coming from browsers

~ /trunk/Website/build.xml
~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 1510 – modified pox.xml

rajveer — Mon, 25 Apr 2011 13:52:52 +0530

rajveer – 1 file(s) modified
modified pox.xml

~ /trunk/thirdparty/pom.xml

Rev 1509 – Added useragentutils

rajveer — Mon, 25 Apr 2011 13:50:27 +0530

rajveer – 5 file(s) modified
Added useragentutils

~ /trunk/thirdparty/pom.xml
+ /trunk/thirdparty/readonly/UserAgentUtils
+ /trunk/thirdparty/readonly/UserAgentUtils/UserAgentUtils-1.2.3.jar
+ /trunk/thirdparty/src/main/resources/readonly/UserAgentUtils
+ /trunk/thirdparty/src/main/resources/readonly/UserAgentUtils/UserAgentUtils-1.2.3.jar

Rev 1508 – Added missed < tag in slideguide

rajveer — Mon, 25 Apr 2011 12:40:36 +0530

rajveer – 4 file(s) modified
Added missed < tag in slideguide

~ /trunk/ContentStore/src/velocity/slideguide_img_video.vm
~ /trunk/ContentStore/src/xml/model/comparisonbuckets.xml
~ /trunk/ContentStore/src/xml/model/comparisondefinitions.xml
~ /trunk/ContentStore/src/xml/model/comparisonrules.xml

Rev 1507 – Adding the new catalog sheet to svn

chandranshu — Mon, 25 Apr 2011 12:23:06 +0530

chandranshu – 1 file(s) modified
Adding the new catalog sheet to svn

+ /trunk/PyProj/src/samplesheets/ItemList-Handset-21-Apr-2011.xls

Rev 1506 – Updated item loader to update preferred warehouse

chandranshu — Mon, 25 Apr 2011 12:22:24 +0530

chandranshu – 2 file(s) modified
Updated item loader to update preferred warehouse

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

Rev 1505 – Enabled the build to fail if any one test fails

chandranshu — Thu, 21 Apr 2011 19:36:53 +0530

chandranshu – 1 file(s) modified
Enabled the build to fail if any one test fails

~ /trunk/Website/build.xml

Rev 1504 – Ref:[Ticket#276] -- Enhancements to select the logistics provider. Provider has ...

ankur.singhal — Thu, 21 Apr 2011 19:22:24 +0530

ankur.singhal – 6 file(s) modified
Ref:[Ticket#276] -- Enhancements to select the logistics provider. Provider has to be taken from Courier_Logic.xls sheet where corresponding to a destination pincode and warehouse location, a provider is defined.

+ /trunk/PyProj/src/samplesheets/Courier_Logic.xls
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
+ /trunk/PyProj/src/shop2020/logistics/service/script/DestinationProviderAllocationLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/test/Test.py

Rev 1503 – Corrected the test HTMLs for the product page

chandranshu — Thu, 21 Apr 2011 17:50:36 +0530

chandranshu – 3 file(s) modified
Corrected the test HTMLs for the product page

~ /trunk/Website/src/test/samples/product/test1.html
~ /trunk/Website/src/test/samples/product/test3.html
~ /trunk/Website/src/test/samples/product/test4.html

Rev 1502 – Corrected login test HTMLs

chandranshu — Thu, 21 Apr 2011 17:46:23 +0530

chandranshu – 4 file(s) modified
Corrected login test HTMLs

~ /trunk/Website/src/test/samples/login/test1.html
~ /trunk/Website/src/test/samples/login/test2.html
~ /trunk/Website/src/test/samples/login/test4.html
~ /trunk/Website/src/test/samples/login/test5.html

Rev 1501 – Corrected the register test htmls

chandranshu — Thu, 21 Apr 2011 17:41:47 +0530

chandranshu – 6 file(s) modified
Corrected the register test htmls

~ /trunk/Website/src/test/samples/register/test1.html
~ /trunk/Website/src/test/samples/register/test17.html
~ /trunk/Website/src/test/samples/register/test20.html
~ /trunk/Website/src/test/samples/register/test21.html
~ /trunk/Website/src/test/samples/register/test23.html
~ /trunk/Website/src/test/samples/register/test24.html

Rev 1500 – Corrected the search results

chandranshu — Thu, 21 Apr 2011 17:36:14 +0530

chandranshu – 3 file(s) modified
Corrected the search results

~ /trunk/Website/src/test/samples/searching/test1.html
~ /trunk/Website/src/test/samples/searching/test10.html
~ /trunk/Website/src/test/samples/searching/test34.html

Rev 1499 – Suppressed the noisy .svn diff from the test output

chandranshu — Thu, 21 Apr 2011 17:29:19 +0530

chandranshu – 1 file(s) modified
Suppressed the noisy .svn diff from the test output

~ /trunk/Website/build.xml

Rev 1498 – Cleanup and some formatting changes.

vikas — Thu, 21 Apr 2011 17:22:12 +0530

vikas – 1 file(s) modified
Cleanup and some formatting changes.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java

Rev 1497 – Compensated the changes made in the the commoncssfiles.vm and commonjsfiles.vm ...

chandranshu — Thu, 21 Apr 2011 17:21:51 +0530

chandranshu – 5 file(s) modified
Compensated the changes made in the the commoncssfiles.vm and commonjsfiles.vm for category page tests

~ /trunk/Website/src/test/samples/categorypage/test1.html
~ /trunk/Website/src/test/samples/categorypage/test24.html
~ /trunk/Website/src/test/samples/categorypage/test29.html
~ /trunk/Website/src/test/samples/categorypage/test30.html
~ /trunk/Website/src/test/samples/categorypage/test31.html

Rev 1496 – Corrected the HTML of forgotpass tests

chandranshu — Thu, 21 Apr 2011 17:15:20 +0530

chandranshu – 2 file(s) modified
Corrected the HTML of forgotpass tests

~ /trunk/Website/src/test/samples/forgotpass/test1.html
~ /trunk/Website/src/test/samples/forgotpass/test18.html

Rev 1495 – Corrected cart tests

chandranshu — Thu, 21 Apr 2011 17:11:56 +0530

chandranshu – 3 file(s) modified
Corrected cart tests

~ /trunk/Website/src/test/samples/cart/test1.html
~ /trunk/Website/src/test/samples/cart/test3.html
~ /trunk/Website/src/test/samples/cart/test4.html

Rev 1494 – User orders report.

vikas — Thu, 21 Apr 2011 16:50:17 +0530

vikas – 2 file(s) modified
User orders report.

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/user-orders-report.vm

Rev 1493 – Return all transactions/payments when status passed is None.

vikas — Thu, 21 Apr 2011 16:49:04 +0530

vikas – 2 file(s) modified
Return all transactions/payments when status passed is None.

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

Rev 1492 – Corrected the home.jmx file to send the request for ga.js ...

chandranshu — Thu, 21 Apr 2011 16:25:53 +0530

chandranshu – 4 file(s) modified
Corrected the home.jmx file to send the request for ga.js on the correct port

~ /trunk/Website/src/test/jmeter/home.jmx
~ /trunk/Website/src/test/samples/home/test1.html
+ /trunk/Website/src/test/samples/home/test18.javascript
x /trunk/Website/src/test/samples/home/test18.unknown

Rev 1491 – Add getUserByEmaill in userservice.

vikas — Thu, 21 Apr 2011 16:00:01 +0530

vikas – 6 file(s) modified
Add getUserByEmaill in userservice.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 1490 – Ensured that ie7.css and ie8.css are also downloaded using the ...

chandranshu — Thu, 21 Apr 2011 15:34:56 +0530

chandranshu – 1 file(s) modified
Ensured that ie7.css and ie8.css are also downloaded using the right URLs

~ /trunk/Website/src/production/resources/templates/commoncssfiles.vm

Rev 1489 – Added support to use different hostnames while building for different ...

chandranshu — Thu, 21 Apr 2011 14:56:47 +0530

chandranshu – 3 file(s) modified
Added support to use different hostnames while building for different environments

~ /trunk/Website/pom.xml
~ /trunk/Website/src/production/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/production/resources/templates/commonjsfiles.vm

Rev 1488 – Workbench for jmeter.

vikas — Thu, 21 Apr 2011 14:53:53 +0530

vikas – 1 file(s) modified
Workbench for jmeter.

+ /trunk/Website/src/test/jmeter/WorkBench.jmx

Rev 1487 – Added a profile to minify CSS and JS and modify ...

chandranshu — Thu, 21 Apr 2011 12:58:59 +0530

chandranshu – 1 file(s) modified
Added a profile to minify CSS and JS and modify commoncssfiles and commonjsfiles to link to the minified files

~ /trunk/Website/pom.xml

Rev 1486 – Correctly renamed the dev folder to be production

chandranshu — Thu, 21 Apr 2011 12:02:28 +0530

chandranshu – 2 file(s) modified
Correctly renamed the dev folder to be production

x /trunk/Website/src/dev
+ /trunk/Website/src/production (copied from /trunk/Website/src/dev@1484)

Rev 1485 – hyphen added to skin image

rajveer — Thu, 21 Apr 2011 12:01:44 +0530

rajveer – 1 file(s) modified
hyphen added to skin image

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

Rev 1484 – Changed the default resources to use separate CSS and JS ...

chandranshu — Thu, 21 Apr 2011 11:58:12 +0530

chandranshu – 4 file(s) modified
Changed the default resources to use separate CSS and JS files

~ /trunk/Website/src/dev/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/dev/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm

Rev 1483 – Logic for selecting cancellable orders modified in get_cancellable_orders_for_customer()

varun.gupta — Thu, 21 Apr 2011 11:38:17 +0530

varun.gupta – 1 file(s) modified
Logic for selecting cancellable orders modified in get_cancellable_orders_for_customer()

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

Rev 1482 – Different css and js configuration for development environment

chandranshu — Thu, 21 Apr 2011 11:22:37 +0530

chandranshu – 5 file(s) modified
Different css and js configuration for development environment

+ /trunk/Website/src/dev
+ /trunk/Website/src/dev/resources
+ /trunk/Website/src/dev/resources/templates
+ /trunk/Website/src/dev/resources/templates/commoncssfiles.vm
+ /trunk/Website/src/dev/resources/templates/commonjsfiles.vm

Rev 1481 – In case user doesn't have relevant orders, the communication type ...

varun.gupta — Thu, 21 Apr 2011 08:51:45 +0530

varun.gupta – 2 file(s) modified
In case user doesn't have relevant orders, the communication type will be disabled.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
~ /trunk/Website/src/main/webapp/js/contact-us.js

Rev 1480 – Updated footer links

rajveer — Wed, 20 Apr 2011 21:24:37 +0530

rajveer – 1 file(s) modified
Updated footer links

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

Rev 1479 – reconciliation of undelivered reports done till last midnight instead of ...

ankur.singhal — Wed, 20 Apr 2011 18:57:27 +0530

ankur.singhal – 1 file(s) modified
reconciliation of undelivered reports done till last midnight instead of current time as courier company would have sent the records updated till midnight.

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

Rev 1478 – Fixed the spacing issue

rajveer — Wed, 20 Apr 2011 18:39:05 +0530

rajveer – 1 file(s) modified
Fixed the spacing issue

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

Rev 1477 – updated category to show pagination at bottom also

rajveer — Wed, 20 Apr 2011 18:18:10 +0530

rajveer – 1 file(s) modified
updated category to show pagination at bottom also

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