aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\
| * Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-02-13
| |\
| * \ Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-02-13
| |\ \
| * | | Cleaning up the stage background color chip.Valerio Virgillito2012-02-13
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Valerio Virgillito2012-02-12
| |\ \ \ | | | | | | | | | | | | | | | stage-color
| * | | | initial color chip for the stageValerio Virgillito2012-02-10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #34 from ericguzman/TreeComponentsValerio Virgillito2012-02-13
| |\ \ \ \ | | |_|_|/ | |/| | | Tree components - updating the ninja branch/leaf
| | * | | Ninja leaf - remove console lotEric Guzman2012-02-13
| | | | |
| | * | | Merge branch 'refs/heads/master' into TreeComponentsEric Guzman2012-02-13
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Tree Components - Change the way delegate methods are calledEric Guzman2012-02-13
| | | | |
* | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\| | | |
| * | | | Bug FixesJose Antonio Marquez2012-02-13
| | |/ / | |/| | | | | | | | | | | | | | | | | | IKNINJA-1101 IKNINJA-1079 IKNINJA-1144
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
| * | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵Valerio Virgillito2012-02-09
| |\ \ \ | | | | | | | | | | | | | | | feature-branch
| | * | | More Text Tool UpdatesArmen Kesablyan2012-02-09
| | | | |
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Armen Kesablyan2012-02-07
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text-tool Conflicts: _scss/compass_app_log.txt css/ninja.css
| | * | | | Refactored rich text editor locationArmen Kesablyan2012-02-07
| | | | | |
| | * | | | Initial Text tool completion.Armen Kesablyan2012-02-07
| | | | | |
| * | | | | Merge branch 'code-cleanup' of https://github.com/mencio/ninja-internal into ↵Valerio Virgillito2012-02-09
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | feature-branch
| | * | | | | Removing the un-used package.jsonValerio Virgillito2012-02-09
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Squashed commit of the following:Jonathan Duran2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |