Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | Bindings Panel - Update binding panel components | Eric Guzman | 2012-06-01 | |
| | | | | | | | | ||||
| * | | | | | | | Binding Panel - Developed panel components. | Eric Guzman | 2012-05-31 | |
| | | | | | | | | ||||
| * | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-05-31 | |
| |\ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-05-30 | |
| | |\ \ \ \ \ \ \ | ||||
| * | | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-05-25 | |
| |\| | | | | | | | | ||||
| | * | | | | | | | | Merge branch 'refs/heads/dom-architecture' into binding | Armen Kesablyan | 2012-05-25 | |
| | |\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | Object Component - Enable native dragging | Eric Guzman | 2012-05-25 | |
| | | | | | | | | | | | ||||
| * | | | | | | | | | | Object component - Minor cleanup | Eric Guzman | 2012-05-25 | |
| |/ / / / / / / / / | ||||
| * | | | | | | | | | Merge branch 'refs/heads/dom-architecture' into binding | Armen Kesablyan | 2012-05-23 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/dom-architecture' into binding | Armen Kesablyan | 2012-05-17 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| * | | | | | | | | | | | Removed Old Objects Panel Structure | Armen Kesablyan | 2012-05-17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| * | | | | | | | | | | | Objects Panel - Add object component | Eric Guzman | 2012-05-16 | |
| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | Merge branch 'dom-architecture' of ↵ | Armen Kesablyan | 2012-05-15 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into binding | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/masterDomArc' into binding | Armen Kesablyan | 2012-05-14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | Workspace: has customized | Armen Kesablyan | 2012-05-14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| * | | | | | | | | | | | | | created the initial environment requirements for workspace to be manipulated. | Armen Kesablyan | 2012-05-11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
* | | | | | | | | | | | | | | Merge pull request #336 from mqg734/IKNinja_1688 | Valerio Virgillito | 2012-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 Rajbhandari | 2012-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-bugfix1 | Jonathan Duran | 2012-06-25 | |
|\| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | Fixing our textfield component to support binding. Fix for IKNINJA-1394 | Valerio Virgillito | 2012-06-22 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
* | | | | | | | | | | | | | | Timeline Fix - reopen subprop keyframes for Position and Size correctly | Jonathan Duran | 2012-06-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | | | | | | | | | | | Timeline fix - remove unneeded binding | Jonathan Duran | 2012-06-22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into timeline-deletekeyframefix | Jonathan Duran | 2012-06-22 | |
|\| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Merge pull request #320 from ananyasen/cut-copy-paste | Valerio Virgillito | 2012-06-21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | copy cut paste - project phase 1 check in | |||
| | * | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-20 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-19 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-13 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-12 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | | - removed extra selection change event, | Ananya Sen | 2012-06-11 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - displace element after adding it to the document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
* | / | | | | | | | | | | | | | | | FIx - can't delete keyframes | Jonathan Duran | 2012-06-22 | |
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |