aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integrationhwc4872012-02-22
|\
| * Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-22
| |\
| * | Fixing eyedropper tool to get color from image data. This required us to work...Nivesh Rajbhandari2012-02-22
| * | Some more tweaks to not being able to select elements in top/side view.Nivesh Rajbhandari2012-02-20
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-02-22
|\ \ \ | | |/ | |/|
| * | user document main reel listener moved to the html-document class.Valerio Virgillito2012-02-21
| * | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal i...Valerio Virgillito2012-02-21
| |\ \
| | * | enabling nested selectionValerio Virgillito2012-02-20
| | * | formatting and removing un-used code from the stageValerio Virgillito2012-02-20
| | * | cleanupValerio Virgillito2012-02-20
| | * | Removing the log of the url requestsValerio Virgillito2012-02-20
| | * | Removing the timeline selection code.Valerio Virgillito2012-02-20
| | * | Merge branch 'refs/heads/master' into nested-selectionValerio Virgillito2012-02-20
| | |\ \
| | * \ \ Merge branch 'nested-selection' of github.com:mencio/ninja-internal into nest...Valerio Virgillito2012-02-20
| | |\ \ \
| | | * | | formatting cleanupValerio Virgillito2012-02-20
| | * | | | formatting cleanupValerio Virgillito2012-02-20
| | |/ / /
| | * | | cleanup of the breadcrumbValerio Virgillito2012-02-20
| * | | | fixing the dirty flag and removing sass changesValerio Virgillito2012-02-21
| * | | | Merge pull request #13 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-21
| |\ \ \ \
| | * | | | Revert "check cloud availability before open file picker and new file dialogs"Ananya Sen2012-02-21
| | * | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-20
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #11 from ericguzman/StylesControllerUpdatesJose Antonio Marquez Russo2012-02-20
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-20
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Merge branch 'StylesControllerUpdates' of github.com:ericguzman/ninja-interna...Eric Guzman2012-02-20
| | |\ \ \ \ \
| | | * | | | | Styles controller - Check for element's window object before querying for mat...Eric Guzman2012-02-20
| | * | | | | | Styles Controller -Fix invalid variable reference when looking for element's ...Eric Guzman2012-02-20
| | |/ / / / /
| * | | | | | Clean up and repairing manifestJose Antonio Marquez2012-02-19
| * | | | | | Merge pull request #10 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-18
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | | | * | | check cloud availability before open file picker and new file dialogsAnanya Sen2012-02-20
| | | | * | | - moved tools specific keyboard controls for desing view onlyAnanya Sen2012-02-20
| | | |/ / / | | |/| | |
| | * | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-18
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | doc.markEdited() removed from element-mediator, for style changes, as per tea...Ananya Sen2012-02-18
| | * | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-17
| | |\ \ \ \
| | * | | | | 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