aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-21
|\
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-21
| |\
| | * Fixing reference issue for toolbar fill containerJose Antonio Marquez2012-06-21
| | * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-20
| | |\
| | * | Adding transparent background to color chip buttonsJose Antonio Marquez2012-06-20
* | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
|\| | |
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
| |\ \ \ | | | |/ | | |/|
| | * | updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
| | |/
* | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
|\| |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-19
| |\|
| | * removing serializable to the tree and adding a few more missing propertiesValerio Virgillito2012-06-11
| | * Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
| | |\
| | * \ Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-06
| | |\ \
| | * | | first iteration of adding serializable to ninja plus other changes to run the...Valerio Virgillito2012-06-06
* | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-11
|\| | | |
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-11
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge pull request #272 from pushkarjoshi/pentoolValerio Virgillito2012-06-06
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch 'master' into pentoolPushkar Joshi2012-05-31
| | | |\|
| | | * | More consistent local and global mouse coords which solves a bug with the Pen...Pushkar Joshi2012-05-29
| | | * | allow changes in the pen subtool in options to be seen by the pen tool code (...Pushkar Joshi2012-05-22
| | * | | Fill and Ink-Bottle fixes.Nivesh Rajbhandari2012-06-04
| | | |/ | | |/|
| * / | Initial Text Tool ChangesArmen Kesablyan2012-06-05
| |/ /
* | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-23
|\| |
| * | Removed unneeded identifier.Nivesh Rajbhandari2012-05-17
| * | Fixed border radius hot-text linking that was broken by update to montage v.10.Nivesh Rajbhandari2012-05-17
| |/
* | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-17
|\|
| * -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
| * Add color to tag toolValerio Virgillito2012-05-15
| * -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
| * 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 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
| * Fixed missing quote from last mergeJohn Mayhew2012-05-07
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-07
| |\
| * | more work on making subtool styling/layout consistentJohn Mayhew2012-05-07
| * | More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
| * | First round of moving color chips into the sub tools. Shape and Pen tool now ...John Mayhew2012-05-03
* | | ChangesArmen Kesablyan2012-05-14
* | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-08
|\ \ \ | | |/ | |/|