aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-16
|\
| * Merge pull request #45 from joseeight/FileIOValerio Virgillito2012-02-16
| |\
| | * Squashed commit of the following:Jose Antonio Marquez2012-02-16
| | * Setting up webGL library copy on saveJose Antonio Marquez2012-02-15
| | * Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-15
| | |\
| | * | Setting up webGL local library (assets)Jose Antonio Marquez2012-02-15
| | * | Creating NinjaTemplate to HTML functionJose Antonio Marquez2012-02-14
| | * | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-14
| | |\ \
| | | * | allow / in windows directory pathAnanya Sen2012-02-14
| | | * | use button tag for save as dialogAnanya Sen2012-02-14
| | * | | Reverting text/html document classes and setting up MVC folder structureJose Antonio Marquez2012-02-14
| | * | | Merging TextDocument into BaseDocumentJose Antonio Marquez2012-02-14
| | |/ /
| | * | Cleaning upJose Antonio Marquez2012-02-14
| | * | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-14
| | |\ \
| | * | | Cleaning up mediatorJose Antonio Marquez2012-02-14
| | * | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-14
| | |\ \ \
| * | | | | Tree controller - Minor change (to use "distinct" descriptor)Eric Guzman2012-02-15
| * | | | | Tree view event delegate map fixEric Guzman2012-02-15
| * | | | | Ninja Leaf/Branch - Minor CSS fixesEric Guzman2012-02-15
| * | | | | Tree Node - fix for applying tree child nodes array twice (and getting duplic...Eric Guzman2012-02-15
| | |_|_|/ | |/| | |
* | | | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-15
|\| | | |
| * | | | 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
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fixing the live preview background issue.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
| | * | | | | | | | 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 '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
| | |\| | | | | | | | | |