aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/TreeComponents' into PresetsPanelEric 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/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | disabling the auto open of a document on load. Temporary using the new projec...Valerio Virgillito2012-02-09
| * | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-01-30
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merged old FileIOJose Antonio Marquez2012-01-27
* | | | | | | | | | | | | Presets - Get/set active tab from local storage + other improvementsEric Guzman2012-02-15
* | | | | | | | | | | | | Presets - Modify application of preset classes for new json structureEric Guzman2012-02-15
* | | | | | | | | | | | | Presets - Modify structure of preset dataEric Guzman2012-02-15
* | | | | | | | | | | | | Presets - Add external json file with transition dataEric Guzman2012-02-15
* | | | | | | | | | | | | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-02-13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | Bug FixesJose Antonio Marquez2012-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
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Style Presets - Separate out the style preset data to new fileEric Guzman2012-02-13
* | | | | | | | | | | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-13
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-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