SmartDukaan – /

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

Rev 3518 – Changed storage type from String to text.

rajveer — Mon, 03 Oct 2011 16:49:22 +0530

rajveer – 3 file(s) modified
Changed storage type from String to text.

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

Rev 3517 – Import Product activity from GAE and dump it to pentaho.

vikas — Mon, 03 Oct 2011 13:29:14 +0530

vikas – 1 file(s) modified
Import Product activity from GAE and dump it to pentaho.

+ /trunk/pentaho/scripts/ProductActivityLoader.py

Rev 3516 – Changed the comparison stats url corresponding to new storage in ...

rajveer — Mon, 03 Oct 2011 11:59:02 +0530

rajveer – 2 file(s) modified
Changed the comparison stats url corresponding to new storage in google app engine.

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

Rev 3515 – Put security constraint on GAE reports.

vikas — Mon, 03 Oct 2011 11:17:09 +0530

vikas – 1 file(s) modified
Put security constraint on GAE reports.

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

Rev 3514 – Removed 9900 from BB911 and SH911 and 9780 from BB911 ...

varun.gupta — Sun, 02 Oct 2011 19:54:49 +0530

varun.gupta – 2 file(s) modified
Removed 9900 from BB911 and SH911 and 9780 from BB911 and updated the doc strings

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

Rev 3513 – Removed blackberry 9900 and 9780 from sh911 and bb911

chandranshu — Sun, 02 Oct 2011 19:02:08 +0530

chandranshu – 2 file(s) modified
Removed blackberry 9900 and 9780 from sh911 and bb911

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

Rev 3512 – Updated script to update catalog dump on HA-DB

rajveer — Sat, 01 Oct 2011 07:28:16 +0530

rajveer – 1 file(s) modified
Updated script to update catalog dump on HA-DB

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

Rev 3511 – Updated to talk with HA db

rajveer — Sat, 01 Oct 2011 07:25:03 +0530

rajveer – 2 file(s) modified
Updated to talk with HA db

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

Rev 3510 – Updated production data source

rajveer — Sat, 01 Oct 2011 06:43:40 +0530

rajveer – 4 file(s) modified
Updated production data source

~ /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 3509 – Corrected configuration for payment service

rajveer — Sat, 01 Oct 2011 06:22:26 +0530

rajveer – 1 file(s) modified
Corrected configuration for payment service

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

Rev 3508 – Some of the website put saholic in referer while redirecting ...

vikas — Fri, 30 Sep 2011 18:51:04 +0530

vikas – 1 file(s) modified
Some of the website put saholic in referer while redirecting and they were also attributed as direct traffic

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

Rev 3507 – As per ticket #119 to avoid displaying stale information.

rajveer — Fri, 30 Sep 2011 18:45:15 +0530

rajveer – 1 file(s) modified
As per ticket #119 to avoid displaying stale information.

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

Rev 3506 – Updated servlet which access the comparison stats. Also updated cron ...

rajveer — Fri, 30 Sep 2011 16:48:34 +0530

rajveer – 2 file(s) modified
Updated servlet which access the comparison stats. Also updated cron running time.

~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/ShowCompareProducts.java
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/cron.xml

Rev 3505 – Removed the g from weight. Also masked 2g talk time ...

chandranshu — Fri, 30 Sep 2011 16:47:05 +0530

chandranshu – 1 file(s) modified
Removed the g from weight. Also masked 2g talk time and stand by times since they were not in the required units

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

Rev 3504 – Changed the storage from map to string.

rajveer — Fri, 30 Sep 2011 16:22:51 +0530

rajveer – 2 file(s) modified
Changed the storage from map to string.

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

Rev 3503 – Delivery estimate takes the total availability into account

chandranshu — Fri, 30 Sep 2011 16:10:18 +0530

chandranshu – 2 file(s) modified
Delivery estimate takes the total availability into account

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

Rev 3502 – Amazon now wants different colors to be listed separately

chandranshu — Fri, 30 Sep 2011 16:01:29 +0530

chandranshu – 1 file(s) modified
Amazon now wants different colors to be listed separately

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

Rev 3501 – Trac#504 Removing unnecessary txn lookup

mandeep.dhir — Fri, 30 Sep 2011 15:28:39 +0530

mandeep.dhir – 1 file(s) modified
Trac#504 Removing unnecessary txn lookup

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

Rev 3500 – Made image paths relative

varun.gupta — Fri, 30 Sep 2011 15:22:38 +0530

varun.gupta – 2 file(s) modified
Made image paths relative

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

Rev 3499 – Trac#504 Added functionality to help CRM agents to verify COD ...

mandeep.dhir — Fri, 30 Sep 2011 15:17:56 +0530

mandeep.dhir – 42 file(s) modified
Trac#504 Added functionality to help CRM agents to verify COD orders

~ /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/UserInfoController.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/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/activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-info-index.vm
~ /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/tickets-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.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/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/TicketCategory.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.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
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
x /trunk/Website/src/main/java/in/shop2020/serving/model/ShipmentUpdate.java
x /trunk/Website/src/main/java/in/shop2020/serving/services/BlueDartTrackingService.java

Rev 3498 – Changed Key from long to string.

rajveer — Fri, 30 Sep 2011 15:16:55 +0530

rajveer – 3 file(s) modified
Changed Key from long to string.

~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/model/ComparisonStats.java
~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/server/ComparisonStatsRepository.java
~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/DailyComparisonStatsGenerator.java

Rev 3497 – Excluded: Nokia C2-03 and Price above Rs.1,999

varun.gupta — Fri, 30 Sep 2011 15:07:00 +0530

varun.gupta – 1 file(s) modified
Excluded: Nokia C2-03 and Price above Rs.1,999

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

Rev 3496 – Add catalogId column in item loader kettle script.

vikas — Fri, 30 Sep 2011 15:01:21 +0530

vikas – 1 file(s) modified
Add catalogId column in item loader kettle script.

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

Rev 3495 – Corrected cron url.

rajveer — Fri, 30 Sep 2011 14:42:51 +0530

rajveer – 1 file(s) modified
Corrected cron url.

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

Rev 3494 – Mark facebooks add traffic as paid.

vikas — Fri, 30 Sep 2011 14:36:55 +0530

vikas – 1 file(s) modified
Mark facebooks add traffic as paid.

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

Rev 3493 – Made changes to getSource() to avoid possible NPE Reviewer: vikas

mandeep.dhir — Fri, 30 Sep 2011 13:37:23 +0530

mandeep.dhir – 1 file(s) modified
Made changes to getSource() to avoid possible NPE
Reviewer: vikas

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

Rev 3492 – Export Product Activity with sources in json.

vikas — Fri, 30 Sep 2011 13:21:47 +0530

vikas – 1 file(s) modified
Export Product Activity with sources in json.

+ /trunk/GoogleAppDatalog/src/main/webapp/jsp/export-product-activity-with-source.jsp

Rev 3491 – Coupon usage - per user - now restricted to 2

varun.gupta — Fri, 30 Sep 2011 12:47:11 +0530

varun.gupta – 1 file(s) modified
Coupon usage - per user - now restricted to 2

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

Rev 3490 – Added servlet for comparison stats.

rajveer — Fri, 30 Sep 2011 12:14:40 +0530

rajveer – 1 file(s) modified
Added servlet for comparison stats.

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

Rev 3489 – Remove unused imports.

vikas — Fri, 30 Sep 2011 11:41:38 +0530

vikas – 1 file(s) modified
Remove unused imports.

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/product-activity-with-source.jsp

Rev 3488 – Changes to improve performace and fix datastore timeout issue for ...

vikas — Fri, 30 Sep 2011 11:19:43 +0530

vikas – 5 file(s) modified
Changes to improve performace and fix datastore timeout issue for the product activity dumper.

~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/DailyProductWithSourceAggregatorServlet.java
~ /trunk/GoogleAppDatalog/src/main/resources/log4j.properties
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/product-activity-with-source.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/product-activity.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/cron.xml

Rev 3487 – Added cron job which will run daily and calculate comparison ...

rajveer — Thu, 29 Sep 2011 18:52:57 +0530

rajveer – 5 file(s) modified
Added cron job which will run daily and calculate comparison stats and will store them in google app engine.

+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/model/ComparisonStats.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/server/ComparisonStatsRepository.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/DailyComparisonStatsGenerator.java
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/cron.xml
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/web.xml

Rev 3486 – Added support to add a lot of CMS data to ...

chandranshu — Thu, 29 Sep 2011 18:30:25 +0530

chandranshu – 1 file(s) modified
Added support to add a lot of CMS data to the Junglee data

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

Rev 3485 – Added support to delete a helpdoc

rajveer — Thu, 29 Sep 2011 17:58:54 +0530

rajveer – 3 file(s) modified
Added support to delete a helpdoc

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/HelpdocController.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java
~ /trunk/ContentStore/src/main/java/in/shop2020/storage/bdb/StorageManager.java

Rev 3484 – Changes to calculate price range and days to purchase at ...

vikas — Thu, 29 Sep 2011 17:32:13 +0530

vikas – 1 file(s) modified
Changes to calculate price range and days to purchase at the time of data integration itself.

~ /trunk/pentaho/schema/SalesSchema.xml