| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-02 |
| |\ | |||
| | * | CSS Panel - Fix animation duration value updates from "infinite" to integer. | Eric Guzman | 2012-03-29 |
| | | | |||
| * | | CSS Updates - Update the shorthand map to include other order | Eric Guzman | 2012-03-12 |
| |/ | |||
| * | clearing the old local setting and using the new version/prefix local settings. | Valerio Virgillito | 2012-02-24 |
| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | CSSPanel - fix code indentation | Eric Guzman | 2012-02-16 |
| | | |||
| * | CSS Panel - Add Resizer to sub panels | Eric Guzman | 2012-02-16 |
| | | |||
| * | 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 | ||
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Armen Kesablyan | 2012-02-07 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | text-tool Conflicts: _scss/compass_app_log.txt css/ninja.css | ||
| | * | | Initial Text Tool Implementation | Armen Kesablyan | 2012-02-02 |
| | | | | | | | | | | | | | Has rich-text-editor in place need to place with finalized version when complete | ||
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-02 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js | ||
| | * | | upgrading to Montage v0.6 | Valerio Virgillito | 2012-02-02 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-01-30 |
| |\| | | | | | | | | | | | | | | | | | Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Stage.scss | ||
| | * | | CSSPanel Updates - Add new original CSS error icon | Eric Guzman | 2012-01-30 |
| | |/ | |||
| * / | 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> | |||