aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | 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 pull request #6 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | hide iframeContainer if we want to open code view as the first document after...Ananya Sen2012-02-10
| | | | * | | | | | | | | | | | removed temporary test to open ninja without default document, since it is br...Ananya Sen2012-02-10
| | | | * | | | | | | | | | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-10
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 01:05:14 +0000