aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | | | | | 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>
| | * | | | | | | | | | | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Added a body controllerValerio Virgillito2012-04-24
| | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |