aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | integrating the latest montage fixes for v0.6 into masterValerio Virgillito2012-02-16
|/ / / / / / / / / / / /
| | | | | | | | | | | * Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-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
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into int...Valerio Virgillito2012-02-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Changed height of css panelArmen Kesablyan2012-02-14
| | * | | | | | | | | | | | | Merge branch 'refs/heads/master' into text-toolArmen Kesablyan2012-02-14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-02-14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | appended function : toViewportCoordinates in stageArmen Kesablyan2012-02-13
| | * | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into text-toolArmen Kesablyan2012-02-13
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-02-13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-02-07
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Revert "Initial Text Tool Implementation"Armen Kesablyan2012-02-07
| | * | | | | | | | | | | | | | | | Fixed binding to font size dropdownArmen Kesablyan2012-02-13
| | * | | | | | | | | | | | | | | | Fixed Color on text edit. Also Fixed Indent & Outdent button. toggle bullet a...Armen Kesablyan2012-02-13
| * | | | | | | | | | | | | | | | | Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into int...Valerio Virgillito2012-02-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | / / / / / / / / | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Cleaning up requiresJose Antonio Marquez2012-02-14
| | * | | | | | | | | | | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | save integration - minor bug fixAnanya Sen2012-02-13
| | | * | | | | | | | | | | | | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | integrating save functionalityAnanya Sen2012-02-13
| | * | | | | | | | | | | | | | | | | File IO UI tweaksJose Antonio Marquez2012-02-13
| | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-13
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | new file dialog - preselect default templateAnanya Sen2012-02-13
| | | * | | | | | | | | | | | | | | added logical drive selection to file pickerAnanya Sen2012-02-13
| | | * | | | | | | | | | | | | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-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
| | | * | | | | | | | | | | | | | | | show iframeContainer if all documents are closedAnanya Sen2012-02-10
| | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | / / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Save 'code' view filesJose Antonio Marquez2012-02-13
| | * | | | | | | | | | | | | | | | | | File Save (with CSS styles)Jose Antonio Marquez2012-02-12
| | * | | | | | | | | | | | | | | | | | File Save (HTML only)Jose Antonio Marquez2012-02-12
| | * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
| | |\ \ \