Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-24 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | | | Clean up | Jose Antonio Marquez | 2012-04-19 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #239 from mayhewinator/WorkingBranch | Valerio Virgillito | 2012-05-16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | 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 | |
| | * | | | | | | | | | | | | | | | | | updated object 3D options bar to use the new radio styles | John Mayhew | 2012-05-15 | |
| | * | | | | | | | | | | | | | | | | | Merge pull request #1 from mencio/WorkingBranch | mayhewinator | 2012-05-15 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | | Add color to tag tool | Valerio Virgillito | 2012-05-15 | |
| | |/ / / / / / / / / / / / / / / / / | ||||
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-05-15 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #219 from mqg734/TreeFix | Valerio Virgillito | 2012-05-11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | Removing obsolete treeList reference in preset templates. | Nivesh Rajbhandari | 2012-05-11 | |
| | * | | | | | | | | | | | | | | | | | Removing outdated tree-controller. | Nivesh Rajbhandari | 2012-05-11 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | Merge pull request #215 from mqg734/WebGLFixes | Valerio Virgillito | 2012-05-11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | Updating canvas-runtime to use object literal notation. | Nivesh Rajbhandari | 2012-05-10 | |
| | * | | | | | | | | | | | | | | | | 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 and... | Nivesh Rajbhandari | 2012-05-03 | |
| | * | | | | | | | | | | | | | | | | 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 | |
| | * | | | | | | | | | | | | | | | | Converting line, circle and rectangle shapes to object literal notation. | Nivesh Rajbhandari | 2012-05-02 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | ||||
| | | | | | | * | | | | | | | | | | -fixed spacing problem in the tag tool | John Mayhew | 2012-05-15 | |
| | | | | | | * | | | | | | | | | | -changed tool options radio button class to match the styling of the shape op... | John Mayhew | 2012-05-14 | |
| | | | | | | * | | | | | | | | | | -updated images for tag and zoom tool | John Mayhew | 2012-05-14 | |
| | | | | | | * | | | | | | | | | | fixed bug introduced when we removed the color toolbar. The styling of the co... | John Mayhew | 2012-05-11 | |
| | | | | | | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-05-10 | |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||
| | | | | | | * | | | | | | | | | | 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 | |
| | | | | | | * | | | | | | | | | | -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 | |
| | | | | | | * | | | | | | | | | | implemented proper styling for shape, inkbottle and fill tools | John Mayhew | 2012-05-08 | |
| | | | | | | * | | | | | | | | | | 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 | |
| | | | | | | * | | | | | | | | | | -Removed id dependence of the tag tool options CSS | John Mayhew | 2012- |