aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* 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
| | * 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>
* | | | | | | | FIx - can't delete keyframesJonathan Duran2012-06-22
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | F5 now deletes the selected keyframe Signed-off-by: Jonathan Duran <jduran@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
| |\ \ \ \ \ \
| | * | | | | | Timeline: Enable splitting of keyframes with F6 interaction.Jon Reid2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug fix: Error on console if you press F6 with no layer selected.
| | * | | | | | Timeline: Default easing for new animation keyframes set to "none" per CSSJon Reid2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | standard.
| | * | | | | | Timeline: Bug FixesJon Reid2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Splitting tweens now works again for shift-click interaction - Fixed visual "jump" in keyframes and spans when splitting tweens - Set default easing to "none" to match CSS standard.
| * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| * | | | | | Timeline: Bug fix: Document switching no longer causes multiple styles to beJon Reid2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | added.
| * | | | | |