aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* CSSPanel - fix code indentationEric Guzman2012-02-16
* CSS Panel - Add Resizer to sub panelsEric Guzman2012-02-16
* Merge branch 'components' of https://github.com/mencio/ninja-internal into in...Valerio Virgillito2012-02-14
|\
| * Add support for drag and drop for the components.Valerio Virgillito2012-02-14
| * Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-13
| |\
| * | Setting defaults and more cleanupValerio Virgillito2012-02-09
| * | code cleanup, light refactor and now adding components at the center stage po...Valerio Virgillito2012-02-09
| * | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-09
| |\ \
| * | | Switching the components panel to use the new ninja tree component.Valerio Virgillito2012-02-09
| * | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-08
| |\ \ \
| * | | | initial integration of new tree componentsValerio Virgillito2012-02-06
| * | | | Merge branch 'master' into componentsValerio Virgillito2012-02-06
| |\ \ \ \
| * | | | | Moving the data files to a separate folder for now until montage provides the...Valerio Virgillito2012-02-06
| * | | | | button component using json dataValerio Virgillito2012-02-03
| * | | | | Merge branch 'master' into componentsValerio Virgillito2012-02-03
| |\ \ \ \ \
| * | | | | | Fix the main user component to create distinct instance of component.Valerio Virgillito2012-02-03
| * | | | | | Using async to load the required component.Valerio Virgillito2012-02-02
| * | | | | | adding a componentController and callback for lazy loading.Valerio Virgillito2012-02-02
| * | | | | | Simple button native widget test. Added a controller, pi and panel code.Valerio Virgillito2012-02-01
| * | | | | | Montage Native Widgets: Cleanup of current componentsValerio Virgillito2012-01-31
* | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-02-13
| |\ \ \ \ \ \
| * | | | | | | Cleaning up the stage background color chip.Valerio Virgillito2012-02-13
| * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into sta...Valerio Virgillito2012-02-12
| |\ \ \ \ \ \ \
| * | | | | | | | initial color chip for the stageValerio Virgillito2012-02-10
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Bug FixesJose Antonio Marquez2012-02-13
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
|\| | | | | |
| * | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-02-10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-02-09
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Removed unused materials.Nivesh Rajbhandari2012-02-09
* | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into fea...Valerio Virgillito2012-02-09
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into tex...Armen Kesablyan2012-02-07
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Initial Text Tool ImplementationArmen Kesablyan2012-02-02
| * | | | | | | | Merge branch 'Timeline' of https://github.com/imix23ways/ninja-internal into ...Valerio Virgillito2012-02-09
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Squashed commit of the following:Jonathan Duran2012-02-09
| | * | | | | | | Fix layer/element selection on first click selectJonathan Duran2012-02-09
| | * | | | | | | Squashed commit of the following:Jonathan Duran2012-02-09
| | * | | | | | | Fixes for animation element assignmentJonathan Duran2012-02-09
| | * | | | | | | CleanupJonathan Duran2012-02-09
| | * | | | | | | Cleaning up more code and adding more models for timelineJonathan Duran2012-02-09
| | * | | | | | | Squashed commit of the following:Jonathan Duran2012-02-08
| | * | | | | | | Display time reading above layers and code clean upJonathan Duran2012-02-08
| | * | | | | | | Merge branch 'refs/heads/Timeline_updated' into TimelineJonathan Duran2012-02-08
| | |\ \ \ \ \ \ \
| | | * | | | | | | Numbering of layers between different selectedContainers starts from 1Kruti Shah2012-02-08
| | * | | | | | | | Squashed commit of the following:Jonathan Duran2012-02-08
| | * | | | | | | | Squashed commit of the following:Jonathan Duran2012-02-08
| | |/ / / / / / /
| | * | | | | | | Merge branch 'refs/heads/Timeline-jreid' into TimelineJonathan Duran2012-02-08
| | |\ \ \ \ \ \ \
| | | * | | | | | | Timeline: restore method incorrectly removed in last commit.Jon Reid2012-02-08