aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'binding' of https://github.com/dhg637/ninja-internal into bindingArmen Kesablyan2012-05-17
|\
| * Merge pull request #3 from ericguzman/bindingArmen Kesablyan2012-05-17
| |\ | | | | | | Binding: Objects Panel Initialization
| | * Objects Panel - Add Objects controller and montage/application hack to ↵Eric Guzman2012-05-16
| | | | | | | | | | | | expose template
| | * Objects Panel - Add object componentEric Guzman2012-05-16
| | |
| | * Objects Panel - Hook in objects panelEric Guzman2012-05-16
| |/
* / Initial Binding HudArmen Kesablyan2012-05-16
|/ | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Merge branch 'dom-architecture' of ↵Armen Kesablyan2012-05-15
|\ | | | | | | github.com:Motorola-Mobility/ninja-internal into binding
| * Merge pull request #235 from mencio/dom-architectureValerio Virgillito2012-05-15
| |\ | | | | | | Dom architecture - code cleanup and fixed mouse wheel scroll
| | * fixed the mouse wheel scrollValerio Virgillito2012-05-15
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-15
| | |\ | | |/ | |/| | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| * | Merge pull request #234 from joseeight/DocumentValerio Virgillito2012-05-15
| |\ \ | | | | | | | | Fixing overflow bug
| | * | Correcting location of Ninja meta dataJose Antonio Marquez2012-05-15
| | | | | | | | | | | | | | | | Needs to be inside most child div.
| | * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-15
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #233 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-15
| |\ \ \ | | | | | | | | | | Fixing scrollbar syncing, including pan tool, for banner templates.
| | * \ \ Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-15
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #231 from joseeight/DocumentValerio Virgillito2012-05-15
| |\ \ \ \ | | | | | | | | | | | | Open new banner templates
| | | * | | Fixing scrollbar syncing, including pan tool, for banner templates.Nivesh Rajbhandari2012-05-15
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Fixing overflow on open for template documentsJose Antonio Marquez2012-05-15
| | |/ /
| | * | Saving body attributesJose Antonio Marquez2012-05-15
| | | |
| | * | File save for banner templateJose Antonio Marquez2012-05-15
| | | | | | | | | | | | | | | | Adding file save for templates, completing I/O.
| | * | Adding animation sub-category to new fileJose Antonio Marquez2012-05-15
| | | | | | | | | | | | | | | | Adding animation sub-category to template in new file.
| | * | Finalizing open for new banner templatesJose Antonio Marquez2012-05-15
| |/ / | | | | | | | | | Moving to implement save.
| * | Merge pull request #230 from mencio/dom-architectureValerio Virgillito2012-05-14
| |\ \ | | | | | | | | Dom architecture - Fixing the Body PI
| | | * renaming the position and size componentValerio Virgillito2012-05-15
| | |/ | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * reverting a pi width changeValerio Virgillito2012-05-14
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-14
| | |\ | | |/ | |/| | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| * | Merge pull request #229 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-14
| |\ \ | | | | | | | | userContentLeft and userContentTop need to set scroll offsets for 0 also.
| | * | userContentLeft and userContentTop need to set scroll offsets for 0 also.Nivesh Rajbhandari2012-05-14
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Merge pull request #228 from joseeight/DocumentValerio Virgillito2012-05-14
| |\ \ \ | | | | | | | | | | Document Banner Template
| | * | | Fixing banner templateJose Antonio Marquez2012-05-14
| |/ / / | | | | | | | | | | | | Need to implement save, but this cover open and new.
| * | | Merge pull request #227 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-14
| |\| | | | | | | | | | Adding wrapper div for banner templates so content doesn't push through "body".
| | * | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-14
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #226 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-14
| |\ \ \ | | | | | | | | | | Fixing 3d to work in banner templates.
| * \ \ \ Merge pull request #225 from joseeight/DocumentValerio Virgillito2012-05-14
| |\ \ \ \ | | | | | | | | | | | | Fixing URL bug
| | * | | | Fixing webRequest URL parsingJose Antonio Marquez2012-05-14
| |/ / / /
| | | * | Viewport for banner templates so content doesn't push through "body".Nivesh Rajbhandari2012-05-14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Fixing grid drawing bug.Nivesh Rajbhandari2012-05-14
| | |/ / | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * / Fixing 3d to work in banner templates.Nivesh Rajbhandari2012-05-14
| |/ / | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge pull request #224 from joseeight/DocumentValerio Virgillito2012-05-11
| |\ \ | | | | | | | | Document
| | * | Fixing position issueJose Antonio Marquez2012-05-11
| |/ / | | | | | | | | | Need to implement centering document.
| * | Merge pull request #223 from joseeight/DocumentValerio Virgillito2012-05-11
| |\ \ | | | | | | | | Fixing Overflow
| | * | Fixing overflow bug for banner templatesJose Antonio Marquez2012-05-11
| | | | | | | | | | | | | | | | Ensuring overflow is visible but saved as hidden.
| | | * fixing the body piValerio Virgillito2012-05-14
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * code cleanupValerio Virgillito2012-05-14
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * adding some test convertersValerio Virgillito2012-05-14
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * code cleanupValerio Virgillito2012-05-14
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-11
| | | |\ | | |_|/ | |/| | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| * | | Merge pull request #222 from joseeight/DocumentValerio Virgillito2012-05-11
| |\| | | | | | | | | | Adding partial support for templates
| | * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-11
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #220 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-11
| |\ \ \ | | | | | | | | | | Silly logic that caused drawing in nested containers to break.