aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #193 from joseeight/DocumentValerio Virgillito2012-05-03
|\ | | | | New Document View
| * Clean up, ready for alpha check-inJose Antonio Marquez2012-05-03
| |
| * Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-03
| |\ | |/ |/|
* | minor formattingValerio Virgillito2012-05-03
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'Master-Dom-Manipulation' of ↵Valerio Virgillito2012-05-03
|\ \ | | | | | | | | | https://github.com/ntfx47/ninja-internal
| * | Dom ManipulationKruti Shah2012-05-03
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * Full CSS support on openJose Antonio Marquez2012-05-03
| | | | | | | | | | | | Add full CSS for files on open (including loading cross-domain). This is only for files that are opened.
| | * Reloading local stylesheetsJose Antonio Marquez2012-05-03
| | | | | | | | | | | | Added the reload method of local linked styles, still need to parse style contents for URLs and also add cross-domain stylesheet support.
| | * Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-02
| | |\ | |_|/ |/| |
* | | Merge pull request #186 from mqg734/StageWebTemplateValerio Virgillito2012-05-02
|\ \ \ | |/ / |/| | More grid drawing fixes for new web template workflow. Also, adding back ability to draw when working plane changes.
| * | Support drawing in side and top view. Also, adding back support for drawing ↵Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | shapes inside canvas when double-clicked into canvas or when moused over canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Draw a red outline around the stage for reference when rotating stage.Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Offset side and top working planes by half the stage width/height.Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Adding hack to allow for blank documents to openJose Antonio Marquez2012-05-02
| | |
| | * Switching DOM Mutation Events to HTML5Jose Antonio Marquez2012-05-02
| | |
| | * Partial URL parsingJose Antonio Marquez2012-05-02
| | | | | | | | | | | | Added temporary URL parsing to document assets. (head and body)
| | * Preliminary Open File (new template)Jose Antonio Marquez2012-05-02
| | | | | | | | | | | | Added basic open file functionality, does not parse document for URLs.
| | * More clean up, updating menu itemsJose Antonio Marquez2012-05-01
| | |
| | * Fixing bindings to new modelJose Antonio Marquez2012-05-01
| | |
| | * Cleaning up templateJose Antonio Marquez2012-05-01
| | |
| | * Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-01
| | |\ | |_|/ |/| |
* | | Merge pull request #184 from mqg734/StageWebTemplateValerio Virgillito2012-05-01
|\| | | | | | | | Get working plane grid to draw for new stage web template workflow.
| * | webTemplate var gets reset to false, so must check for new stage template ↵Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | differently. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'refs/heads/ninja-internal' into StageWebTemplateNivesh Rajbhandari2012-05-01
| |\ \ | |/ / |/| |
| * | Get working plane grid to draw for new stage web template workflow.Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Preliminary IO to new DOM viewJose Antonio Marquez2012-05-01
| | |
| | * Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-01
| | |\ | |_|/ |/| |
* | | Removing some console logsValerio Virgillito2012-04-30
|/ / | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Squashed commit of stage architectureValerio Virgillito2012-04-30
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge pull request #182 from ericmueller/Canvas-interactionValerio Virgillito2012-04-30
|\ \ | | | | | | Canvas interaction
| * | added a console.log to show the working plane during a draghwc4872012-04-27
| | |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-27
| |\ \ | | | | | | | | | | | | Canvas-interaction
| * | | Creating shapes in a containerhwc4872012-04-27
| | | |
| * | | canvas interactionhwc4872012-04-26
| | | |
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-25
| |\ \ \ | | | | | | | | | | | | | | | Canvas-interaction
| * \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Canvas-interaction
| * | | | | Snapping tocontained objectshwc4872012-04-24
| | | | | |
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Canvas-interaction
| * | | | | | canvas interactionhwc4872012-04-23
| | | | | | |
| * | | | | | limitshwc4872012-04-23
| | | | | | |
| | | | | | * Setting up new architecture for I/OJose Antonio Marquez2012-05-01
| | | | | | |
| | | | | | * Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-27
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge cleanupValerio Virgillito2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'stage-document-architecture' of ↵Valerio Virgillito2012-04-26
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/mencio/ninja-internal into serialization
| | * \ \ \ \ \ \ Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fixed the stage border and layout in the new templateValerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | Simplifying the getElement method from stage and adding an exclusion list to ↵Valerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the new template Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fixing the element model and adding get elementValerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>