SmartDukaan – /

Rev 3558 – Added code to insert and display prices for different sources.

rajveer — Mon, 10 Oct 2011 15:26:54 +0530

rajveer – 10 file(s) modified
Added code to insert and display prices for different sources.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/SourcePricesDialog.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/dashboard/shared/SourcePricings.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
+ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/SourcePricesDialog.ui.xml

Rev 3557 – Added code to handle different pricing for the traffic coming ...

rajveer — Mon, 10 Oct 2011 15:20:38 +0530

rajveer – 17 file(s) modified
Added code to handle different pricing for the traffic coming from different sources.

~ /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/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.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
~ /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/catalog/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Source.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/SourceItemPricing.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/test/TestHandler.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/test/TestService.java

Rev 3556 – Added code to handle different pricing for multiple sources.

rajveer — Mon, 10 Oct 2011 15:18:14 +0530

rajveer – 2 file(s) modified
Added code to handle different pricing for multiple sources.

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

Rev 3555 – Generated Java files after addition of Discount table

varun.gupta — Mon, 10 Oct 2011 14:50:19 +0530

varun.gupta – 5 file(s) modified
Generated Java files after addition of Discount table

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Cart.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Discount.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Line.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java

Rev 3554 – Discounts now being managed in Discount table.

varun.gupta — Mon, 10 Oct 2011 14:47:04 +0530

varun.gupta – 11 file(s) modified
Discounts now being managed in Discount table.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_HDFC_campaign.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 3553 – Added support for the admin to enter the delay reason ...

chandranshu — Mon, 10 Oct 2011 14:45:30 +0530

chandranshu – 23 file(s) modified
Added support for the admin to enter the delay reason in OM dashboard

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddDelayReasonEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddDelayReasonEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/AddDelayReasonBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddDelayReasonHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddDelayReasonRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddDelayReasonResponse.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OMDelayReason.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
~ /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-remote
~ /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/DelayReason.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 3552 – Max-Min difference table header added

varun.gupta — Mon, 10 Oct 2011 13:17:37 +0530

varun.gupta – 1 file(s) modified
Max-Min difference table header added

~ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/PriceChart.html

Rev 3551 – Modified CSS and Added computation for Max-Min price difference

varun.gupta — Mon, 10 Oct 2011 12:12:58 +0530

varun.gupta – 3 file(s) modified
Modified CSS and Added computation for Max-Min price difference

~ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/PriceChart.html
+ /trunk/PriceComparisonFramework/src/WebUI/static/chart.css
~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.js

Rev 3550 – Limit no of characters to 60 for line1 in address.

vikas — Fri, 07 Oct 2011 19:52:10 +0530

vikas – 1 file(s) modified
Limit no of characters to 60 for line1 in address.

~ /trunk/Website/src/main/webapp/js/custom-jquery.js

Rev 3549 – Increased nav bar height and padding.

varun.gupta — Fri, 07 Oct 2011 18:54:26 +0530

varun.gupta – 1 file(s) modified
Increased nav bar height and padding.

~ /trunk/Website/src/main/webapp/css/nav.css

Rev 3548 – Add delay-cause column.

vikas — Fri, 07 Oct 2011 18:52:42 +0530

vikas – 1 file(s) modified
Add delay-cause column.

~ /trunk/pentaho/data-integration/transformations/orderFulfilmentLoader.ktr

Rev 3547 – Trac#511 Group changed form Shop2020 to in.shop2020

mandeep.dhir — Fri, 07 Oct 2011 17:20:43 +0530

mandeep.dhir – 1 file(s) modified
Trac#511 Group changed form Shop2020 to in.shop2020

~ /trunk/CRMService/pom.xml

Rev 3546 – Trac#511 Changes related to COD orders verification

mandeep.dhir — Fri, 07 Oct 2011 16:28:14 +0530

mandeep.dhir – 27 file(s) modified
Trac#511 Changes related to COD orders verification

+ /trunk/Common/src/main/java/in/shop2020/utils/ModelUtils.java
~ /trunk/Crm/pom.xml
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Ticket.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/SearchFilter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3545 – Add cart, user and order fulfilment transformations.

vikas — Fri, 07 Oct 2011 13:24:57 +0530

vikas – 1 file(s) modified
Add cart, user and order fulfilment transformations.

~ /trunk/pentaho/scripts/panScript.sh

Rev 3544 – Order fulfillment loader kettle script.

vikas — Fri, 07 Oct 2011 13:19:24 +0530

vikas – 1 file(s) modified
Order fulfillment loader kettle script.

+ /trunk/pentaho/data-integration/transformations/orderFulfilmentLoader.ktr

Rev 3543 – Product activity report.

vikas — Fri, 07 Oct 2011 13:18:27 +0530

vikas – 1 file(s) modified
Product activity report.

+ /trunk/pentaho/schema/ProductActivitySchema.xml

Rev 3542 – Created a dimenstion table for order schema. Got rid of ...

vikas — Fri, 07 Oct 2011 13:17:50 +0530

vikas – 1 file(s) modified
Created a dimenstion table for order schema. Got rid of degenerated dimension for order hour from fact table.

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 3541 – Fixed the width of td containing product name

varun.gupta — Fri, 07 Oct 2011 12:02:59 +0530

varun.gupta – 1 file(s) modified
Fixed the width of td containing product name

~ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/PriceChart.html

Rev 3540 – Ensured that a service is reachable over the network

chandranshu — Wed, 05 Oct 2011 19:49:46 +0530

chandranshu – 2 file(s) modified
Ensured that a service is reachable over the network

~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServer.py
~ /trunk/PyProj/src/shop2020/warehouse/main/WarehouseServer.py

Rev 3539 – Ensured that a service is reachable over the network

chandranshu — Wed, 05 Oct 2011 19:47:15 +0530

chandranshu – 6 file(s) modified
Ensured that a service is reachable over the network

~ /trunk/PyProj/src/shop2020/logistics/service/LogisticsServer.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/CatalogServer.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/InventoryHistoryServer.py
~ /trunk/PyProj/src/shop2020/model/v1/order/TransactionServer.py
~ /trunk/PyProj/src/shop2020/model/v1/user/PromotionServer.py
~ /trunk/PyProj/src/shop2020/model/v1/user/UserContextServer.py

Rev 3538 – Added support to accept db server host as an argument

chandranshu — Wed, 05 Oct 2011 17:36:19 +0530

chandranshu – 1 file(s) modified
Added support to accept db server host as an argument

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

Rev 3537 – Added the host parameter to the TSocket call

chandranshu — Wed, 05 Oct 2011 15:45:01 +0530

chandranshu – 9 file(s) modified
Added the host parameter to the TSocket call

~ /trunk/PyProj/src/shop2020/config/ConfigServer.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServer.py
~ /trunk/PyProj/src/shop2020/logistics/service/LogisticsServer.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/CatalogServer.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/InventoryHistoryServer.py
~ /trunk/PyProj/src/shop2020/model/v1/order/TransactionServer.py
~ /trunk/PyProj/src/shop2020/model/v1/user/PromotionServer.py
~ /trunk/PyProj/src/shop2020/model/v1/user/UserContextServer.py
~ /trunk/PyProj/src/shop2020/warehouse/main/WarehouseServer.py

Rev 3536 – Added configuration for the third prod server

chandranshu — Wed, 05 Oct 2011 14:01:13 +0530

chandranshu – 1 file(s) modified
Added configuration for the third prod server

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

Rev 3535 – Coupon rule to allow discount on tablets

varun.gupta — Wed, 05 Oct 2011 12:17:31 +0530

varun.gupta – 1 file(s) modified
Coupon rule to allow discount on tablets

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

Rev 3534 – Modified the script to updated db properly.

rajveer — Wed, 05 Oct 2011 11:37:42 +0530

rajveer – 1 file(s) modified
Modified the script to updated db properly.

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

Rev 3533 – Galaxy S II removed from SH911 coupon

varun.gupta — Wed, 05 Oct 2011 11:07:34 +0530

varun.gupta – 1 file(s) modified
Galaxy S II removed from SH911 coupon

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

Rev 3532 – Batching events before pushing it to datastore did not help ...

vikas — Tue, 04 Oct 2011 18:17:00 +0530

vikas – 1 file(s) modified
Batching events before pushing it to datastore did not help cpu api hours, so reverting.

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

Rev 3531 – Process product events in batches of 6 hr window to ...

vikas — Tue, 04 Oct 2011 18:15:09 +0530

vikas – 1 file(s) modified
Process product events in batches of 6 hr window to avoid datastore timeouts.

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

Rev 3530 – Trac#504 Making calls to userclient and crmclient async and also ...

mandeep.dhir — Tue, 04 Oct 2011 17:54:51 +0530

mandeep.dhir – 10 file(s) modified
Trac#504 Making calls to userclient and crmclient async and also making transactionservice unaffected due to any failures happening inside CRMService or usercontextservice.

~ /trunk/Crm/pom.xml
~ /trunk/CRMService/pom.xml
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 3529 – Moved the Google App engine jars to their intended location

chandranshu — Tue, 04 Oct 2011 15:39:14 +0530

chandranshu – 9 file(s) modified
Moved the Google App engine jars to their intended location

x /thirdparty/src/main/resources/readonly/appengine-mapper/1.0
+ /thirdparty/src/main/resources/readonly/appengine-mapper/appengine-mapper
+ /thirdparty/src/main/resources/readonly/appengine-mapper/appengine-mapper/1.0 (copied from /thirdparty/src/main/resources/readonly/appengine-mapper/1.0@3290)
x /thirdparty/src/main/resources/readonly/charts4j/1.2
+ /thirdparty/src/main/resources/readonly/charts4j/charts4j
+ /thirdparty/src/main/resources/readonly/charts4j/charts4j/1.2 (copied from /thirdparty/src/main/resources/readonly/charts4j/1.2@3290)
+ /thirdparty/src/main/resources/readonly/guava/guava
+ /thirdparty/src/main/resources/readonly/guava/guava/r07 (copied from /thirdparty/src/main/resources/readonly/guava/r07@3290)
x /thirdparty/src/main/resources/readonly/guava/r07

Rev 3528 – Moved hadoop-core JAR to the right location

chandranshu — Tue, 04 Oct 2011 15:30:01 +0530

chandranshu – 3 file(s) modified
Moved hadoop-core JAR to the right location

x /thirdparty/src/main/resources/readonly/hadoop/0.20.2
+ /thirdparty/src/main/resources/readonly/hadoop/hadoop-core
+ /thirdparty/src/main/resources/readonly/hadoop/hadoop-core/0.20.2 (copied from /thirdparty/src/main/resources/readonly/hadoop/0.20.2@3290)

Rev 3527 – Corrected the arguments to the mail function

chandranshu — Tue, 04 Oct 2011 13:51:41 +0530

chandranshu – 1 file(s) modified
Corrected the arguments to the mail function

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

Rev 3526 – Push event in batches so that the api cpu usage(chargeable) ...

vikas — Tue, 04 Oct 2011 13:21:57 +0530

vikas – 1 file(s) modified
Push event in batches so that the api cpu usage(chargeable) comes down substantially.

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

Rev 3525 – Removed overriding line-height property which was reducing gap between price ...

varun.gupta — Mon, 03 Oct 2011 19:32:00 +0530

varun.gupta – 1 file(s) modified
Removed overriding line-height property which was reducing gap between price figure and short description.

~ /trunk/Website/src/main/webapp/css/style.css

Rev 3524 – Upgraded GWT SDK, GWT user and GWT maven plugin to ...

chandranshu — Mon, 03 Oct 2011 19:31:21 +0530

chandranshu – 6 file(s) modified
Upgraded GWT SDK, GWT user and GWT maven plugin to 2.4.0

~ /trunk/CatalogDashboard/.classpath
~ /trunk/CatalogDashboard/.settings/com.google.gwt.eclipse.core.prefs
~ /trunk/CatalogDashboard/pom.xml
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemList.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemList.ui.xml

Rev 3523 – Pre-Fill the sessionIdSourceMap for performacnce.

vikas — Mon, 03 Oct 2011 18:58:48 +0530

vikas – 1 file(s) modified
Pre-Fill the sessionIdSourceMap for performacnce.

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

Rev 3522 – Fix the datasource timeout issue.

vikas — Mon, 03 Oct 2011 18:57:38 +0530

vikas – 1 file(s) modified
Fix the datasource timeout issue.

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

Rev 3521 – Trac#511 Truncating test when no. of rows on one page ...

mandeep.dhir — Mon, 03 Oct 2011 17:49:34 +0530

mandeep.dhir – 1 file(s) modified
Trac#511 Truncating test when no. of rows on one page in datatables change

~ /trunk/Crm/src/main/webapp/js/events.js

Rev 3520 – Trac#485 Enabling creation of a single jar for CRMServer with ...

mandeep.dhir — Mon, 03 Oct 2011 17:27:24 +0530

mandeep.dhir – 1 file(s) modified
Trac#485 Enabling creation of a single jar for CRMServer with all dependencies

~ /trunk/CRMService/pom.xml

Rev 3519 – Trac#485 Using CKEditor for converting test/plain to text/html before sending ...

mandeep.dhir — Mon, 03 Oct 2011 17:17:05 +0530

mandeep.dhir – 257 file(s) modified
Trac#485 Using CKEditor for converting test/plain to text/html before sending email to users through CRM.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
+ /trunk/Crm/src/main/webapp/ckeditor
+ /trunk/Crm/src/main/webapp/ckeditor/.htaccess
+ /trunk/Crm/src/main/webapp/ckeditor/adapters
+ /trunk/Crm/src/main/webapp/ckeditor/adapters/jquery.js
+ /trunk/Crm/src/main/webapp/ckeditor/ckeditor.js
+ /trunk/Crm/src/main/webapp/ckeditor/config.js
+ /trunk/Crm/src/main/webapp/ckeditor/contents.css
+ /trunk/Crm/src/main/webapp/ckeditor/images
+ /trunk/Crm/src/main/webapp/ckeditor/images/spacer.gif
+ /trunk/Crm/src/main/webapp/ckeditor/lang
+ /trunk/Crm/src/main/webapp/ckeditor/lang/en.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/a11yhelp
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/a11yhelp/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/a11yhelp/lang
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/a11yhelp/lang/en.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/a11yhelp/lang/he.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/about
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/about/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/about/dialogs/about.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/about/dialogs/logo_ckeditor.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/adobeair
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/adobeair/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/ajax
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/ajax/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/autogrow
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/autogrow/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/bbcode
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/bbcode/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/clipboard
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/clipboard/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/clipboard/dialogs/paste.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/colordialog
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/colordialog/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/colordialog/dialogs/colordialog.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/devtools
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/devtools/lang
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/devtools/lang/en.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/devtools/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/dialog
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/dialog/dialogDefinition.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/div
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/div/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/div/dialogs/div.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/docprops
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/docprops/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/docprops/dialogs/docprops.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/docprops/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/find
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/find/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/find/dialogs/find.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/flash
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/flash/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/flash/dialogs/flash.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/flash/images
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/flash/images/placeholder.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs/button.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs/checkbox.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs/form.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs/hiddenfield.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs/radio.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs/select.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs/textarea.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs/textfield.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/images
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/images/hiddenfield.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/iframe
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/iframe/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/iframe/dialogs/iframe.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/iframe/images
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/iframe/images/placeholder.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/iframedialog
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/iframedialog/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/image
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/image/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/image/dialogs/image.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/link
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/link/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/link/dialogs/anchor.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/link/dialogs/link.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/link/images
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/link/images/anchor.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/liststyle
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/liststyle/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/liststyle/dialogs/liststyle.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pagebreak
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pagebreak/images
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pagebreak/images/pagebreak.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pastefromword
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pastefromword/filter
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pastefromword/filter/default.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pastetext
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pastetext/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pastetext/dialogs/pastetext.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/placeholder
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/placeholder/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/placeholder/dialogs/placeholder.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/placeholder/lang
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/placeholder/lang/en.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/placeholder/lang/he.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/placeholder/placeholder.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/placeholder/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/scayt
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/scayt/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/scayt/dialogs/options.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/scayt/dialogs/toolbar.css
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_address.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_blockquote.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_div.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_h1.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_h2.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_h3.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_h4.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_h5.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_h6.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_p.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_pre.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/dialogs/smiley.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/angel_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/angry_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/broken_heart.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/confused_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/cry_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/devil_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/embaressed_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/envelope.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/heart.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/kiss.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/lightbulb.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/omg_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/regular_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/sad_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/shades_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/teeth_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/thumbs_down.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/thumbs_up.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/tounge_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/wink_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/specialchar
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/specialchar/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/specialchar/dialogs/specialchar.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/specialchar/lang
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/specialchar/lang/en.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/styles
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/styles/styles
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/styles/styles/default.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/stylesheetparser
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/stylesheetparser/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/table
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/table/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/table/dialogs/table.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/tableresize
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/tableresize/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/tabletools
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/tabletools/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/tabletools/dialogs/tableCell.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates/dialogs/templates.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates/templates
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates/templates/default.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates/templates/images
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates/templates/images/template1.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates/templates/images/template2.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates/templates/images/template3.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/dialogs/uicolor.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/lang
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/lang/en.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/lang/he.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/uicolor.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/yui
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/yui/assets
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/yui/assets/hue_bg.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/yui/assets/picker_mask.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/yui/assets/yui.css
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/yui/yui.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/wsc
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/wsc/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/wsc/dialogs/ciframe.html
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/wsc/dialogs/wsc.css
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/wsc/dialogs/wsc.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/xml
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/xml/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/skins
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/dialog.css
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/editor.css
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/icons.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/icons_rtl.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images/dialog_sides.gif
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images/dialog_sides.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images/dialog_sides_rtl.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images/mini.gif
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images/noimage.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images/sprites.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images/sprites_ie6.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images/toolbar_start.gif
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/skin.js
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/templates.css
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/dialog.css
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/editor.css
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/icons.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/icons_rtl.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/images
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/images/dialog_sides.gif
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/images/dialog_sides.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/images/dialog_sides_rtl.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/images/mini.gif
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/images/noimage.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/images/sprites.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/images/sprites_ie6.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/skin.js
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/templates.css
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/dialog.css
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/editor.css
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/icons.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/icons_rtl.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images/dialog_sides.gif
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images/dialog_sides.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images/dialog_sides_rtl.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images/mini.gif
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images/noimage.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images/sprites.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images/sprites_ie6.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images/toolbar_start.gif
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/skin.js
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/templates.css
+ /trunk/Crm/src/main/webapp/ckeditor/themes
+ /trunk/Crm/src/main/webapp/ckeditor/themes/default
+ /trunk/Crm/src/main/webapp/ckeditor/themes/default/theme.js
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm