| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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/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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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 Mayhew | 2012-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 Mayhew | 2012-05-10 |
| | | | | | | | |\ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | WorkingBranch | ||
| | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-05-09 |
| | |\ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ | Merge pull request #185 from ericguzman/StylesControllerPatch | Valerio Virgillito | 2012-05-09 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Styles Controller - Fix error when trying dispatch stylesheet change eve... | ||
| | | | * | | | | | | | | Styles Controller - Fix error when trying dispatch stylesheet change event | Eric Guzman | 2012-05-01 |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | some code cleanup | Valerio Virgillito | 2012-05-09 |
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | / / / | Squashed commit of google-components into master | Valerio Virgillito | 2012-05-09 |
| | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | | | | | * | | put color chips in the inkbottle and fill tool | John Mayhew | 2012-05-10 |
| | | | | | | | | | | |||
| | | | | | | | * | | removed unnecessary css class | John Mayhew | 2012-05-10 |
| | | | | | | | | | | |||
| | | | | | | | * | | -moved sel tool images to proper folder | John Mayhew | 2012-05-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -finished styling shape tool options -added new icons for shape tool | ||
| | | | | | | | * | | -Consolidated many redundant css classes used in the tool options bars | John Mayhew | 2012-05-09 |
| | | | | | | | | | | |||
| | | | | | | | * | | Correct layout and styling for the shape tool and its sub tools | John Mayhew | 2012-05-09 |
| | | | | | | | | | | |||
| | | | | | | | * | | -Put new selection tool icons in the options bar | John Mayhew | 2012-05-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Styled the selection tool options bar | ||
| | | | | | | | * | | implemented proper styling for shape, inkbottle and fill tools | John Mayhew | 2012-05-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make all icons for fill and stroke use the proper classes/images | ||
| | | | | | | | * | | removed unused classes form selection properties reel | John Mayhew | 2012-05-08 |
| | | | | | | | | | | |||
| | | | | | | | * | | Moved out old select tool image css classes into the proper css file. | John Mayhew | 2012-05-08 |
| | | | | | | | | | | |||
| | | | | | | | * | | moved all tag tool css back into the scss file | John Mayhew | 2012-05-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added extra padding before first input control | ||
| | | | | | | | * | | -Removed id dependence of the tag tool options CSS | John Mayhew | 2012-05-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Separated the options3d CSS from the tag tool options css -Removed unused translateObjectToolContainer CSS class | ||
| | | | | | | | * | | Removed unused SubSelect Tool | John Mayhew | 2012-05-08 |
| | | | | | | | | | | |||
| | | | | | | | * | | Fixed missing quote from last merge | John Mayhew | 2012-05-07 |
| | | | | | | | |||