aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge pull request #239 from mayhewinator/WorkingBranchValerio Virgillito2012-05-16
|\
| * fixed bug with keyboard shortcut for fill/ink toolJohn Mayhew2012-05-16
| * -added new images for the text tool optionsJohn Mayhew2012-05-15
| * updated object 3D options bar to use the new radio stylesJohn Mayhew2012-05-15
| * Merge pull request #1 from mencio/WorkingBranchmayhewinator2012-05-15
| |\
| | * Add color to tag toolValerio Virgillito2012-05-15
| |/
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-15
| |\ | |/ |/|
* | Merge pull request #219 from mqg734/TreeFixValerio Virgillito2012-05-11
|\ \
| * | Removing obsolete treeList reference in preset templates.Nivesh Rajbhandari2012-05-11
| * | Removing outdated tree-controller.Nivesh Rajbhandari2012-05-11
* | | Merge pull request #215 from mqg734/WebGLFixesValerio Virgillito2012-05-11
|\ \ \ | |/ / |/| |
| * | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-10
| |\ \ | |/ / |/| |
| * | Updating canvas-runtime to use object literal notation.Nivesh Rajbhandari2012-05-10
| * | 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 and...Nivesh Rajbhandari2012-05-03
| * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-03
| |\ \ \ \ \
| * | | | | | Converting geom-obj to object literal notation.Nivesh Rajbhandari2012-05-02
| * | | | | | Converting line, circle and rectangle shapes to object literal notation.Nivesh Rajbhandari2012-05-02
| | | | | | * -fixed spacing problem in the tag toolJohn Mayhew2012-05-15
| | | | | | * -changed tool options radio button class to match the styling of the shape op...John Mayhew2012-05-14
| | | | | | * -updated images for tag and zoom toolJohn Mayhew2012-05-14
| | | | | | * fixed bug introduced when we removed the color toolbar. The styling of the co...John Mayhew2012-05-11
| | | | | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-10
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-05-09
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #185 from ericguzman/StylesControllerPatchValerio Virgillito2012-05-09
| |\ \ \ \ \ \ \
| | * | | | | | | Styles Controller - Fix error when trying dispatch stylesheet change eventEric Guzman2012-05-01
* | | | | | | | | some code cleanupValerio Virgillito2012-05-09
|/ / / / / / / /
* | | | | | / / Squashed commit of google-components into masterValerio Virgillito2012-05-09
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge pull request #201 from ericmueller/SnappingValerio Virgillito2012-05-08
|\ \ \ \ \ \ \
| * | | | | | | Fixed a snapping issue on the mouse down in drawing tools.hwc4872012-05-08
| * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-05-08
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #197 from ananyasen/code-editor-patchValerio Virgillito2012-05-08
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | IKNINJA-1603Ananya Sen2012-05-08
| * | | | | | | fixed javascript errorsAnanya Sen2012-05-07
| * | | | | | | removed incorrect id selector css for code view container since its breaking it.Ananya Sen2012-05-07
|/ / / / / / /
| * / / / / / fixes for 2D and 3D translation.hwc4872012-05-07
|/ / / / / /
| | | | | * 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
| | | | | * -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
| | | | | * implemented proper styling for shape, inkbottle and fill toolsJohn Mayhew2012-05-08
| | | | | * removed unused classes form selection properties reelJohn Mayhew2012-05-08
| | | | | * Moved out old select tool image css classes into the proper css file.John Mayhew2012-05-08
| | | | | * moved all tag tool css back into the scss fileJohn Mayhew2012-05-08
| | | | | * -Removed id dependence of the tag tool options CSSJohn Mayhew2012-05-08
| | | | | * Removed unused SubSelect ToolJohn Mayhew2012-05-08