aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-01
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Adding open draw to reel componentsJose Antonio Marquez2012-06-01
| | | | | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-01
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixing feedread componentJose Antonio Marquez2012-06-01
| | | | | | | | | | |
| * | | | | | | | | | Add logic to allow dynamic placement of canvas json fileJose Antonio Marquez2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save to and read from any path on disk (webGL/Canvas data only)
| * | | | | | | | | | Map fixesJose Antonio Marquez2012-06-01
| | | | | | | | | | |
| * | | | | | | | | | Creating template mediator classJose Antonio Marquez2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to simplify code, more to be changed and added.
| * | | | | | | | | | Fixing Google Map componentJose Antonio Marquez2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulled in from components branch.
| * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-01
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-05-31
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-05-31
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge pull request #266 from mencio/element-model-fixesValerio Virgillito2012-06-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | components fix: adding a first draw event to components
| * | | | | | | | | | | | | components fix: adding a first draw event to componentsValerio Virgillito2012-06-04
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a first draw allows the component to have the right element so that ninja can use it's controller to get the component instance Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | | | Merge pull request #265 from jreid01/pull-requestValerio Virgillito2012-06-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Timeline: Fixes to timeline to handle document switching & breadcrumb interactions
| * | | | | | | | | | | | Timeline: Fix line endings, set to UNIX.Jon Reid2012-06-05
| | | | | | | | | | | | |
| * | | | | | | | | | | | Timeline: Fixes to timeline to handle document switching & breadcrumbJon Reid2012-06-04
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interactions under new DOM Architecture.
* | | | | | | | | | | | Merge pull request #264 from mencio/document-bindings-fixValerio Virgillito2012-06-04
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | Document bindings fix - Changing the documents architecture to use bindings instead of events
| * | | | | | | | | | | fix for the css panelValerio Virgillito2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal ↵Valerio Virgillito2012-06-01
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into document-bindings-fix
| | * \ \ \ \ \ \ \ \ \ \ Merge pull request #8 from mqg734/dom-architecture-pentoolValerio Virgillito2012-06-01
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1610 and IKNinja-1647 - Can't use transform tool if you haven't used a drawing tool yet.
| | | * | | | | | | | | | | IKNinja-1610 and IKNinja-1647 - Can't use transform tool if you haven't used ↵Nivesh Rajbhandari2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a drawing tool yet. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | | | | fixing some selection container changes and the breadcrumb not drawing initiallyValerio Virgillito2012-06-01
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | | Merge branch 'refs/heads/master' into document-bindings-fixValerio Virgillito2012-06-01
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #7 from mqg734/dom-architecture-pentoolValerio Virgillito2012-06-01
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | Fixed stage's styles not getting initialized correctly and stage rotating too fast.
| | * | | | | | | | | | | Merge branch 'refs/heads/valerio-document-bindings-fix' into ↵Nivesh Rajbhandari2012-06-01
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | document-bindings-fix
| * | | | | | | | | | | | Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal ↵Valerio Virgillito2012-06-01
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into document-bindings-fix
| | * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6 from mqg734/dom-architecture-pentoolValerio Virgillito2012-06-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were not saving all the necessary styles for the body.
| * | | | | | | | | | | | | | fixing the document closing when the first document is closed.Valerio Virgillito2012-06-01
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | | | | | | | IKNinja-1609 - Stage rotates too fast when closing and re-opening file or ↵Nivesh Rajbhandari2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switching between files. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | | | | | Moving styles controller higher in ninja's serialization so its bindings ↵Nivesh Rajbhandari2012-06-01
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |