Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-16 |
|\ | |||
| * | Merge pull request #45 from joseeight/FileIO | Valerio Virgillito | 2012-02-16 |
| |\ | |||
| | * | Squashed commit of the following: | Jose Antonio Marquez | 2012-02-16 |
| | * | Setting up webGL library copy on save | Jose Antonio Marquez | 2012-02-15 |
| | * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-15 |
| | |\ | |||
| | * | | Setting up webGL local library (assets) | Jose Antonio Marquez | 2012-02-15 |
| | * | | Creating NinjaTemplate to HTML function | Jose Antonio Marquez | 2012-02-14 |
| | * | | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-14 |
| | |\ \ | |||
| | | * | | allow / in windows directory path | Ananya Sen | 2012-02-14 |
| | | * | | use button tag for save as dialog | Ananya Sen | 2012-02-14 |
| | * | | | Reverting text/html document classes and setting up MVC folder structure | Jose Antonio Marquez | 2012-02-14 |
| | * | | | Merging TextDocument into BaseDocument | Jose Antonio Marquez | 2012-02-14 |
| | |/ / | |||
| | * | | Cleaning up | Jose Antonio Marquez | 2012-02-14 |
| | * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-14 |
| | |\ \ | |||
| | * | | | Cleaning up mediator | Jose Antonio Marquez | 2012-02-14 |
| | * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-14 |
| | |\ \ \ | |||
| * | \ \ \ | Merge pull request #43 from ericguzman/TreeComponents | Valerio Virgillito | 2012-02-16 |
| |\ \ \ \ \ | |||
| | * | | | | | Tree controller - Minor change (to use "distinct" descriptor) | Eric Guzman | 2012-02-15 |
| | * | | | | | Tree view event delegate map fix | Eric Guzman | 2012-02-15 |
| | * | | | | | Ninja Leaf/Branch - Minor CSS fixes | Eric Guzman | 2012-02-15 |
| | * | | | | | Tree Node - fix for applying tree child nodes array twice (and getting duplic... | Eric Guzman | 2012-02-15 |
| | | |_|_|/ | | |/| | | | |||
| * / | | | | integrating the latest montage fixes for v0.6 into master | Valerio Virgillito | 2012-02-16 |
| |/ / / / | |||
* | | | | | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-15 |
|\| | | | | |||
| * | | | | Merge branch 'refs/heads/integration' | Valerio Virgillito | 2012-02-15 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||
| | * | | | Merge pull request #42 from ananyasen/IO-patch-ninja-internal-master-ananya | Valerio Virgillito | 2012-02-14 |
| | |\ \ \ | |||
| | | * | | | allow / for window directory path format | Ananya Sen | 2012-02-14 |
| | |/ / / | |||
| | * | | | Merge branch 'live-preview-fix' of https://github.com/mencio/ninja-internal i... | Valerio Virgillito | 2012-02-14 |
| | |\ \ \ | |||
| | * \ \ \ | Merge branch 'components' of https://github.com/mencio/ninja-internal into in... | Valerio Virgillito | 2012-02-14 |
| | |\ \ \ \ | |||
| | | * | | | | small changes to the tree component to allow events to be passed and add a do... | Valerio Virgillito | 2012-02-14 |
| | | * | | | | Add support for drag and drop for the components. | Valerio Virgillito | 2012-02-14 |
| | | * | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-13 |
| | | |\ \ \ \ | |||
| | | * | | | | | Setting defaults and more cleanup | Valerio Virgillito | 2012-02-09 |
| | | * | | | | | code cleanup, light refactor and now adding components at the center stage po... | Valerio Virgillito | 2012-02-09 |
| | | * | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-09 |
| | | |\ \ \ \ \ | |||
| | | * | | | | | | Switching the components panel to use the new ninja tree component. | Valerio Virgillito | 2012-02-09 |
| | | * | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-08 |
| | | |\ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ | Merge branch 'master' into components | Valerio Virgillito | 2012-02-06 |
| | | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | | initial integration of new tree components | Valerio Virgillito | 2012-02-06 |
| | | * | | | | | | | | Merge branch 'master' into components | Valerio Virgillito | 2012-02-06 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | Moving the data files to a separate folder for now until montage provides the... | Valerio Virgillito | 2012-02-06 |
| | | * | | | | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-05 |
| | | |\ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | removing the appdelegate. Now using a main reel instead. | Valerio Virgillito | 2012-02-03 |
| | | * | | | | | | | | | | removing the old v0.6 montage folder and updating the references | Valerio Virgillito | 2012-02-03 |
| | | * | | | | | | | | | | button component using json data | Valerio Virgillito | 2012-02-03 |
| | | * | | | | | | | | | | Merge branch 'master' into components | Valerio Virgillito | 2012-02-03 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | Fix the main user component to create distinct instance of component. | Valerio Virgillito | 2012-02-03 |
| | | * | | | | | | | | | | | Using async to load the required component. | Valerio Virgillito | 2012-02-02 |
| | | * | | | | | | | | | | | adding a componentController and callback for lazy loading. | Valerio Virgillito | 2012-02-02 |
| | | * | | | | | | | | | | | Temporary son for Montage button. | Valerio Virgillito | 2012-02-01 |
| | | * | | | | | | | | | | | Simple button native widget test. Added a controller, pi and panel code. | Valerio Virgillito | 2012-02-01 |