aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-22
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Timeline: Bug fixes for deleting elements.Jon Reid2012-05-18
| | * | | | | | | | | | | | Timeline: Fix element insertion to use new TimelinePanel properties andJon Reid2012-05-18
| | * | | | | | | | | | | | Timeline: Multiselect improvements. New convenience methods. MultiselectJon Reid2012-05-17
* | | | | | | | | | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | Objects Tray - Filter list of components for those without visual representationEric Guzman2012-06-20
* | | | | | | | | | | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Binding View - Mouse Over Element Pop up HudArmen Kesablyan2012-06-19
* | | | | | | | | | | | | | | | | | | Objects Tray - Show only "off stage" objectsEric Guzman2012-06-19
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | / / / / rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Objects Controller - Fix call to get current object bindings after add/removi...Eric Guzman2012-06-13
* | | | | | | | | | | | | | Objects Controller - Update current object bindings when adding/removing bind...Eric Guzman2012-06-13
* | | | | | | | | | | | | | Objects Controller - Add concept of categoriesEric Guzman2012-06-12
* | | | | | | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Changes Made to Object Listing of iFrameArmen Kesablyan2012-06-11
| * | | | | | | | | | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-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
| | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |