SmartDukaan – /

Rev 3245 – Added the check to not to make product live if ...

rajveer — Thu, 08 Sep 2011 18:43:13 +0530

rajveer – 1 file(s) modified
Added the check to not to make product live if selling price is null.

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

Rev 3244 – Resolved the import of NoResultFound and MultipleResultFound

chandranshu — Thu, 08 Sep 2011 18:08:32 +0530

chandranshu – 1 file(s) modified
Resolved the import of NoResultFound and MultipleResultFound

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

Rev 3243 – Added an option to process COD transactions

chandranshu — Thu, 08 Sep 2011 18:06:37 +0530

chandranshu – 1 file(s) modified
Added an option to process COD transactions

~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py

Rev 3242 – Enable caching for category snippets

vikas — Thu, 08 Sep 2011 18:03:40 +0530

vikas – 12 file(s) modified
Enable caching for category snippets

+ /trunk/Website/src/main/java/in/shop2020/serving/cache
+ /trunk/Website/src/main/java/in/shop2020/serving/cache/CategorySnippetCacheWrapper.java
+ /trunk/Website/src/main/java/in/shop2020/serving/cache/EhcacheWrapper.java (copied from /trunk/Website/src/main/java/in/shop2020/serving/utils/EhcacheWrapper.java@3236)
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestDealsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestSellersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BrandController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
x /trunk/Website/src/main/java/in/shop2020/serving/utils/EhcacheWrapper.java
~ /trunk/Website/src/main/resources/ehcache.xml

Rev 3241 – Updated to clean the old configuration complete from memory.

rajveer — Thu, 08 Sep 2011 17:01:22 +0530

rajveer – 1 file(s) modified
Updated to clean the old configuration complete from memory.

~ /trunk/PyProj/src/shop2020/config/impl/ConfigServerHandler.py

Rev 3240 – Added ports in configuration fail over.

rajveer — Thu, 08 Sep 2011 16:19:51 +0530

rajveer – 1 file(s) modified
Added ports in configuration fail over.

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

Rev 3239 – Added the third missing argument of logistics info

chandranshu — Thu, 08 Sep 2011 15:54:41 +0530

chandranshu – 1 file(s) modified
Added the third missing argument of logistics info

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

Rev 3238 – Add shipping access, proceed to pay, pay success, pay failure ...

vikas — Thu, 08 Sep 2011 15:51:59 +0530

vikas – 3 file(s) modified
Add shipping access, proceed to pay, pay success, pay failure etc. in product performance report.

~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/model/ItemActivity.java
~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/DailyAggregatorServlet.java
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/product-activity.jsp

Rev 3237 – FIxed a parsing bug.

vikas — Thu, 08 Sep 2011 15:47:56 +0530

vikas – 1 file(s) modified
FIxed a parsing bug.

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/AddToCart.java

Rev 3236 – Added script to start price comparison server

rajveer — Thu, 08 Sep 2011 13:49:14 +0530

rajveer – 1 file(s) modified
Added script to start price comparison server

+ /trunk/runutils/start-price-comparison-server.sh

Rev 3235 – Removed hardcoding.

rajveer — Thu, 08 Sep 2011 13:06:20 +0530

rajveer – 1 file(s) modified
Removed hardcoding.

~ /trunk/PriceComparisonFramework/src/WebUI/Server.py

Rev 3234 – Trac#488 Added support to export data tables in various formats

mandeep.dhir — Thu, 08 Sep 2011 13:05:23 +0530

mandeep.dhir – 39 file(s) modified
Trac#488 Added support to export data tables in various formats

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
+ /trunk/Crm/src/main/webapp/as3
+ /trunk/Crm/src/main/webapp/as3/lib
+ /trunk/Crm/src/main/webapp/as3/lib/AlivePDF.swc
+ /trunk/Crm/src/main/webapp/as3/ZeroClipboard.as
+ /trunk/Crm/src/main/webapp/as3/ZeroClipboardPdf.as
~ /trunk/Crm/src/main/webapp/css/common.css
+ /trunk/Crm/src/main/webapp/css/TableTools.css
+ /trunk/Crm/src/main/webapp/css/TableTools_JUI.css
+ /trunk/Crm/src/main/webapp/images/background.png
+ /trunk/Crm/src/main/webapp/images/collection.png
+ /trunk/Crm/src/main/webapp/images/collection_hover.png
+ /trunk/Crm/src/main/webapp/images/copy.png
+ /trunk/Crm/src/main/webapp/images/copy document.psd
+ /trunk/Crm/src/main/webapp/images/copy_hover.png
+ /trunk/Crm/src/main/webapp/images/csv.png
+ /trunk/Crm/src/main/webapp/images/csv_hover.png
+ /trunk/Crm/src/main/webapp/images/file_types.psd
+ /trunk/Crm/src/main/webapp/images/pdf.png
+ /trunk/Crm/src/main/webapp/images/pdf_hover.png
+ /trunk/Crm/src/main/webapp/images/print.png
+ /trunk/Crm/src/main/webapp/images/printer.psd
+ /trunk/Crm/src/main/webapp/images/print_hover.png
+ /trunk/Crm/src/main/webapp/images/psd
+ /trunk/Crm/src/main/webapp/images/psd/collection.psd
+ /trunk/Crm/src/main/webapp/images/psd/copy document.psd
+ /trunk/Crm/src/main/webapp/images/psd/file_types.psd
+ /trunk/Crm/src/main/webapp/images/psd/printer.psd
+ /trunk/Crm/src/main/webapp/images/xls.png
+ /trunk/Crm/src/main/webapp/images/xls_hover.png
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
+ /trunk/Crm/src/main/webapp/js/TableTools.min.js
+ /trunk/Crm/src/main/webapp/swf
+ /trunk/Crm/src/main/webapp/swf/copy_cvs_xls.swf
+ /trunk/Crm/src/main/webapp/swf/copy_cvs_xls_pdf.swf
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm

Rev 3233 – Added project setting

varun.gupta — Thu, 08 Sep 2011 12:57:21 +0530

varun.gupta – 3 file(s) modified
Added project setting

+ /trunk/PriceComparisonFramework/.project
+ /trunk/PriceComparisonFramework/.pydevproject
+ /trunk/PriceComparisonFramework/.settings/org.eclipse.ltk.core.refactoring.prefs

Rev 3232 – PriceComparisonFramework first version.

varun.gupta — Thu, 08 Sep 2011 12:54:27 +0530

varun.gupta – 52 file(s) modified
PriceComparisonFramework first version.

+ /trunk/PriceComparisonFramework/.settings
+ /trunk/PriceComparisonFramework/src
+ /trunk/PriceComparisonFramework/src/Clients
+ /trunk/PriceComparisonFramework/src/Clients/GAEServletClient.py
+ /trunk/PriceComparisonFramework/src/Clients/__init__.py
+ /trunk/PriceComparisonFramework/src/PyLucene
+ /trunk/PriceComparisonFramework/src/PyLucene/IndexBuilder.py
+ /trunk/PriceComparisonFramework/src/PyLucene/PhonePriceDoc.py
+ /trunk/PriceComparisonFramework/src/PyLucene/Retriever.py
+ /trunk/PriceComparisonFramework/src/PyLucene/__init__.py
+ /trunk/PriceComparisonFramework/src/ScraperAgent.py
+ /trunk/PriceComparisonFramework/src/ScraperLoader.py
+ /trunk/PriceComparisonFramework/src/Scrapers
+ /trunk/PriceComparisonFramework/src/Scrapers/FlipcartScraper.py
+ /trunk/PriceComparisonFramework/src/Scrapers/InfibeamScraper.py
+ /trunk/PriceComparisonFramework/src/Scrapers/LetsBuyScraper.py
+ /trunk/PriceComparisonFramework/src/Scrapers/SaholicScraper.py
+ /trunk/PriceComparisonFramework/src/Scrapers/__init__.py
+ /trunk/PriceComparisonFramework/src/Utils.py
+ /trunk/PriceComparisonFramework/src/WebUI
+ /trunk/PriceComparisonFramework/src/WebUI/app.cfg
+ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates
+ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/FetchResults.html
+ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/LoginForm.html
+ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/PriceChart.html
+ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/SearchForm.html
+ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/SearchResults.html
+ /trunk/PriceComparisonFramework/src/WebUI/Server.py
+ /trunk/PriceComparisonFramework/src/WebUI/static
+ /trunk/PriceComparisonFramework/src/WebUI/static/chart.js
+ /trunk/PriceComparisonFramework/src/WebUI/static/facebox.css
+ /trunk/PriceComparisonFramework/src/WebUI/static/facebox.js
+ /trunk/PriceComparisonFramework/src/WebUI/static/images
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/best.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/border.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/closelabel.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/controls.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6/borderBottomCenter.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6/borderBottomLeft.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6/borderBottomRight.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6/borderMiddleLeft.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6/borderMiddleRight.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6/borderTopCenter.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6/borderTopLeft.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6/borderTopRight.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/loading.gif
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/loading_background.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/overlay.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/jquery-1.6.2.min.js
+ /trunk/PriceComparisonFramework/src/WebUI/test.py
+ /trunk/PriceComparisonFramework/src/WebUI/__init__.py

Rev 3231 – Excluding After sales slide from comparison.

rajveer — Thu, 08 Sep 2011 11:27:15 +0530

rajveer – 3 file(s) modified
Excluding After sales slide from comparison.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java
~ /trunk/ContentStore/src/velocity/ComparisonSnippet.vm

Rev 3230 – Added solr search engine configuration for support machine.

rajveer — Wed, 07 Sep 2011 18:58:33 +0530

rajveer – 1 file(s) modified
Added solr search engine configuration for support machine.

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

Rev 3229 – Initial import.

varun.gupta — Wed, 07 Sep 2011 18:34:14 +0530

varun.gupta – 1 file(s) modified
Initial import.

+ /trunk/PriceComparisonFramework

Rev 3228 – Trac#488 - Fixes related to formatting issues ...

mandeep.dhir — Wed, 07 Sep 2011 16:54:35 +0530

mandeep.dhir – 8 file(s) modified
Trac#488
- Fixes related to formatting issues
- Added links for users added in tickets view

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityController.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/tickets-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-index.vm

Rev 3227 – Updated the transaction database dump

chandranshu — Wed, 07 Sep 2011 15:44:11 +0530

chandranshu – 1 file(s) modified
Updated the transaction database dump

~ /trunk/Website/src/test/resources/db/transaction.sql

Rev 3226 – Started recording the refund reason entered by the operator

chandranshu — Wed, 07 Sep 2011 14:45:48 +0530

chandranshu – 8 file(s) modified
Started recording the refund reason entered by the operator

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/RejectOrderHandler.java
~ /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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 3225 – Added caching of snippets on product page.

vikas — Wed, 07 Sep 2011 14:14:42 +0530

vikas – 3 file(s) modified
Added caching of snippets on product page.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/EhcacheWrapper.java
~ /trunk/Website/src/main/resources/ehcache.xml

Rev 3224 – Get sessionId from cookies. As due to loadbalanced tomcats current ...

vikas — Wed, 07 Sep 2011 11:56:26 +0530

vikas – 6 file(s) modified
Get sessionId from cookies. As due to loadbalanced tomcats current jsession id can not be used for session tracking in datalog.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AddressController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PromotionController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java

Rev 3223 – Removed sysout statements.

rajveer — Wed, 07 Sep 2011 11:01:23 +0530

rajveer – 1 file(s) modified
Removed sysout statements.

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

Rev 3222 – Add affiliate to sales report.

vikas — Tue, 06 Sep 2011 19:05:10 +0530

vikas – 1 file(s) modified
Add affiliate to sales report.

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 3221 – Add affiliate to sales report.

vikas — Tue, 06 Sep 2011 18:47:50 +0530

vikas – 1 file(s) modified
Add affiliate to sales report.

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

Rev 3220 – Trac#488 Displaying appropriate row lying on on next pages for ...

mandeep.dhir — Tue, 06 Sep 2011 17:44:00 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Displaying appropriate row lying on on next pages for orders

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

Rev 3219 – Trac#488 Displaying appropriate row lying on on next pages

mandeep.dhir — Tue, 06 Sep 2011 16:12:27 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Displaying appropriate row lying on on next pages

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

Rev 3218 – Added caching in logistics service.

rajveer — Tue, 06 Sep 2011 15:28:43 +0530

rajveer – 3 file(s) modified
Added caching in logistics service.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/logistics/service/test/Test.py

Rev 3217 – Added caching in logistics service.

rajveer — Tue, 06 Sep 2011 14:45:20 +0530

rajveer – 2 file(s) modified
Added caching in logistics service.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py

Rev 3216 – Removed canceled orders from the count of valid orders

chandranshu — Tue, 06 Sep 2011 14:11:12 +0530

chandranshu – 1 file(s) modified
Removed canceled orders from the count of valid orders

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

Rev 3215 – Missed updating this class for new event Procced to Pay.

vikas — Tue, 06 Sep 2011 13:33:46 +0530

vikas – 1 file(s) modified
Missed updating this class for new event Procced to Pay.

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/Event.java

Rev 3214 – Removed printStackTrace

chandranshu — Tue, 06 Sep 2011 12:54:52 +0530

chandranshu – 1 file(s) modified
Removed printStackTrace

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

Rev 3213 – Removed printStackTrace

chandranshu — Tue, 06 Sep 2011 12:39:43 +0530

chandranshu – 8 file(s) modified
Removed printStackTrace

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ReportsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/utils/ReportsUtils.java

Rev 3212 – Add itemIds to Order creation event.

vikas — Tue, 06 Sep 2011 12:31:55 +0530

vikas – 1 file(s) modified
Add itemIds to Order creation event.

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

Rev 3211 – Add option for Procced to pay event.

vikas — Tue, 06 Sep 2011 12:31:10 +0530

vikas – 1 file(s) modified
Add option for Procced to pay event.

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/search-events.jsp

Rev 3210 – Add itemIds to Order creation event. Fix bug in loop ...

vikas — Tue, 06 Sep 2011 12:30:07 +0530

vikas – 6 file(s) modified
Add itemIds to Order creation event. Fix bug in loop condition in shipping, payment, session and proceed_to_pay events.

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/NewSession.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/OrderCreation.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/PaymentFailure.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/PaymentSuccess.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/ProceedToPay.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/ShippingAccess.java

Rev 3209 – Add itemIds in shipping, order creation, and payment events. Add ...

vikas — Tue, 06 Sep 2011 11:53:10 +0530

vikas – 7 file(s) modified
Add itemIds in shipping, order creation, and payment events. Add new event ProccedtoPay.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayErrorController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 3208 – Add itemIds in shipping, order creation, and payment events. Add ...

vikas — Tue, 06 Sep 2011 11:52:23 +0530

vikas – 7 file(s) modified
Add itemIds in shipping, order creation, and payment events. Add new event ProccedtoPay.

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/NewSession.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/OrderCreation.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/PaymentFailure.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/PaymentSuccess.java
+ /trunk/Common/src/main/java/in/shop2020/datalogger/event/ProceedToPay.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/ShippingAccess.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/EventType.java

Rev 3207 – Trac#488 Ordering tickets by Date Opened

mandeep.dhir — Tue, 06 Sep 2011 11:02:07 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Ordering tickets by Date Opened

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

Rev 3206 – Trac#488 Added support to mail a customer from CRM as ...

mandeep.dhir — Tue, 06 Sep 2011 10:53:03 +0530

mandeep.dhir – 38 file(s) modified
Trac#488 Added support to mail a customer from CRM as part of an activity done on a ticket

~ /trunk/Crm/pom.xml
+ /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java (copied from /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMRealm.java@3177)
x /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMRealm.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
+ /trunk/Crm/src/main/java/in/shop2020/util
+ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/resources/shiro.ini
+ /trunk/Crm/src/main/webapp/css/colorbox.css
~ /trunk/Crm/src/main/webapp/css/common.css
+ /trunk/Crm/src/main/webapp/css/images
+ /trunk/Crm/src/main/webapp/css/images/border.png
+ /trunk/Crm/src/main/webapp/css/images/controls.png
+ /trunk/Crm/src/main/webapp/css/images/loading.gif
+ /trunk/Crm/src/main/webapp/css/images/loading_background.png
~ /trunk/Crm/src/main/webapp/images/ajax-loader.gif
~ /trunk/Crm/src/main/webapp/js/common.js
+ /trunk/Crm/src/main/webapp/js/dataTables.fnDisplayRow.js
~ /trunk/Crm/src/main/webapp/js/events.js
+ /trunk/Crm/src/main/webapp/js/jquery.colorbox-min.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/user-activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.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/log4j.properties
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.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/utils/HelperService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift