aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-13
|\
| * Fixing properties panel to support px and % for body and other elements.Nivesh Rajbhandari2012-06-12
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-12
|\|
| * rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| * 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
| |\
| | * Merge branch 'refs/heads/ninja-internal' into ToolOptionsNivesh Rajbhandari2012-06-05
| | |\
| | * | 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
| * | | removing all model creators.Valerio Virgillito2012-06-05
| | |/ | |/|
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-05
|\| |
| * | components fix: adding a first draw event to componentsValerio Virgillito2012-06-04
| |/
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
|\|
| * Merge branch 'refs/heads/master' into document-bindings-fixValerio Virgillito2012-06-01
| |\
| * \ 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
| |/ /
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
|\ \ \ | | |/ | |/|
| * | Attempting to track clean nodesJose Antonio Marquez2012-05-30
| |/
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-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
* | | Fixing merge issueshwc4872012-05-14
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-11
|\ \ \ | | |/ | |/|
| * | fixing the currentContainerValerio Virgillito2012-05-03
| * | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| |\|
| | * minor formattingValerio Virgillito2012-05-03
| | * Dom ManipulationKruti Shah2012-05-03
| * | Refactor creating elements. Removed makeNJElement and separated the model cre...Valerio Virgillito2012-05-03
| * | Nesting absolute element in the Tag tool. Refactoring element creation and el...Valerio Virgillito2012-05-02
| |/
* | 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
|\ \ \ | |/ / |/| / | |/
| * Get working plane grid to draw for new stage web template workflow.Nivesh Rajbhandari2012-05-01
* | Material editorhwc4872012-05-02
|/
* Squashed commit of stage architectureValerio Virgillito2012-04-30
* Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
|\
| * Fixed issue with setting stroke when using the PI.Nivesh Rajbhandari2012-04-24
| * Allow users to toggle application of stroke and border settings when using th...Nivesh Rajbhandari2012-04-24
| * Fixing translate handles to draw without zoom value. Also fixed some typos i...Nivesh Rajbhandari2012-04-20
* | Added a body controllerValerio Virgillito2012-04-24
|/
* Adding back setProperties for canvas because width and height values need to ...Nivesh Rajbhandari2012-04-17
* Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-04-17
|\