aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* CSSPanel - fix code indentationEric Guzman2012-02-16
* CSS Panel - Add Resizer to sub panelsEric Guzman2012-02-16
* Merge branch 'refs/heads/integration'Valerio Virgillito2012-02-15
|\
| * Merge pull request #42 from ananyasen/IO-patch-ninja-internal-master-ananyaValerio Virgillito2012-02-14
| |\
| | * allow / for window directory path formatAnanya Sen2012-02-14
| |/
| * Merge branch 'live-preview-fix' of https://github.com/mencio/ninja-internal i...Valerio Virgillito2012-02-14
| |\
| * \ Merge branch 'components' of https://github.com/mencio/ninja-internal into in...Valerio Virgillito2012-02-14
| |\ \
| | * | small changes to the tree component to allow events to be passed and add a do...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
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into componentsValerio Virgillito2012-02-06
| | |\ \ \ \ \
| | * | | | | | 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
| | * | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-05
| | |\ \ \ \ \ \ \
| | * | | | | | | | removing the appdelegate. Now using a main reel instead.Valerio Virgillito2012-02-03
| | * | | | | | | | removing the old v0.6 montage folder and updating the referencesValerio Virgillito2012-02-03
| | * | | | | | | | 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
| | * | | | | | | | | Temporary son for Montage button.Valerio Virgillito2012-02-01
| | * | | | | | | | | Simple button native widget test. Added a controller, pi and panel code.Valerio Virgillito2012-02-01
| | * | | | | | | | | Changing the user document application to use a main componentValerio Virgillito2012-02-01
| | * | | | | | | | | Adding a montage framework copy for the user documentValerio Virgillito2012-02-01
| | * | | | | | | | | Montage Native Widgets: Cleanup of current componentsValerio Virgillito2012-01-31
| | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into com...Valerio Virgillito2012-01-31
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into componentsValerio Virgillito2012-01-30
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Moved the ninja components out of the Montage folderValerio Virgillito2012-01-30
| * | | | | | | | | | | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into int...Valerio Virgillito2012-02-14
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Changed height of css panelArmen Kesablyan2012-02-14
| | * | | | | | | | | | | | Merge branch 'refs/heads/master' into text-toolArmen Kesablyan2012-02-14
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-02-14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | | appended function : toViewportCoordinates in stageArmen Kesablyan2012-02-13
| | * | | | | | | | | | | | | Merge branch 'refs/heads/master' into text-toolArmen Kesablyan2012-02-13
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-02-13
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-02-07
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Revert "Initial Text Tool Implementation"Armen Kesablyan2012-02-07
| | * | | | | | | | | | | | | | | Fixed binding to font size dropdownArmen Kesablyan2012-02-13
| | * | | | | | | | | | | | | | | Fixed Color on text edit. Also Fixed Indent & Outdent button. toggle bullet a...Armen Kesablyan2012-02-13
| * | | | | | | | | | | | | | | | Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into int...Valerio Virgillito2012-02-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Cleaning up requiresJose Antonio Marquez2012-02-14
| | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | save integration - minor bug fixAnanya Sen2012-02-13