aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-26
|\
| * Timeline: bug fix: command-click now works for multi selecting layers on ↵Jon Reid2012-06-25
| | | | | | | | Macs. Also disabled control-click on macs.
| * Timeline: Bug fix IKNINJA-1812, "Easing option switches to NoneJon Reid2012-06-25
| | | | | | | | automatically when moving a keyframe"
| * Timeline: CSS fixes.Jon Reid2012-06-25
| |
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-26
|\ \
| * | Fixing our textfield component to support binding. Fix for IKNINJA-1394Valerio Virgillito2012-06-22
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Timeline Bug fixesJonathan Duran2012-06-26
| |/ |/| | | | | | | | | Fix keyframe selection updating stage for sub props. Fix tween 0 for sub props on re-open. Fix repetition mismatch for styles and position tracks. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-25
|\ \ | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolution: Use both.
| * | 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/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>
| | * \ \ \ \ \ \ \ Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-19
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | 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/Ninja-Internal' into ColorJose Antonio Marquez2012-06-20
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Adding transparent background to color chip buttonsJose Antonio Marquez2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a transparent pattern to the background of color chips consumed in the app, this way you can preview colors in alpha. This was lost, just added back again. Not a big change, just minor CSS, so should only be quickly tested prior to merge.
* | | | | | | | | | | Timeline: Breadcrumb hash in currentDocument will now update as changesJon Reid2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are made to the DOM.
* | | | | | | | | | | Timeline: Bug fix: When creating a new file, Timeline was disabled.Jon Reid2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Injection from fix of IKNINJA-1783)
* | | | | | | | | | | Timeline: Bug fix IKNINJA-1791 Double-clicking to go in a child level andJon Reid2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | coming back up to Body will collapse its layer and wipe out all the sub property keyframes.
* | | | | | | | | | | Timeline: Bug fix IKNINJA-1755 Can't insert keyframes in a CSS styleJon Reid2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property of an object on top layer
* | | | | | | | | | | Timeline: Bug fix IKNINJA-1783, Timeline panel is disabled when CSS file isJon Reid2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | open in another tab.
* | | | | | | | | | | Timeline: Bug Fix: Document switching was doubling position tracks.Jon Reid2012-06-21
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | |