aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-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
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-17
| | |\ \ \ \ \ \ \
| | * | | | | | | | 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
| * | | | | | | | | | | More cleaning upJose Antonio Marquez2012-06-16
| * | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-15
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Save user's html and body styles and inline body styles for 3d so they don't ...Nivesh Rajbhandari2012-06-14
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * / | | | | | | | | | Fixing apply 'no color'Jose Antonio Marquez2012-06-15
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | fixed document switching issuesValerio Virgillito2012-06-12
| | * | | | | | | | | | hack fix for the PI section throwing errors when dom is not ready to drawValerio Virgillito2012-06-12
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * / | | | | | | | | Fixing properties panel to support px and % for body and other elements.Nivesh Rajbhandari2012-06-12
| |/ / / / / / / / /
* | | | | | | | | | start pasting in-place for cut/pasteAnanya Sen2012-06-18
* | | | | | | | | | Fixed - IKNINJA-1748 - While pasting text in any text field in the PI, the te...Ananya Sen2012-06-15
* | | | | | | | | | - Eric Guzman's styles-controller fix for relatively positionedAnanya Sen2012-06-13
* | | | | | | | | | - eric gunman's fix for styles-controller - select the appropriate override r...Ananya Sen2012-06-13
* | | | | | | | | | displace pasted object only if the position is absoluteAnanya Sen2012-06-13
* | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-12
|\| | | | | | | | |
| * | | | | | | | | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
* | | | | | | | | | patse raw image data to stageAnanya Sen2012-06-12
* | | | | | | | | | - removed extra selection change event,Ananya Sen2012-06-11
* | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-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
| |/ / / / / / / / /
* | | | | | | | | | - fixed multiple paste displacementAnanya Sen2012-06-08
* | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-07
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-05
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge pull request #267 from mqg734/ToolOptionsValerio 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
| |/ / / / / / / / / /
| * | | | | | | | | | fixing the save asValerio Virgillito2012-06-05
| * | | | | | | | | | fixing the save asValerio Virgillito2012-06-05
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge pull request #263 from joseeight/ComponentsValerio Virgillito2012-06-05
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fixing saveAll from menuJose Antonio Marquez2012-06-04
| | |/ / / / / / /
| * / / / / / / / components fix: adding a first draw event to componentsValerio Virgillito2012-06-04
| |/ / / / / / /
* | | | | | | | - cleanse html for copying from outer applicationAnanya Sen2012-06-07
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 20:14:18 +0000