aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Collapse)AuthorAge
...
| | * | | | | | Objects Controller - Fix access to the oneway propertyEric Guzman2012-06-01
| | | | | | | |
| | * | | | | | Binding Panel - Item css and toggle button action handlerEric Guzman2012-06-01
| | | | | | | |
| | * | | | | | Bindings Panel - Update binding panel componentsEric Guzman2012-06-01
| | | | | | | |
| | * | | | | | Objects Controller - Add bindable controller properties, and bindings getterEric Guzman2012-05-30
| | | | | | | |
| | * | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-05-25
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-25
| | | |\ \ \ \ \ \
| | * | | | | | | | Objects Controller - Now keeps track of document's object instances, ↵Eric Guzman2012-05-25
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | including added components
| | * | | | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-23
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | Changes to binding viewArmen Kesablyan2012-05-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-17
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | | Objects Panel - Add Objects controller and montage/application hack to ↵Eric Guzman2012-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expose template
| | * | | | | | | | | Merge branch 'dom-architecture' of ↵Armen Kesablyan2012-05-15
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into binding
| | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/masterDomArc' into bindingArmen Kesablyan2012-05-14
| | |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | Support pre-flighting of gradients for shape tools - rect, line, oval, brush ↵Nivesh Rajbhandari2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and pen. Note that WebGL shapes are not supported yet. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-25
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Make stage transparent when rotating/zooming templates and draw an outline ↵Nivesh Rajbhandari2012-06-22
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | around the user's root instead. Also, fixed the background color setting on banner and animation templates' "body." Stage outline draws using drawGridLines code so it can show intersection with element planes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | | Adding support for gradients on chipsJose Antonio Marquez2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to handle other color modes, currently only handling HSV and gradients. Working on getting other modes supported. Also, will need clean up color popup manager after completion.
* | | | | | | | | | | | Fixing bug with gradient stop limitsJose Antonio Marquez2012-06-22
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that from-to stops are omitted if using objects with no 0 and/or 100 percent stops, seems like browser induced, but can't confirmed, bug never reported, but this should fix it.
* | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-21
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | remove old methodJonathan Duran2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | | | remove unneeded filesJonathan Duran2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-18
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Timeline: Replace currentSelectedContainer with new model.domContainer.Jon Reid2012-06-15
| | | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-06-12
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-06
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |