aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' into componentsValerio Virgillito2012-01-30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Moved the ninja components out of the Montage folderValerio Virgillito2012-01-30
| * | | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | * renamed methods to use better wordsAnanya Sen2012-02-17
| | | | | | | | | | | | | | | | | | | | | | | | * use method to update dirtyFlagAnanya Sen2012-02-17
| | | | | | | | | | | | | | | | | | | | | | | | * mark document on setting color, properties and stroke.Ananya Sen2012-02-17
| | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | | | | | | | | | | | | | | | | | | | | | * remove similar function from coreioapi.jsAnanya Sen2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | * moved file picker in file ioAnanya Sen2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | * hide the rulers when no document is openAnanya Sen2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | * file picker:Ananya Sen2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | * fixes to document tabbingAnanya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | * Revert "Revert "Creating NinjaTemplate to HTML function""Ananya 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
| | | | | | | | | | | | | | | | | | | | | | | | * Revert "Creating NinjaTemplate to HTML function"Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | |_|_|_|_|/ | | | | | | | | | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | | | | | | | * | | | | | Creating NinjaTemplate to HTML functionJose Antonio Marquez2012-02-14
| | | | | | | | | | | | | | | | | | * | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-14
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | * | | | | | allow / in windows directory pathAnanya Sen2012-02-14
| | | | | | | | | | | | | | | | | | | * | | | | | use button tag for save as dialogAnanya Sen2012-02-14
| | | | | | | | | | | | | | | | | | * | | | | | | 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
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #41 from mencio/live-preview-fixValerio Virgillito2012-02-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | / / / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / /