| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-17 |
| |\ | |||
| | * | Merge pull request #244 from joseeight/Document | Valerio Virgillito | 2012-05-17 |
| | |\ | | | | | | | Cleaning up files for templates | ||
| | | * | Sharing app data in banner and html templates | Jose Antonio Marquez | 2012-05-17 |
| | | | | | | | | | | | | | Syncing the files to avoid duplicates and ensure consistency. | ||
| | * | | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-17 |
| | |\| | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
| | | * | Merge pull request #243 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-17 |
| | | |\ | | | | | | | | | Adding default padding for banner templates. | ||
| | * | | | fixing the breadcrumb | Valerio Virgillito | 2012-05-17 |
| | |/ / | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | / | Fixed border radius hot-text linking that was broken by update to montage v.10. | Nivesh Rajbhandari | 2012-05-17 |
| | |/ |/| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Fixed chrome preview for banner templates. | Nivesh Rajbhandari | 2012-05-17 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-17 |
| |\| | |||
| | * | Merge pull request #242 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-17 |
| | |\ | | | | | | | IKNinja-1628 - Can't draw shapes inside canvas after double-clicking into canvas. | ||
| | * | | Adding a disabled property to the label-checkbox. | Valerio Virgillito | 2012-05-17 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | document controller and stage view code cleanup | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | code cleanup and refactoring of the document controller and stage view | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | clearing the needs save flag on save. | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-16 |
| | |\ \ | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
| | | * \ | Merge pull request #241 from joseeight/Document | Valerio Virgillito | 2012-05-16 |
| | | |\ \ | | | | | | | | | | | Adding saving of Montage Components | ||
| | | | * \ | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-16 |
| | | | |\ \ | | | |/ / | | |/| | | |||
| | | | * | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-16 |
| | | | |\ \ | |||
| | | | * | | | Fixing serialization referencing (new object per save) | Jose Antonio Marquez | 2012-05-16 |
| | | | | | | | |||
| | | | * | | | Fixing reference to serialization tag | Jose Antonio Marquez | 2012-05-16 |
| | | | | | | | |||
| | | | * | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-16 |
| | | | |\ \ \ | |||
| | | | * | | | | Adding basic montage components I/O | Jose Antonio Marquez | 2012-05-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only for saving basic components without a reel. | ||
| | * | | | | | | Timeline should not select an element when a layer is selected by code. | Valerio Virgillito | 2012-05-16 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | / | Adding default padding for banner templates. | Nivesh Rajbhandari | 2012-05-17 |
| | |_|_|_|/ |/| | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | IKNinja-1628 - Can't draw shapes inside canvas after double-clicking into ↵ | Nivesh Rajbhandari | 2012-05-17 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-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/WorkingBranch | Valerio Virgillito | 2012-05-16 |
| | |\ \ \ \ | | | | | | | | | | | | | Tool Options styling and Icon update | ||
| | | * | | | | fixed bug with keyboard shortcut for fill/ink tool | John Mayhew | 2012-05-16 |
| | | | | | | | |||
| | | * | | | | -added new images for the text tool options | John Mayhew | 2012-05-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -simplified text options CSS -fixed styling to accommodate new images | ||
| | | * | | | | updated object 3D options bar to use the new radio styles | John Mayhew | 2012-05-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | removed its use of the sprite sheet | ||
| | | * | | | | Merge pull request #1 from mencio/WorkingBranch | mayhewinator | 2012-05-15 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Working branch - Adding the color pre-flight for the Tag tool | ||
| | | | * | | | | Add color to tag tool | Valerio Virgillito | 2012-05-15 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-05-15 |
| | | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | WorkingBranch | ||
| | * | | | | | Merge pull request #219 from mqg734/TreeFix | Valerio Virgillito | 2012-05-11 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Removing outdated references in tree code. | ||
| | | * | | | | | Removing obsolete treeList reference in preset templates. | Nivesh Rajbhandari | 2012-05-11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | Removing outdated tree-controller. | Nivesh Rajbhandari | 2012-05-11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | Merge pull request #215 from mqg734/WebGLFixes | Valerio Virgillito | 2012-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 WebGLFixes | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-05-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-08 |
| | | |\ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-07 |
| | | |\ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-03 |
| | | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | | Converting canvas runtime to use prototypes for geom obj, rectangle, oval ↵ | Nivesh Rajbhandari | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and line. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-03 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | Converting geom-obj to object literal notation. | Nivesh Rajbhandari | 2012-05-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | | | Converting line, circle and rectangle shapes to object literal notation. | Nivesh Rajbhandari | 2012-05-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | | | | | * | | | | -fixed spacing problem in the tag tool | John Mayhew | 2012-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 Mayhew | 2012-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 tool | John Mayhew | 2012-05-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||