aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
|\
| * Merge pull request #298 from ericmueller/TexturesValerio Virgillito2012-06-19
| |\
| | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-13
| | |\
| | * \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-12
| | |\ \
| | * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-05
| | |\ \ \
| | * \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-31
| | |\ \ \ \ \ \
| | * | | | | | | Fixing merge issueshwc4872012-05-14
| | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-11
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'Textures' of github.com:ericmueller/ninja-internal into Textureshwc4872012-05-03
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Updated hard-coded linear and radial gradients to use the color values in Lin...Nivesh Rajbhandari2012-05-03
| | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-02
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Material editorhwc4872012-05-02
* | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-18
|\| | | | | | | | | |
| * | | | | | | | | | Save user's html and body styles and inline body styles for 3d so they don't ...Nivesh Rajbhandari2012-06-14
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Timeline: Replace currentSelectedContainer with new model.domContainer.Jon Reid2012-06-15
* | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
|\| | | | | | | | |
| * | | | | | | | | Fixing properties panel to support px and % for body and other elements.Nivesh Rajbhandari2012-06-12
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
* | | | | | | | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-06-12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-11
| |\| | | | | | | |
| | * | | | | | | | Merge branch 'refs/heads/ninja-internal' into BodyPINivesh Rajbhandari2012-06-07
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | fixing the body color chip for non banners templatesValerio Virgillito2012-06-07
| | * | | | | | | | | Body PI fixes.Nivesh Rajbhandari2012-06-07
| | |/ / / / / / / /
| | * | | | | | | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-05
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | removing all model creators.Valerio Virgillito2012-06-05
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-06
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolOptionsNivesh Rajbhandari2012-06-05
| | |\| | | | | | |
| | | * | | | | | | components fix: adding a first draw event to componentsValerio Virgillito2012-06-04
| | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Updated ink bottle tool to support color-chip's checkbox and undo/redo for st...Nivesh Rajbhandari2012-06-05
| | * | | | | | | Fill and Ink-Bottle fixes.Nivesh Rajbhandari2012-06-04
| | |/ / / / / /
| * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
| |\| | | | | |
| | * | | | | | Merge branch 'refs/heads/master' into document-bindings-fixValerio Virgillito2012-06-01
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Attempting to track clean nodesJose Antonio Marquez2012-05-30
| | | | |_|_|/ | | | |/| | |
| | * | | | | Merge branch 'Dom-Architecture' of github.com:mqg734/ninja-internal into docu...Valerio Virgillito2012-05-30
| | |\ \ \ \ \
| | | * | | | | IKNinja-1491 - Adding slice value to border gradients.Nivesh Rajbhandari2012-05-25
| | | |/ / / /
| | * / / / / document bindings phase 1Valerio Virgillito2012-05-29
| | |/ / / /
* | | | | | Sub PropsKruti Shah2012-06-12
* | | | | | Color chip in TPKruti Shah2012-06-08
* | | | | | Color ChipKruti Shah2012-05-31
|/ / / / /
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-31
|\| | | |
| * | | | fixing the color chip for the document rootValerio Virgillito2012-05-18
| * | | | Fixing the dirty document flag. Disabling the stylesheets dirty flag because ...Valerio Virgillito2012-05-10
| * | | | remove console logsValerio Virgillito2012-05-10
| * | | | Fixing the google components.Valerio Virgillito2012-05-10
| * | | | New stage template should not distinguish between user and template body styles.Nivesh Rajbhandari2012-05-10
| * | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Removed special-casing for new template workflow. Instead, we will enforce a...Nivesh Rajbhandari2012-05-04
* | | | | Timeline: Bug fixes for deleting elements.Jon Reid2012-05-18
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 12:27:09 +0000