Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
11873 4306 d 16 h amit.gupta /trunk/ContentCreation/src/main/ Added Url for entities in content  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm
8865 4532 d 11 h amit.gupta /trunk/ Added to migration.  
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-editSlide.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/media-index.vm
/trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/FreeformContent.java
/trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java
/trunk/ContentStore/src/main/java/in/shop2020/storage/mongo/StorageManager.java
/trunk/ContentStore/src/main/java/in/shop2020/storage/mongo/adapters/FFCAdapter.java
/trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
/trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
/trunk/ContentStore/src/velocity/SlideGuide.vm
/trunk/Website/src/test/resources/scripts/generate-static-content.sh
8025 4616 d 9 h amit.gupta /trunk/ContentCreation/src/main/ Bug fixed in cmp scores  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/cmp-scores-show.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm
8024 4616 d 10 h amit.gupta /trunk/ Comparisions are now editable  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/CmpScoresController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/cmp-scores-show.vm
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm
/trunk/ContentStore/src/jython/comparisonrules/display_math.py
/trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java
/trunk/ContentStore/src/main/java/in/shop2020/util/NewCMP.java
7960 4631 d 14 h amit.gupta /trunk/ContentCreation/src/main/webapp/WEB-INF/content/ Minor bug fixed  
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm
7958 4631 d 15 h amit.gupta /trunk/ContentCreation/src/main/ Added info related to score.  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-edit-new.vm
3640 5300 d 8 h mandeep.dhir /trunk/ContentCreation/src/main/webapp/WEB-INF/content/ Trac#551 Fixed the issue where with skin videos were played inside a skin  
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm
2605 5390 d 11 h rajveer /trunk/ContentCreation/src/main/webapp/WEB-INF/content/ Changed order of model name and model number as per trac ticket: 425  
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-edit.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-editNew.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-editSlide.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm
2103 5428 d 10 h varun.gupta /trunk/ContentCreation/src/main/webapp/ Trac #274 - Switching between chrome and chromeless player now working  
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm
/trunk/ContentCreation/src/main/webapp/css/product.css
/trunk/ContentCreation/src/main/webapp/js/gallery.js
1158 5501 d 17 h rajveer /trunk/ContentCreation/src/main/webapp/WEB-INF/content/ Summary slide will also be viewed to content team  
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm
1152 5502 d 9 h rajveer /trunk/ContentCreation/src/main/ Modified the Login interceptor to point at root location. added images and css for view. Updated slidescontroller to remove duplicate slides problem. Update velocity files and EntityController to get only entitystate for view.  
/trunk/ContentCreation/src/main/webapp/images
/trunk/ContentCreation/src/main/webapp/images/actionbar-hor-bar.jpg
/trunk/ContentCreation/src/main/webapp/images/actionbar-left.jpg
/trunk/ContentCreation/src/main/webapp/images/actionbar-right.jpg
/trunk/ContentCreation/src/main/webapp/images/black-bullet.gif
/trunk/ContentCreation/src/main/webapp/images/grey-bullet.gif
/trunk/ContentCreation/src/main/webapp/images/mehron-square-bullet.gif
/trunk/ContentCreation/src/main/webapp/images/slideguide-content-bottom-center.jpg
/trunk/ContentCreation/src/main/webapp/images/slideguide-content-bottom-left.jpg
/trunk/ContentCreation/src/main/webapp/images/slideguide-content-bottom-right.jpg
/trunk/ContentCreation/src/main/webapp/images/slideguide-content-top-center.jpg
/trunk/ContentCreation/src/main/webapp/images/slideguide-content-top-left.jpg
/trunk/ContentCreation/src/main/webapp/images/slideguide-content-top-right.jpg
/trunk/ContentCreation/src/main/webapp/images/slideguide-nav-arrow.jpg
/trunk/ContentCreation/src/main/webapp/images/slideguide-nav-ver-bar.jpg
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SlidesController.java
/trunk/ContentCreation/src/main/java/in/shop2020/creation/interceptors/LoginInterceptor.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm
/trunk/ContentCreation/src/main/webapp/css/common.css
1082 5506 d 7 h chandranshu /trunk/ContentCreation/ Moved around Velocity templates, JS files, CSS files and XML files to their rightful places  
/trunk/ContentCreation/src/main/resources/struts.xml
/trunk/ContentCreation/src/main/webapp/WEB-INF
/trunk/ContentCreation/src/main/webapp/WEB-INF/content
/trunk/ContentCreation/src/main/webapp/WEB-INF/web.xml
/trunk/ContentCreation/src/main/webapp/css
/trunk/ContentCreation/src/main/webapp/jquery
/trunk/ContentCreation/src/main/webapp/js
/trunk/ContentCreation/src/css
/trunk/ContentCreation/src/jquery
/trunk/ContentCreation/src/js
/trunk/ContentCreation/src/velocity
/trunk/ContentCreation/src/xml/config/struts.xml
/trunk/ContentCreation/src/xml/config/web.xml
/trunk/ContentCreation/build.xml
1068 5509 d 8 h rajveer /trunk/ContentCreation/ Added reordering of slides. Added css and js for view  
/trunk/ContentCreation/src/css
/trunk/ContentCreation/src/css/common.css
/trunk/ContentCreation/src/css/nav.css
/trunk/ContentCreation/src/css/product.css
/trunk/ContentCreation/src/css/style.css
/trunk/ContentCreation/src/jquery/jquery-1.2.6.pack.js
/trunk/ContentCreation/src/jquery/jquery.disable.text.select.pack.js
/trunk/ContentCreation/src/jquery/jquery.listreorder.js
/trunk/ContentCreation/src/js
/trunk/ContentCreation/src/js/gallery.js
/trunk/ContentCreation/src/js/jquery-1.4.2.js
/trunk/ContentCreation/src/js/jquery-ui.min.js
/trunk/ContentCreation/src/js/jsapi.js
/trunk/ContentCreation/src/js/loopedslider.js
/trunk/ContentCreation/src/js/scrolltab.js
/trunk/ContentCreation/build.xml
/trunk/ContentCreation/src/in/shop2020/creation/controllers/SlidesController.java
/trunk/ContentCreation/src/velocity/entity-show.vm
/trunk/ContentCreation/src/velocity/slides-edit.vm
1051 5509 d 13 h rajveer /trunk/ContentCreation/ CMS tool updates after Bdb storage. Also added user management.  
/trunk/ContentCreation/src/in/shop2020/creation/controllers/BaseController.java
/trunk/ContentCreation/src/in/shop2020/creation/controllers/LoginController.java
/trunk/ContentCreation/src/in/shop2020/creation/controllers/LogoutController.java
/trunk/ContentCreation/src/in/shop2020/creation/interceptors
/trunk/ContentCreation/src/in/shop2020/creation/interceptors/LoginInterceptor.java
/trunk/ContentCreation/src/velocity/login-index.vm
/trunk/ContentCreation/build.xml
/trunk/ContentCreation/src/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/in/shop2020/creation/controllers/ItemUpdateController.java
/trunk/ContentCreation/src/in/shop2020/creation/controllers/MediaController.java
/trunk/ContentCreation/src/in/shop2020/creation/controllers/SlidesController.java
/trunk/ContentCreation/src/in/shop2020/creation/util/ContentValidator.java
/trunk/ContentCreation/src/jsp/index.jsp
/trunk/ContentCreation/src/velocity/entity-editSlide.vm
/trunk/ContentCreation/src/velocity/entity-index.vm
/trunk/ContentCreation/src/velocity/entity-show.vm
/trunk/ContentCreation/src/velocity/media-index.vm
/trunk/ContentCreation/src/velocity/slides-edit.vm
/trunk/ContentCreation/src/xml/config/struts.xml
792 5540 d 6 h rajveer /trunk/ContentCreation/src/velocity/ Name changes  
/trunk/ContentCreation/src/velocity/entity-show.vm
480 5651 d 9 h rajveer /trunk/ContentCreation/ Moved Media and CreationUtils.
Added more features in media.
Implemented new order control of slides.		  
/trunk/ContentCreation/src/in/shop2020/creation/util/CreationUtils.java
/trunk/ContentCreation/src/in/shop2020/creation/util/Media.java
/trunk/ContentCreation/.classpath
/trunk/ContentCreation/src/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/in/shop2020/creation/controllers/MediaController.java
/trunk/ContentCreation/src/in/shop2020/creation/controllers/SlidesController.java
/trunk/ContentCreation/src/in/shop2020/creation/util/ContentValidator.java
/trunk/ContentCreation/src/velocity/entity-show.vm
/trunk/ContentCreation/src/velocity/media-index.vm
/trunk/ContentCreation/src/velocity/slides-edit.vm
300 5775 d 13 h rajveer /trunk/ContentCreation/src/velocity/ Change for Battery slide view correction  
/trunk/ContentCreation/src/velocity/entity-show.vm
250 5779 d 11 h naveen /trunk/ContentCreation/src/ Separating Incompletes  
/trunk/ContentCreation/src/in/shop2020/creation/util/ContentValidator.java
/trunk/ContentCreation/src/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/in/shop2020/creation/controllers/SlidesController.java
/trunk/ContentCreation/src/in/shop2020/creation/util/CreationUtils.java
/trunk/ContentCreation/src/velocity/entity-editSlide.vm
/trunk/ContentCreation/src/velocity/entity-index.vm
/trunk/ContentCreation/src/velocity/entity-show.vm
/trunk/ContentCreation/src/velocity/slides-edit.vm
247 5783 d 7 h naveen /trunk/ContentCreation/src/velocity/ Fix for free-form text  
/trunk/ContentCreation/src/velocity/entity-show.vm
242 5783 d 10 h naveen /trunk/ContentCreation/src/ Slide selection UI works  
/trunk/ContentCreation/src/in/shop2020/creation/controllers/SlidesController.java
/trunk/ContentCreation/src/velocity/entity-show.vm
/trunk/ContentCreation/src/velocity/slides-edit.vm
/trunk/ContentCreation/src/velocity/slides-fatal.vm
/trunk/ContentCreation/src/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/in/shop2020/creation/controllers/MediaController.java
/trunk/ContentCreation/src/in/shop2020/creation/util/CreationUtils.java
/trunk/ContentCreation/src/in/shop2020/creation/util/Media.java
/trunk/ContentCreation/src/velocity/entity-edit.vm
/trunk/ContentCreation/src/velocity/entity-editSlide.vm
/trunk/ContentCreation/src/velocity/entity-index.vm
/trunk/ContentCreation/src/velocity/media-index.vm