SmartDukaan – /

Rev 3313 – Added more sources

varun.gupta — Thu, 15 Sep 2011 12:25:39 +0530

varun.gupta – 7 file(s) modified
Added more sources

~ /trunk/PriceComparisonFramework/src/PyLucene/IndexBuilder.py
+ /trunk/PriceComparisonFramework/src/PyLucene/IndexManager.py
~ /trunk/PriceComparisonFramework/src/PyLucene/Retriever.py
~ /trunk/PriceComparisonFramework/src/Utils.py
~ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/PriceChart.html
~ /trunk/PriceComparisonFramework/src/WebUI/Server.py
~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.js

Rev 3312 – Just added a javascript check when people leave captcha empty. ...

chandranshu — Thu, 15 Sep 2011 12:06:35 +0530

chandranshu – 4 file(s) modified
Just added a javascript check when people leave captcha empty. Added a friendlier message on the shipping page when the location is not serviceable. Deleted the long obsolete HdfcPayController

x /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayController.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 3311 – Changed the logger class name

chandranshu — Thu, 15 Sep 2011 11:56:24 +0530

chandranshu – 2 file(s) modified
Changed the logger class name

~ /trunk/Website/src/main/java/in/shop2020/serving/mappers/SaholicMapper.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SpecialPageConfigurer.java

Rev 3310 – Added NPE check.

rajveer — Thu, 15 Sep 2011 11:45:28 +0530

rajveer – 1 file(s) modified
Added NPE check.

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

Rev 3309 – send notification if item is active.

rajveer — Thu, 15 Sep 2011 11:36:49 +0530

rajveer – 1 file(s) modified
send notification if item is active.

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

Rev 3308 – Rule for DesiDime campaign added

varun.gupta — Wed, 14 Sep 2011 21:11:03 +0530

varun.gupta – 1 file(s) modified
Rule for DesiDime campaign added

+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_DesiDime_campaign.py

Rev 3307 – Correctrd FB App ID

varun.gupta — Wed, 14 Sep 2011 20:04:18 +0530

varun.gupta – 1 file(s) modified
Correctrd FB App ID

~ /trunk/Social/src/main/webapp/js/bb-promo.js

Rev 3306 – Added note and some CSS styles

varun.gupta — Wed, 14 Sep 2011 19:59:37 +0530

varun.gupta – 3 file(s) modified
Added note and some CSS styles

~ /trunk/Social/src/main/webapp/css/community-promotion.css
~ /trunk/Social/src/main/webapp/js/bb-promo.js
~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-bb-promo.vm

Rev 3305 – Added GA event on helpdocs click.

rajveer — Wed, 14 Sep 2011 19:48:51 +0530

rajveer – 1 file(s) modified
Added GA event on helpdocs click.

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

Rev 3304 – Updated URI and some changes in vm file.

rajveer — Wed, 14 Sep 2011 19:33:53 +0530

rajveer – 3 file(s) modified
Updated URI and some changes in vm file.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/brand-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 3303 – Added our own mapper so that we can map all ...

rajveer — Wed, 14 Sep 2011 18:59:02 +0530

rajveer – 5 file(s) modified
Added our own mapper so that we can map all our special pages to SpecialPageController.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/mappers
+ /trunk/Website/src/main/java/in/shop2020/serving/mappers/SaholicMapper.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/SpecialPageConfigurer.java
~ /trunk/Website/src/main/resources/struts.xml

Rev 3302 – Features enabling Sharing are added

varun.gupta — Wed, 14 Sep 2011 18:30:59 +0530

varun.gupta – 3 file(s) modified
Features enabling Sharing are added

~ /trunk/Social/src/main/webapp/css/community-promotion.css
~ /trunk/Social/src/main/webapp/js/bb-promo.js
~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-bb-promo.vm

Rev 3301 – One more color added for BB Curve 8520

varun.gupta — Wed, 14 Sep 2011 17:33:03 +0530

varun.gupta – 1 file(s) modified
One more color added for BB Curve 8520

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_BB_campaign.py

Rev 3300 – 'Tell a friend' hidden

varun.gupta — Wed, 14 Sep 2011 17:29:27 +0530

varun.gupta – 1 file(s) modified
'Tell a friend' hidden

~ /trunk/Social/src/main/webapp/css/community-promotion.css

Rev 3299 – BB911 coupon rule

varun.gupta — Wed, 14 Sep 2011 17:19:44 +0530

varun.gupta – 1 file(s) modified
BB911 coupon rule

+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_BB_campaign.py

Rev 3298 – Blackberry campaign

varun.gupta — Wed, 14 Sep 2011 17:06:18 +0530

varun.gupta – 6 file(s) modified
Blackberry campaign

~ /trunk/Social/src/main/java/in/shop2020/social/controllers/CommunityPromotionController.java
~ /trunk/Social/src/main/webapp/css/community-promotion.css
~ /trunk/Social/src/main/webapp/images/community-promo-banner-like.jpg
~ /trunk/Social/src/main/webapp/images/community-promo-banner-unlike.jpg
+ /trunk/Social/src/main/webapp/js/bb-promo.js
+ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-bb-promo.vm

Rev 3297 – Remove offheap and on disk cache-element-counts from stats report, as ...

vikas — Wed, 14 Sep 2011 16:28:30 +0530

vikas – 2 file(s) modified
Remove offheap and on disk cache-element-counts from stats report, as we are not using them.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CacheAdminController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/cache-admin-index.vm

Rev 3296 – Changes to make payment service run on both servers.

rajveer — Wed, 14 Sep 2011 16:18:01 +0530

rajveer – 2 file(s) modified
Changes to make payment service run on both servers.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/runutils/run-payment-service.sh

Rev 3295 – Increase max elements limit for product search and category snippets.

vikas — Wed, 14 Sep 2011 15:50:44 +0530

vikas – 1 file(s) modified
Increase max elements limit for product search and category snippets.

~ /trunk/Website/src/main/resources/ehcache.xml

Rev 3294 – Checking for null value of id in case of index ...

rajveer — Wed, 14 Sep 2011 15:41:49 +0530

rajveer – 1 file(s) modified
Checking for null value of id in case of index page.

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

Rev 3293 – Make affiliate report secured. Added date range filter for reports.

vikas — Wed, 14 Sep 2011 15:38:09 +0530

vikas – 8 file(s) modified
Make affiliate report secured. Added date range filter for reports.

~ /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/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/affiliate-report.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 3292 – FIx the logic for fromDate and toDate in daily aggregation ...

vikas — Wed, 14 Sep 2011 14:03:32 +0530

vikas – 1 file(s) modified
FIx the logic for fromDate and toDate in daily aggregation report.

~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/DailyAggregatorServlet.java

Rev 3291 – Added a jar for simple captcha

chandranshu — Wed, 14 Sep 2011 14:02:51 +0530

chandranshu – 5 file(s) modified
Added a jar for simple captcha

+ /thirdparty/src/main/resources/readonly/nl
+ /thirdparty/src/main/resources/readonly/nl/captcha
+ /thirdparty/src/main/resources/readonly/nl/captcha/SimpleCaptcha
+ /thirdparty/src/main/resources/readonly/nl/captcha/SimpleCaptcha/1.2.1
+ /thirdparty/src/main/resources/readonly/nl/captcha/SimpleCaptcha/1.2.1/SimpleCaptcha-1.2.1.jar

Rev 3290 – Added CRM server configuration, so that website can connect to ...

rajveer — Wed, 14 Sep 2011 13:56:57 +0530

rajveer – 1 file(s) modified
Added CRM server configuration, so that website can connect to CRM service running on support machine.

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

Rev 3289 – Make sure only active similar items are shown.

rajveer — Wed, 14 Sep 2011 13:30:46 +0530

rajveer – 1 file(s) modified
Make sure only active similar items are shown.

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

Rev 3288 – Generating inventory report for warehouse 5 as well

chandranshu — Wed, 14 Sep 2011 13:13:02 +0530

chandranshu – 1 file(s) modified
Generating inventory report for warehouse 5 as well

~ /trunk/runutils/daily-inventory-report.sh

Rev 3287 – Restarting the tomcat at the end of content update to ...

rajveer — Wed, 14 Sep 2011 12:21:07 +0530

rajveer – 2 file(s) modified
Restarting the tomcat at the end of content update to clear the cache

~ /trunk/runutils/update-content-and-catalog.sh
~ /trunk/runutils/update-content.sh

Rev 3286 – Mark source as paid if afid is 6.

vikas — Tue, 13 Sep 2011 18:02:10 +0530

vikas – 1 file(s) modified
Mark source as paid if afid is 6.

~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java

Rev 3285 – Revert accidental timing change in cron.

vikas — Tue, 13 Sep 2011 17:48:00 +0530

vikas – 1 file(s) modified
Revert accidental timing change in cron.

~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/cron.xml

Rev 3284 – Add graph for product-activiy.

vikas — Tue, 13 Sep 2011 17:12:26 +0530

vikas – 78 file(s) modified
Add graph for product-activiy.

+ /trunk/GoogleAppDatalog/src/main/webapp/js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/API.txt
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/ajax.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/annotating.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/arrow-down.gif
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/arrow-left.gif
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/arrow-right.gif
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/arrow-up.gif
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/basic.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/data-eu-gdp-growth-1.json
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/data-eu-gdp-growth-2.json
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/data-eu-gdp-growth-3.json
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/data-eu-gdp-growth-4.json
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/data-eu-gdp-growth-5.json
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/data-eu-gdp-growth.json
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/data-japan-gdp-growth.json
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/data-usa-gdp-growth.json
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/graph-types.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/hs-2004-27-a-large_web.jpg
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/image.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/index.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/interacting-axes.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/interacting.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/layout.css
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/multiple-axes.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/navigate.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/percentiles.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/pie.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/realtime.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/resize.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/selection.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/setting-options.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/stacking.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/symbols.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/thresholding.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/time.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/tracking.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/turning-series.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/visitors.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/examples/zooming.html
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/excanvas.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/excanvas.min.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/FAQ.txt
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.colorhelpers.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.colorhelpers.min.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.crosshair.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.crosshair.min.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.fillbetween.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.fillbetween.min.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.image.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.image.min.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.min.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.navigate.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.navigate.min.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.pie.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.pie.min.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.resize.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.resize.min.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.selection.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.selection.min.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.stack.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.stack.min.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.symbol.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.symbol.min.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.threshold.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.flot.threshold.min.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/jquery.min.js
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/LICENSE.txt
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/Makefile
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/NEWS.txt
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/PLUGINS.txt
+ /trunk/GoogleAppDatalog/src/main/webapp/js/flot/README.txt
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/product-activity.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/cron.xml

Rev 3283 – Added support of auto complete feature while searching.

rajveer — Tue, 13 Sep 2011 16:33:04 +0530

rajveer – 11 file(s) modified
Added support of auto complete feature while searching.

~ /trunk/Website/pom.xml
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AutoSuggestController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/AutoSuggestService.java
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/resources/templates/searchbar.vm
~ /trunk/Website/src/main/webapp/css/jquery.ui.autocomplete.css
+ /trunk/Website/src/main/webapp/images/ui-bg_glass_100_fdf5ce_1x400.png
~ /trunk/Website/src/main/webapp/js/all.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/auto-suggest-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 3282 – Removed unused declarations

chandranshu — Tue, 13 Sep 2011 15:35:20 +0530

chandranshu – 1 file(s) modified
Removed unused declarations

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java

Rev 3281 – Mark an item as inactive when performing the isactive check

chandranshu — Tue, 13 Sep 2011 15:32:46 +0530

chandranshu – 1 file(s) modified
Mark an item as inactive when performing the isactive check

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

Rev 3280 – Use SQL_NO_CACHE. As it cleans the sql cache of prod.

vikas — Tue, 13 Sep 2011 15:07:26 +0530

vikas – 4 file(s) modified
Use SQL_NO_CACHE. As it cleans the sql cache of prod.

~ /trunk/pentaho/data-integration/transformations/cartLoader.ktr
~ /trunk/pentaho/data-integration/transformations/itemLoader.ktr
~ /trunk/pentaho/data-integration/transformations/ordersLoader.ktr
~ /trunk/pentaho/data-integration/transformations/userLoader.ktr

Rev 3279 – Corrected the markup for statistics page

chandranshu — Tue, 13 Sep 2011 12:02:03 +0530

chandranshu – 1 file(s) modified
Corrected the markup for statistics page

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

Rev 3278 – Removed some unused imports

chandranshu — Tue, 13 Sep 2011 12:00:06 +0530

chandranshu – 1 file(s) modified
Removed some unused imports

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

Rev 3277 – Updated customer care number

rajveer — Tue, 13 Sep 2011 07:45:49 +0530

rajveer – 2 file(s) modified
Updated customer care number

~ /trunk/Website/src/main/resources/templates/customerservice.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm

Rev 3276 – Added support to clean old content and to send the ...

chandranshu — Mon, 12 Sep 2011 19:30:41 +0530

chandranshu – 2 file(s) modified
Added support to clean old content and to send the report of items not deliverable on the next day

+ /trunk/runutils/clean-content.sh
~ /trunk/runutils/NextDayDeliverableItemsReporter.sh

Rev 3275 – Added some messages to the proceed to pay page

chandranshu — Mon, 12 Sep 2011 18:47:57 +0530

chandranshu – 1 file(s) modified
Added some messages to the proceed to pay page

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

Rev 3274 – Add paymethod for sbi and icici debit cards.

vikas — Mon, 12 Sep 2011 18:23:30 +0530

vikas – 3 file(s) modified
Add paymethod for sbi and icici debit cards.

~ /trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift