Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
19685 3637 d 19 h kshitij.sood /trunk/ Entity upload  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityUploadController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-upload-deny.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-upload-result.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-upload.vm
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
/trunk/ContentStore/src/main/java/in/shop2020/content/security/Action.java
/trunk/ContentStore/src/main/java/in/shop2020/content/security/RoleManager.java
/trunk/ContentStore/src/main/java/in/shop2020/content/security/UserManager.java
/trunk/ContentStore/src/main/java/in/shop2020/util/EntityUtils.java
19601 3649 d 16 h amit.gupta /trunk/ContentCreation/src/main/webapp/ Added export entities link  
/trunk/ContentCreation/src/main/webapp/js/jquery.base64.js
/trunk/ContentCreation/src/main/webapp/js/tableExport.js
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
6877 4801 d 18 h amit.gupta /trunk/ContentCreation/src/main/ added ready on removed created on.  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
/trunk/ContentCreation/src/main/webapp/js/entity-index.js
6519 4868 d 20 h kshitij.sood /trunk/ContentCreation/src/main/ Controller and VM's for tag implementation in CMS.  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/TagPageController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-addentity.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-edit.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-editNew.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-index.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-show.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
5180 5087 d 20 h amit.gupta /trunk/ContentCreation/src/main/ Made "Brand/ModelName/ModelNumber" javascript safe  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
5074 5102 d 20 h amit.gupta /trunk/ #1113
Allow Brand level and category level synonyms
Reviewer: Rajveer		  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SynonymController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/synonym-index.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/synonym-update.vm
/trunk/ContentCreation/src/main/webapp/js/synonym-index.js
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
/trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java
/trunk/ContentStore/src/main/java/in/shop2020/util/NewIR.java
/trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java
/trunk/ContentStore/src/xml/model/datatypedefinitions.xml
/trunk/ContentStore/src/xml/model/featuredefinitions.xml
/trunk/ContentStore/src/xml/model/slidedefinitions.xml
5012 5115 d 16 h amit.gupta /trunk/ContentCreation/src/main/ #599--Support for "create from existing entity" option in CMS
Reviewer : varun.gupta		  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
/trunk/ContentCreation/src/main/webapp/js/entity-index.js
4755 5142 d 22 h amit.gupta /trunk/ContentCreation/src/main/webapp/ Paginated the entity table.
#986		  
/trunk/ContentCreation/src/main/webapp/css/datatable.css
/trunk/ContentCreation/src/main/webapp/jquery/jquery.dataTables.js
/trunk/ContentCreation/src/main/webapp/js/entity-index.js
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
4129 5260 d 17 h mandeep.dhir /trunk/ Showing item details like color, start date, status etc. for each entity
Adding NFC feature in Data connectivity slide (Modified comparison rules)
Fixed a bug to pass appropriate item_id in ProductDetail snippet		  
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-catalog-details.vm
/trunk/ContentCreation/src/main/webapp/css/colorbox.css
/trunk/ContentCreation/src/main/webapp/jquery/thirdparty
/trunk/ContentCreation/src/main/webapp/jquery/thirdparty/jquery.colorbox-min.js
/trunk/ContentCreation/src/main/webapp/js/common.js
/trunk/ContentCreation/src/main/webapp/js/events.js
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
/trunk/ContentStore/src/jython/comparisonrules/data_connectivity_math.py
/trunk/ContentStore/src/velocity/ProductDetail.vm
/trunk/ContentStore/src/xml/model/featuredefinitions.xml
/trunk/ContentStore/src/xml/model/slidedefinitions.xml
2838 5372 d 20 h mandeep.dhir /trunk/ Trac#485 UI for creating special pages' entries. Takes necessary attributes for them.  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SpecialPageController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-edit.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-editNew.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-index.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-show.vm
/trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/SpecialPage.java
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/SpecialPageJSONConvertor.java
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/BrandController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/brand-edit.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/brand-editNew.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/brand-index.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/brand-show.vm
/trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/Brand.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
/trunk/ContentStore/pom.xml
/trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/ServiceCentre.java
/trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java
/trunk/ContentStore/src/main/java/in/shop2020/storage/bdb/ContentDatabase.java
/trunk/ContentStore/src/main/java/in/shop2020/storage/bdb/ContentViews.java
/trunk/ContentStore/src/main/java/in/shop2020/storage/bdb/StorageManager.java
/trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
2768 5378 d 16 h mandeep.dhir /trunk/ Added a page in CMS to setup brand specific attributes
Trac#473		  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/BrandController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/brand-edit.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/brand-editNew.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/brand-index.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/brand-show.vm
/trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/Brand.java
/trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/ServiceCentre.java
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/HelpdocController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
/trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java
/trunk/ContentStore/src/main/java/in/shop2020/storage/bdb/ContentDatabase.java
/trunk/ContentStore/src/main/java/in/shop2020/storage/bdb/ContentViews.java
/trunk/ContentStore/src/main/java/in/shop2020/storage/bdb/StorageManager.java
2605 5392 d 18 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
2276 5416 d 17 h rajveer /trunk/ContentCreation/src/main/ Added support to create new help docs.  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/HelpdocController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/helpdoc-edit.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/helpdoc-editNew.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/helpdoc-index.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/helpdoc-show.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
2097 5430 d 17 h rajveer /trunk/ContentCreation/src/main/webapp/WEB-INF/content/ Corrected view to show list of pending items  
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
2095 5430 d 18 h rajveer /trunk/ContentCreation/src/main/ 1) Display entities to be made ready. 2) Not allow to assign ready entities between 2 to 4  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
1152 5504 d 15 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 5508 d 14 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
1051 5511 d 20 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
725 5557 d 14 h chandranshu /trunk/ContentCreation/ Added support to mark an item as content complete in the catalog  
/trunk/ContentCreation/src/in/shop2020/creation/controllers/ItemUpdateController.java
/trunk/ContentCreation/.classpath
/trunk/ContentCreation/build.xml
/trunk/ContentCreation/src/velocity/entity-index.vm
579 5576 d 15 h rajveer /trunk/ContentCreation/src/ Table sorting and validation on entity deletion.  
/trunk/ContentCreation/src/jquery/jquery.tablesorter.js
/trunk/ContentCreation/src/velocity/entity-index.vm

←Prev12Next→

Show All