Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | | | integrating the latest montage fixes for v0.6 into master | Valerio Virgillito | 2012-02-16 | |
|/ / / / / / / / / / / / | ||||
| | | | | | | | | | | * | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into int... | Valerio Virgillito | 2012-02-14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | Changed height of css panel | Armen Kesablyan | 2012-02-14 | |
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/master' into text-tool | Armen Kesablyan | 2012-02-14 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-02-14 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | appended function : toViewportCoordinates in stage | Armen Kesablyan | 2012-02-13 | |
| | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into text-tool | Armen Kesablyan | 2012-02-13 | |
| | |\| | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-02-13 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-02-07 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | Revert "Initial Text Tool Implementation" | Armen Kesablyan | 2012-02-07 | |
| | * | | | | | | | | | | | | | | | | Fixed binding to font size dropdown | Armen Kesablyan | 2012-02-13 | |
| | * | | | | | | | | | | | | | | | | Fixed Color on text edit. Also Fixed Indent & Outdent button. toggle bullet a... | Armen Kesablyan | 2012-02-13 | |
| * | | | | | | | | | | | | | | | | | Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into int... | Valerio Virgillito | 2012-02-14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | / / / / / / / / | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | Cleaning up requires | Jose Antonio Marquez | 2012-02-14 | |
| | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-13 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | save integration - minor bug fix | Ananya Sen | 2012-02-13 | |
| | | * | | | | | | | | | | | | | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-13 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | integrating save functionality | Ananya Sen | 2012-02-13 | |
| | * | | | | | | | | | | | | | | | | | File IO UI tweaks | Jose Antonio Marquez | 2012-02-13 | |
| | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-13 | |
| | |\| | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | new file dialog - preselect default template | Ananya Sen | 2012-02-13 | |
| | | * | | | | | | | | | | | | | | | added logical drive selection to file picker | Ananya Sen | 2012-02-13 | |
| | | * | | | | | | | | | | | | | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-13 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-13 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | / / / / / / / / / / | | | | |_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | Fixing multiple tabs | Jose Antonio Marquez | 2012-02-13 | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-13 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | | Revert "Merge from /joseeight/ninja-internal/tree/FileIO" | Ananya Sen | 2012-02-10 | |
| | | * | | | | | | | | | | | | | | | | Merge from /joseeight/ninja-internal/tree/FileIO | Ananya Sen | 2012-02-10 | |
| | | * | | | | | | | | | | | | | | | | show iframeContainer if all documents are closed | Ananya Sen | 2012-02-10 | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | / / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | | | | Save 'code' view files | Jose Antonio Marquez | 2012-02-13 | |
| | * | | | | | | | | | | | | | | | | | | File Save (with CSS styles) | Jose Antonio Marquez | 2012-02-12 | |
| | * | | | | | | | | | | | | | | | | | | File Save (HTML only) | Jose Antonio Marquez | 2012-02-12 | |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-11 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_| |