aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-17
|\
| * Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-16
| |\
| | * Adding a data-RDGE-id attribute to each canvas to save/load canvas dataValerio Virgillito2012-02-16
| * | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-15
| |\ \
| * | | Adding more components piValerio Virgillito2012-02-15
| * | | fixing the controller to handle all propertiesValerio Virgillito2012-02-14
| * | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-14
| |\ \ \
* | \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-16
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Squashed commit of the following:Jose Antonio Marquez2012-02-16
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-15
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | 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 branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-15
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | 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
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-13
| | |\ \ \
| | * | | | Setting defaults and more cleanupValerio Virgillito2012-02-09
| | * | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-09
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-08
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into componentsValerio Virgillito2012-02-06
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into componentsValerio Virgillito2012-02-06
| | |\ \ \ \ \ \ \
| | * | | | | | | | button component using json dataValerio Virgillito2012-02-03
| | * | | | | | | | Merge branch 'master' into componentsValerio Virgillito2012-02-03
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Simple button native widget test. Added a controller, pi and panel code.Valerio Virgillito2012-02-01
| * | | | | | | | | | Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into int...Valerio Virgillito2012-02-14
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | save integration - minor bug fixAnanya Sen2012-02-13
| | * | | | | | | | integrating save functionalityAnanya Sen2012-02-13
| | * | | | | | | | added logical drive selection to file pickerAnanya Sen2012-02-13
| | * | | | | | | | Fixing multiple tabsJose Antonio Marquez2012-02-13
| | * | | | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-13
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Revert "Merge from /joseeight/ninja-internal/tree/FileIO"Ananya Sen2012-02-10
| | | * | | | | | | | Merge from /joseeight/ninja-internal/tree/FileIOAnanya Sen2012-02-10
| | * | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | Save 'code' view filesJose Antonio Marquez2012-02-13
| | * | | | | | | | | File Save (HTML only)Jose Antonio Marquez2012-02-12
| | * | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Cleaning up open file in code viewJose Antonio Marquez2012-02-10
| | * | | | | | | | | | Adding back file open for code viewJose Antonio Marquez2012-02-10
| | * | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | File OpenJose Antonio Marquez2012-02-10
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | 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-06
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | | * | | | | | | | | Merge pull request #16 from ericguzman/TreeComponentsValerio Virgillito2012-02-06
| | | |\ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 14:49:08 +0000