aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
...
| | * | | | | | | | | | Bindings Panel - Update binding panel componentsEric Guzman2012-06-01
| | | | | | | | | | | |
| | * | | | | | | | | | Binding Panel - Developed panel components.Eric Guzman2012-05-31
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-05-31
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-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
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Object Component - Enable native draggingEric Guzman2012-05-25
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Object component - Minor cleanupEric Guzman2012-05-25
| | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | 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>
| | * \ \ \ \ \ \ \ \ \ \ \ \ 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>
| | * | | | | | | | | | | | | | Removed Old Objects Panel StructureArmen Kesablyan2012-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | | | | | | | Objects Panel - Add object componentEric Guzman2012-05-16
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Workspace: has customizedArmen Kesablyan2012-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | | | | | | | | | created the initial environment requirements for workspace to be manipulated.Armen Kesablyan2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | | | | | | | | | | | | | IKNINJA-1659 - Fix error when calling preventDefault()Eric Guzman2012-06-26
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | IKNINJA-1667 - Fix for JIRA issue involving updating rule list on selection ↵Eric Guzman2012-06-26
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change.
* | | | | | | | | | | | | | | | | Merge pull request #336 from mqg734/IKNinja_1688Valerio Virgillito2012-06-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1688 - Creating a banner file after a code file causes body div to shift to the right and has different scroll bars.
| * | | | | | | | | | | | | | | | | IKNinja-1688 - Creating a banner file after a code file causes body div to ↵Nivesh Rajbhandari2012-06-25
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shift to the right and has different scroll bars. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-bugfix1Jonathan Duran2012-06-25
|\| | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixing our textfield component to support binding. Fix for IKNINJA-1394Valerio Virgillito2012-06-22
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | | | | | Timeline Fix - reopen subprop keyframes for Position and Size correctlyJonathan Duran2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | | | | | | | Timeline fix - remove unneeded bindingJonathan Duran2012-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into timeline-deletekeyframefixJonathan Duran2012-06-22
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #320 from ananyasen/cut-copy-pasteValerio Virgillito2012-06-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | copy cut paste - project phase 1 check in
| | * | | | | | | | | |