aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| * Merge pull request #243 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-17
| |\ | | | | | | Adding default padding for banner templates.
| | * 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 pull request #241 from joseeight/DocumentValerio Virgillito2012-05-16
| |\ \ | | |/ | |/| Adding saving of Montage Components
| | * 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>
| * \ \ \ Merge pull request #239 from mayhewinator/WorkingBranchValerio Virgillito2012-05-16
| |\ \ \ \ | | | | | | | | | | | | Tool Options styling and Icon update
| | * | | | 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
| | * | | | Merge pull request #1 from mencio/WorkingBranchmayhewinator2012-05-15
| | |\ \ \ \ | | | | | | | | | | | | | | Working branch - Adding the color pre-flight for the Tag tool
| | | * | | | 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
| * | | | | Merge pull request #219 from mqg734/TreeFixValerio Virgillito2012-05-11
| |\ \ \ \ \ | | | | | | | | | | | | | | Removing outdated references in tree code.
| | * | | | | Removing obsolete treeList reference in preset templates.Nivesh Rajbhandari2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Removing outdated tree-controller.Nivesh Rajbhandari2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | Merge pull request #215 from mqg734/WebGLFixesValerio Virgillito2012-05-11
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Updated Line, Oval and Rectangle geom classes to use object literal notation. Also, updated canvas-runtime.js to use object literal notation.
| | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-10
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Updating canvas-runtime to use object literal notation.Nivesh Rajbhandari2012-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-08
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-07
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-03
| | |\ \ \ \ \ \ \
| | * | | | | | | | Converting canvas runtime to use prototypes for geom obj, rectangle, oval ↵Nivesh Rajbhandari2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and line. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-03
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Converting geom-obj to object literal notation.Nivesh Rajbhandari2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | Converting line, circle and rectangle shapes to object literal notation.Nivesh Rajbhandari2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | | | * | | | -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
| | | | | | | |\ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | |