Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Remove byte order markers (BOM) | Kris Kowal | 2012-07-06 |
| | |||
* | Remove trailing spaces | Kris Kowal | 2012-07-06 |
| | |||
* | Remove trailing spaces | Kris Kowal | 2012-07-06 |
| | |||
* | Expand tabs | Kris Kowal | 2012-07-06 |
| | |||
* | Update copyright boilerplate | Kris Kowal | 2012-07-06 |
| | |||
* | Text Tool Fix - Can Not Switch Document when Text Tool Initialized | Armen Kesablyan | 2012-06-23 |
| | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-21 |
|\ | |||
| * | Adding transparent background to color chip buttons | Jose Antonio Marquez | 2012-06-20 |
| | | | | | | | | Add a transparent pattern to the background of color chips consumed in the app, this way you can preview colors in alpha. This was lost, just added back again. Not a big change, just minor CSS, so should only be quickly tested prior to merge. | ||
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-19 |
|\| | |||
| * | first iteration of adding serializable to ninja plus other changes to run ↵ | Valerio Virgillito | 2012-06-06 |
| | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Initial Text Tool Changes | Armen Kesablyan | 2012-06-05 |
|/ | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | -added new images for the text tool options | John Mayhew | 2012-05-15 |
| | | | | | -simplified text options CSS -fixed styling to accommodate new images | ||
* | -Consolidated many redundant css classes used in the tool options bars | John Mayhew | 2012-05-09 |
| | |||
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-05-07 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html | ||
| * | Removing unused components references | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | fixing the menu and tool properties | Valerio Virgillito | 2012-04-30 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | First round of moving color chips into the sub tools. Shape and Pen tool now ↵ | John Mayhew | 2012-05-03 |
|/ | | | | have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools. | ||
* | Removing all "module" declarations and replaced with "prototype" in ↵ | John Mayhew | 2012-04-26 |
| | | | | preparation for montage converting to the new "prototype" format fully | ||
* | fully removing our old button component from Ninja | Valerio Virgillito | 2012-03-19 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | fixing the Text tool toggle buttons | Valerio Virgillito | 2012-02-16 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵ | Valerio Virgillito | 2012-02-14 |
|\ | | | | | | | integration | ||
| * | Fixed binding to font size dropdown | Armen Kesablyan | 2012-02-13 |
| | | |||
| * | Fixed Color on text edit. Also Fixed Indent & Outdent button. toggle bullet ↵ | Armen Kesablyan | 2012-02-13 |
| | | | | | | | | and numbered now bound to text tool | ||
* | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-10 |
|\| | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html | ||
| * | More Text Tool Updates | Armen Kesablyan | 2012-02-09 |
| | | |||
| * | Refactored rich text editor location | Armen Kesablyan | 2012-02-07 |
| | | |||
| * | Initial Text tool completion. | Armen Kesablyan | 2012-02-07 |
| | | |||
* | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |
|/ | |||
* | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> |