aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Binding View - Removed DebuggerArmen Kesablyan2012-06-26
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Binding View - Objects Replace existing source Object if it existsArmen Kesablyan2012-06-25
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Can bind Multiple instanceArmen Kesablyan2012-06-25
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-25
|\ | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Merge pull request #320 from ananyasen/cut-copy-pasteValerio Virgillito2012-06-21
| |\ | | | | | | copy cut paste - project phase 1 check in
| | * Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-21
| | |\
| | * \ Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-20
| | |\ \
| | * \ \ Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-19
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-13
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-12
| | |\ \ \ \ \
| | * | | | | | - removed extra selection change event,Ananya Sen2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - displace element after adding it to the document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | Binding Panel - Changing direction in edit mode doesn't apply dirty to the ↵Armen Kesablyan2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edit form Check/Uncheck the Binding direction (Oneway) check box in the binding setting doesn't enable "SAVE" button. Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | | | Binding Panel - Can Now Edit and Delete BindingsArmen Kesablyan2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug Description: Binding Arguments that are passed in the edit form were being set to null after it was set. Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | | | Binding View: Fixed If Selected Div Erroring OutArmen Kesablyan2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | | | Binding View :Requested Changes for Pull RequestArmen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | Merge pull request #321 from imix23ways/Timeline-merge-candidateValerio Virgillito2012-06-21
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | FIX Timeline - Can't insert keyframes to a css style layer
| | * \ \ \ \ \ \ Merge branch 'refs/heads/Timeline-local-kruti' into Timeline-merge-candidateJonathan Duran2012-06-21
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Sub Property ADding KEyframe fixedKruti Shah2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-21
| |\| | | | | | |
| | * | | | | | | remove bad fileJonathan Duran2012-06-20
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'refs/heads/timeline-local' into Timeline-merge-candidateJonathan Duran2012-06-20
| | | |\ \ \ \ \ \
| | | | * | | | | | Timeline: Bug fix: Keyframe animation now works with 3D elements.Jon Reid2012-06-20
| | | | | | | | | |
| | | | * | | | | | Merge remote-tracking branch 'ninja-internal/master' into timeline-localJon Reid2012-06-20
| | | | |\ \ \ \ \ \ | | | | | | |_|_|_|/ | | | | | |/| | | |
| | | * | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | * | | | | | | remove unneeded filesJonathan Duran2012-06-20
| | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | | * | | | | | remove obsolete functionsJonathan Duran2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | * | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-19
| | | |\ \ \ \ \ \
| | | * | | | | | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOMJon Reid2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manipulation!
| | * | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-19
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | prop tween splittingJonathan Duran2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | * | | | | | | Lock Position and Size keyframes to main track keyframesJonathan Duran2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | * | | | | | | Fix position tracks collapser to use unique elementJonathan Duran2012-06-19
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | LockedElements - LayersKruti Shah2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | | | | | Layer LockKruti Shah2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | | | | | Lock ElementsKruti Shah2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | | | | | Lock ELementsKruti Shah2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | | | | | Locked Elements. Layer ControlsKruti Shah2012-06-19
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-19
| | |\ \ \ \ \ \
| | | * | | |