aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-16
|\
| * Merge pull request #44 from ericguzman/CSSPanelUpdatesValerio Virgillito2012-02-16
| |\
| | * CSSPanel - fix code indentationEric Guzman2012-02-16
| | * CSS Panel - Add Resizer to sub panelsEric Guzman2012-02-16
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-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
| | | |\ \ \
| | * | \ \ \ Merge pull request #43 from ericguzman/TreeComponentsValerio Virgillito2012-02-16
| | |\ \ \ \ \
| * | | | | | | Fixing the load document event being fired twice.Valerio Virgillito2012-02-16
| |/ / / / / /
| * | | | | / integrating the latest montage fixes for v0.6 into masterValerio Virgillito2012-02-16
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'refs/heads/TreeComponents' into PresetsPanelEric Guzman2012-02-16
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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/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
| | | |\ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 04:31:13 +0000