aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-17
|\ | | | | | | | | | | | | | | Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Merge pull request #244 from joseeight/DocumentValerio Virgillito2012-05-17
| |\ | | | | | | Cleaning up files for templates
| | * Sharing app data in banner and html templatesJose Antonio Marquez2012-05-17
| | | | | | | | | | | | Syncing the files to avoid duplicates and ensure consistency.
| * | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-17
| |\| | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| | * Fixed chrome preview for banner templates.Nivesh Rajbhandari2012-05-17
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-17
| | |\
| | * | Adding default padding for banner templates.Nivesh Rajbhandari2012-05-17
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | fixing the breadcrumbValerio Virgillito2012-05-17
| | |/ | |/| | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge pull request #242 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-17
| |\| | | | | | | IKNinja-1628 - Can't draw shapes inside canvas after double-clicking into canvas.
| | * IKNinja-1628 - Can't draw shapes inside canvas after double-clicking into ↵Nivesh Rajbhandari2012-05-17
| | | | | | | | | | | | | | | | | | canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Adding a disabled property to the label-checkbox.Valerio Virgillito2012-05-17
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | document controller and stage view code cleanupValerio Virgillito2012-05-16
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | code cleanup and refactoring of the document controller and stage viewValerio Virgillito2012-05-16
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | clearing the needs save flag on save.Valerio Virgillito2012-05-16
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-16
| |\ \ | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| | * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-16
| | |\|
| | * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-16
| | |\ \
| | * | | Fixing serialization referencing (new object per save)Jose Antonio Marquez2012-05-16
| | | | |
| | * | | Fixing reference to serialization tagJose Antonio Marquez2012-05-16
| | | | |
| | * | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-16
| | |\ \ \
| | * | | | Adding basic montage components I/OJose Antonio Marquez2012-05-16
| | | | | | | | | | | | | | | | | | | | | | | | Only for saving basic components without a reel.
| * | | | | Timeline should not select an element when a layer is selected by code.Valerio Virgillito2012-05-16
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | fixed bug with keyboard shortcut for fill/ink toolJohn Mayhew2012-05-16
| | | | | |
| | * | | | -added new images for the text tool optionsJohn Mayhew2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -simplified text options CSS -fixed styling to accommodate new images
| | * | | | updated object 3D options bar to use the new radio stylesJohn Mayhew2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | removed its use of the sprite sheet
| | * | | | Add color to tag toolValerio Virgillito2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-15
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | WorkingBranch
| | * | | | | -fixed spacing problem in the tag toolJohn Mayhew2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -implemented the new mode radio buttons for the pen tool
| | * | | | | -changed tool options radio button class to match the styling of the shape ↵John Mayhew2012-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options tool buttons -fixed bug injected in the tag tool caused by accidental removal of the value element attribute -moved color chip in the tag tool to the right of the element radio button group
| | * | | | | -updated images for tag and zoom toolJohn Mayhew2012-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -made tag and zoom tool radio group button styles consistent and removed duplicate classes
| | * | | | | fixed bug introduced when we removed the color toolbar. The styling of the ↵John Mayhew2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | color chips in the PI was broken due to a reliance on a css class from the colortoolbar reel. The requried class was copied to the properties.css file as a temporary fix.
| | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-10
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch
| | * | | | | | put color chips in the inkbottle and fill toolJohn Mayhew2012-05-10
| | | | | | | |
| | * | | | | | removed unnecessary css classJohn Mayhew2012-05-10
| | | | | | | |
| | * | | | | | -moved sel tool images to proper folderJohn Mayhew2012-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -finished styling shape tool options -added new icons for shape tool
| | * | | | | | -Consolidated many redundant css classes used in the tool options barsJohn Mayhew2012-05-09
| | | | | | | |
| | * | | | | | Correct layout and styling for the shape tool and its sub toolsJohn Mayhew2012-05-09
| | | | | | | |
| | * | | | | | -Put new selection tool icons in the options barJohn Mayhew2012-05-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Styled the selection tool options bar
| | * | | | | | implemented proper styling for shape, inkbottle and fill toolsJohn Mayhew2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make all icons for fill and stroke use the proper classes/images
| | * | | | | | removed unused classes form selection properties reelJohn Mayhew2012-05-08
| | | | | | | |
| | * | | | | | moved all tag tool css back into the scss fileJohn Mayhew2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added extra padding before first input control
| | * | | | | | -Removed id dependence of the tag tool options CSSJohn Mayhew2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Separated the options3d CSS from the tag tool options css -Removed unused translateObjectToolContainer CSS class
| | * | | | | | Removed unused SubSelect ToolJohn Mayhew2012-05-08
| | | | | | | |
| | * | | | | | Fixed missing quote from last mergeJohn Mayhew2012-05-07
| | | | | | | |
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-07
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
| | * | | | | | | more work on making subtool styling/layout consistentJohn Mayhew2012-05-07
| | | | | | | | |
| | * | | | | | | More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |