SmartDukaan – /

Rev 1744 – Fix some date formatting problems.

vikas — Fri, 06 May 2011 13:09:55 +0530

vikas – 2 file(s) modified
Fix some date formatting problems.

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

Rev 1743 – Now inserting NULL in case of non-entry of Order Id ...

varun.gupta — Fri, 06 May 2011 13:09:48 +0530

varun.gupta – 1 file(s) modified
Now inserting NULL in case of non-entry of Order Id in UserCommunication

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py

Rev 1742 – Corrected the email message

rajveer — Fri, 06 May 2011 11:23:10 +0530

rajveer – 1 file(s) modified
Corrected the email message

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

Rev 1741 – Added capability to aut-deploy Social

rajveer — Fri, 06 May 2011 05:57:01 +0530

rajveer – 1 file(s) modified
Added capability to aut-deploy Social

~ /trunk/runutils/deploy-everything.sh

Rev 1740 – Corrected the version infor for Social

rajveer — Fri, 06 May 2011 05:55:20 +0530

rajveer – 1 file(s) modified
Corrected the version infor for Social

~ /trunk/Social/pom.xml

Rev 1739 – Added page title, meta description and meta tags in summary ...

rajveer — Thu, 05 May 2011 21:42:20 +0530

rajveer – 3 file(s) modified
Added page title, meta description and meta tags in summary slide.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 1738 – Separate out user communications report from user orders report. Put ...

vikas — Thu, 05 May 2011 19:24:36 +0530

vikas – 2 file(s) modified
Separate out user communications report from user orders report. Put dates properly in excel formats.

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

Rev 1737 – Moved imports below python path redefinition

rajveer — Thu, 05 May 2011 18:52:55 +0530

rajveer – 1 file(s) modified
Moved imports below python path redefinition

~ /trunk/PyProj/src/shop2020/logistics/service/script/HolidaysLoader.py

Rev 1736 – MOdified Base URL

varun.gupta — Thu, 05 May 2011 18:05:26 +0530

varun.gupta – 2 file(s) modified
MOdified Base URL

~ /trunk/Social/src/main/webapp/css/phonesiown.css
~ /trunk/Social/src/main/webapp/js/phonesiown.js

Rev 1735 – Made the base URL static, pointing to saholic.com

varun.gupta — Thu, 05 May 2011 17:39:31 +0530

varun.gupta – 1 file(s) modified
Made the base URL static, pointing to saholic.com

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

Rev 1734 – HTML changed

varun.gupta — Thu, 05 May 2011 17:38:22 +0530

varun.gupta – 1 file(s) modified
HTML changed

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

Rev 1733 – Made ServletContextAware

varun.gupta — Thu, 05 May 2011 16:49:27 +0530

varun.gupta – 3 file(s) modified
Made ServletContextAware

~ /trunk/Social/src/main/java/in/shop2020/social/controllers/MyPhonesController.java
~ /trunk/Social/src/main/webapp/css/phonesiown.css
~ /trunk/Social/src/main/webapp/WEB-INF/content/my-phones-index.vm

Rev 1732 – Holidays List

ankur.singhal — Thu, 05 May 2011 16:27:28 +0530

ankur.singhal – 1 file(s) modified
Holidays List

+ /trunk/PyProj/src/samplesheets/PublicHolidays.xls

Rev 1731 – optimisation of methods for getting max, min amounts of orders ...

ankur.singhal — Thu, 05 May 2011 16:24:31 +0530

ankur.singhal – 12 file(s) modified
optimisation of methods for getting max, min amounts of orders and payments. These methods are used for statistics (Support).

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/payments/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/payments/impl/PaymentsHandler.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/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 1730 – Adjustment of delivery time taking into account Holidays and Sundays.

ankur.singhal — Thu, 05 May 2011 16:19:46 +0530

ankur.singhal – 11 file(s) modified
Adjustment of delivery time taking into account Holidays and Sundays.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
+ /trunk/PyProj/src/shop2020/logistics/service/script/HolidaysLoader.py
+ /trunk/PyProj/src/shop2020/logistics/service/test/TestHolidays.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
+ /trunk/PyProj/src/shop2020/model/v1/order/test/TestDeliveryEstimate.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 1729 – Added CSS and moved JS and CSS code to separate ...

varun.gupta — Thu, 05 May 2011 16:19:33 +0530

varun.gupta – 5 file(s) modified
Added CSS and moved JS and CSS code to separate files

~ /trunk/Social/src/main/webapp/css/phonesiown.css
+ /trunk/Social/src/main/webapp/images
+ /trunk/Social/src/main/webapp/images/spriteme1.png
+ /trunk/Social/src/main/webapp/js/phonesiown.js
~ /trunk/Social/src/main/webapp/WEB-INF/content/my-phones-index.vm

Rev 1728 – Included the trunk POM as the parent

rajveer — Thu, 05 May 2011 15:34:11 +0530

rajveer – 1 file(s) modified
Included the trunk POM as the parent

~ /trunk/Social/pom.xml

Rev 1727 – Included Social in the reactor build

rajveer — Thu, 05 May 2011 15:30:54 +0530

rajveer – 2 file(s) modified
Included Social in the reactor build

~ /trunk/pom.xml
~ /trunk/Social/pom.xml

Rev 1726 – POST request handled.

varun.gupta — Thu, 05 May 2011 13:59:48 +0530

varun.gupta – 2 file(s) modified
POST request handled.

~ /trunk/Social/src/main/java/in/shop2020/social/controllers/MyPhonesController.java
~ /trunk/Social/src/main/webapp/WEB-INF/content/my-phones-index.vm

Rev 1725 – CSS modified

varun.gupta — Thu, 05 May 2011 12:42:52 +0530

varun.gupta – 2 file(s) modified
CSS modified

~ /trunk/Social/src/main/webapp/css/phonesiown.css
~ /trunk/Social/src/main/webapp/WEB-INF/content/my-phones-index.vm

Rev 1724 – Added product name in image name for SEO. Also removed ...

rajveer — Thu, 05 May 2011 11:34:38 +0530

rajveer – 2 file(s) modified
Added product name in image name for SEO. Also removed tabs

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

Rev 1723 – Made ITEM_ID a dynamic field.

varun.gupta — Thu, 05 May 2011 11:23:49 +0530

varun.gupta – 1 file(s) modified
Made ITEM_ID a dynamic field.

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

Rev 1722 – Use .local.shop2020.in as cookie domain in dev.

vikas — Thu, 05 May 2011 11:20:32 +0530

vikas – 2 file(s) modified
Use .local.shop2020.in as cookie domain in dev.

~ /trunk/Website/src/main/filters/dev/filters.properties
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 1721 – Deleted 'target' directory

varun.gupta — Thu, 05 May 2011 10:41:11 +0530

varun.gupta – 1 file(s) modified
Deleted 'target' directory

x /trunk/Social/target

Rev 1720 – Checking in the first version of FB app, 'Phones I ...

varun.gupta — Thu, 05 May 2011 10:24:16 +0530

varun.gupta – 84 file(s) modified
Checking in the first version of FB app, 'Phones I Own'.

+ /trunk/Social/.classpath
+ /trunk/Social/.project
+ /trunk/Social/.settings
+ /trunk/Social/.settings/org.eclipse.jdt.core.prefs
+ /trunk/Social/pom.xml
+ /trunk/Social/src
+ /trunk/Social/src/main
+ /trunk/Social/src/main/java
+ /trunk/Social/src/main/java/in
+ /trunk/Social/src/main/java/in/shop2020
+ /trunk/Social/src/main/java/in/shop2020/social
+ /trunk/Social/src/main/java/in/shop2020/social/controllers
+ /trunk/Social/src/main/java/in/shop2020/social/controllers/MyPhonesController.java
+ /trunk/Social/src/main/java/in/shop2020/social/controllers/PhonesIOwnController.java
+ /trunk/Social/src/main/java/in/shop2020/social/services
+ /trunk/Social/src/main/java/in/shop2020/social/services/SolrSearchService.java
+ /trunk/Social/src/main/java/in/shop2020/social/utils
+ /trunk/Social/src/main/java/in/shop2020/social/utils/FileUtils.java
+ /trunk/Social/src/main/java/in/shop2020/social/utils/Utils.java
+ /trunk/Social/src/main/resources
+ /trunk/Social/src/main/resources/struts.xml
+ /trunk/Social/src/main/webapp
+ /trunk/Social/src/main/webapp/css
+ /trunk/Social/src/main/webapp/css/phonesiown.css
+ /trunk/Social/src/main/webapp/js
+ /trunk/Social/src/main/webapp/WEB-INF
+ /trunk/Social/src/main/webapp/WEB-INF/content
+ /trunk/Social/src/main/webapp/WEB-INF/content/my-phones-index.vm
+ /trunk/Social/src/main/webapp/WEB-INF/content/phones-i-own-index.vm
+ /trunk/Social/src/main/webapp/WEB-INF/web.xml
+ /trunk/Social/src/test
+ /trunk/Social/src/test/resources
+ /trunk/Social/target
+ /trunk/Social/target/classes
+ /trunk/Social/target/classes/in
+ /trunk/Social/target/classes/in/shop2020
+ /trunk/Social/target/classes/in/shop2020/social
+ /trunk/Social/target/classes/in/shop2020/social/controllers
+ /trunk/Social/target/classes/in/shop2020/social/services
+ /trunk/Social/target/classes/in/shop2020/social/utils
+ /trunk/Social/target/classes/struts.xml
+ /trunk/Social/target/FbApps-1.0-Snapshot
+ /trunk/Social/target/FbApps-1.0-Snapshot.war
+ /trunk/Social/target/FbApps-1.0-Snapshot/css
+ /trunk/Social/target/FbApps-1.0-Snapshot/css/phonesiown.css
+ /trunk/Social/target/FbApps-1.0-Snapshot/META-INF
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/classes
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/classes/in
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/classes/in/shop2020
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/classes/in/shop2020/social
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/classes/in/shop2020/social/controllers
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/classes/in/shop2020/social/services
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/classes/in/shop2020/social/utils
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/classes/struts.xml
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/content
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/content/my-phones-index.vm
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/content/phones-i-own-index.vm
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/Common-1.0-SNAPSHOT.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/commons-collections-3.2.1.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/commons-digester-2.0.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/commons-fileupload-1.2.1.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/commons-io-1.3.2.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/commons-lang-2.4.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/commons-logging-1.0.4.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/freemarker-2.3.15.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/json-lib-2.1-jdk15.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/slf4j-api-1.5.8.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/slf4j-simple-1.5.8.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/struts2-convention-plugin-2.1.8.1.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/struts2-core-2.1.8.1.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/struts2-rest-plugin-2.1.8.1.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/thrift-0.2.0.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/ThriftConfig-1.0-SNAPSHOT.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/velocity-1.6.3.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/velocity-tools-1.4.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/xstream-1.2.2.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/lib/xwork-core-2.1.6.jar
+ /trunk/Social/target/FbApps-1.0-Snapshot/WEB-INF/web.xml
+ /trunk/Social/target/maven-archiver
+ /trunk/Social/target/maven-archiver/pom.properties
+ /trunk/Social/target/surefire
+ /trunk/Social/target/test-classes

Rev 1719 – Initial import.

varun.gupta — Thu, 05 May 2011 10:19:47 +0530

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

+ /trunk/Social

Rev 1718 – Remove the files downloaded from the email

chandranshu — Thu, 05 May 2011 06:12:32 +0530

chandranshu – 1 file(s) modified
Remove the files downloaded from the email

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

Rev 1717 – Samsung price updates

chandranshu — Thu, 05 May 2011 05:50:41 +0530

chandranshu – 1 file(s) modified
Samsung price updates

+ /trunk/PyProj/src/samplesheets/ItemList-Handset-04-May-2011.xls

Rev 1716 – action in form tag reverted.

ankur.singhal — Wed, 04 May 2011 18:24:01 +0530

ankur.singhal – 4 file(s) modified
action in form tag reverted.

~ /trunk/Support/src/main/webapp/WEB-INF/content/payment-details-authfail.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/payment-details-authsuccess.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/registered-users-authfail.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/registered-users-authsuccess.vm

Rev 1715 – added action to form tag.

ankur.singhal — Wed, 04 May 2011 18:00:03 +0530

ankur.singhal – 4 file(s) modified
added action to form tag.

Rev 1714 – replaced ( by {

rajveer — Wed, 04 May 2011 17:56:25 +0530

rajveer – 1 file(s) modified
replaced ( by {

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

Rev 1713 – put domain name also in cookie while removing it in ...

vikas — Wed, 04 May 2011 17:55:48 +0530

vikas – 4 file(s) modified
put domain name also in cookie while removing it in logout controller.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserAware.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 1712 – Fixed bug

rajveer — Wed, 04 May 2011 17:02:52 +0530

rajveer – 2 file(s) modified
Fixed bug

~ /trunk/ContentStore/src/velocity/entity_snippet_for_homepage.vm
~ /trunk/ContentStore/src/velocity/entity_snippet_for_widget.vm

Rev 1711 – Added partners content path in config file

rajveer — Wed, 04 May 2011 16:51:33 +0530

rajveer – 2 file(s) modified
Added partners content path in config file

~ /trunk/Common/src/main/resources/shop2020.cfg
~ /trunk/Common/src/main/resources/shop2020_production.cfg

Rev 1710 – Removed reference to the parent POM. Also removed unused imports ...

chandranshu — Wed, 04 May 2011 16:37:29 +0530

chandranshu – 4 file(s) modified
Removed reference to the parent POM. Also removed unused imports and variables

~ /ClientAgent/pom.xml
~ /ClientAgent/src/main/java/in/shop2020/agent/database/DatabaseConnector.java
~ /ClientAgent/src/main/java/in/shop2020/agent/DataFetcher.java
~ /ClientAgent/src/main/java/in/shop2020/agent/DataPoster.java

Rev 1709 – Removed a lot of commented lines and added invocation of ...

rajveer — Wed, 04 May 2011 16:29:06 +0530

rajveer – 1 file(s) modified
Removed a lot of commented lines and added invocation of EmailSender

~ /trunk/runutils/start-py-services.sh

Rev 1708 – Added support to generate content for partners and deploy them

chandranshu — Wed, 04 May 2011 16:18:30 +0530

chandranshu – 2 file(s) modified
Added support to generate content for partners and deploy them

~ /trunk/runutils/generate-static-html.sh
~ /trunk/runutils/update-content.sh

Rev 1707 – Started removing old direcotries as well

chandranshu — Wed, 04 May 2011 16:06:00 +0530

chandranshu – 1 file(s) modified
Started removing old direcotries as well

~ /trunk/runutils/backup-CMS.sh

Rev 1706 – Committing the script to start python scripts using code and ...

chandranshu — Wed, 04 May 2011 16:04:12 +0530

chandranshu – 1 file(s) modified
Committing the script to start python scripts using code and not trunk-chkout

~ /trunk/runutils/start-py-services.sh

Rev 1705 – added partners resources path

rajveer — Wed, 04 May 2011 16:03:07 +0530

rajveer – 2 file(s) modified
added partners resources path

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java