aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
...
* | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-17
|\| | | |
| * | | | Adding webRequest redirects for iFrame templatesJose Antonio Marquez2012-02-17
| * | | | Adding Chrome webRequest interceptJose 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
| | * | | | Squashed commit of the following:Jose Antonio Marquez2012-02-16
| | * | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-15
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-15
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | 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
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into int...Valerio Virgillito2012-02-14
| | |\ \ \ \ \ \
| * | | | | | | | 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/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
* | | | | | | | | | | | | changed the document dirtying logic to be done in the feature that edits the ...Ananya Sen2012-02-17
* | | | | | | | | | | | | -added keyboard control for saving documentsAnanya Sen2012-02-17
* | | | | | | | | | | | | fixes to document tabbingAnanya Sen2012-02-15
* | | | | | | | | | | | | Revert "Revert "Reverting text/html document classes and setting up MVC folde...Ananya Sen2012-02-15
* | | | | | | | | | | | | Revert "Revert "Cleaning up""Ananya Sen2012-02-15
* | | | | | | | | | | | | Revert "Revert "Merging TextDocument into BaseDocument""Ananya Sen2012-02-15
* | | | | | | | | | | | | Revert "merging from github.com/joseeight/ninja-internal/tree/FileIO is break...Ananya Sen2012-02-15
* | | | | | | | | | | | | merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking open...Ananya Sen2012-02-15
* | | | | | | | | | | | | Revert "Merging TextDocument into BaseDocument"Ananya Sen2012-02-15
* | | | | | | | | | | | | Revert "Cleaning up"Ananya Sen2012-02-15
* | | | | | | | | | | | | Revert "Reverting text/html document classes and setting up MVC folder struct...Ananya Sen2012-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
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fixing the live preview background issue.Valerio Virgillito2012-02-14
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Cleaning up mediatorJose Antonio Marquez2012-02-14
* | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-14
|\| | | | | | | | | | | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-02-14
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Implemented about box component and hooked it up to the About menuJohn Mayhew2012-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