aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-25
|\
| * Timeline: Better fix for keeping styles/tracks in synch when adding stylesJon Reid2012-05-25
| | | | | | | | on document open.
| * Timeline: bug fix "Layer name gets doubled" (Spreadsheet)Jon Reid2012-05-24
| |
| * Timeline: Bug fix IKNINJA 1566: Adding a css style property makes the blowJon Reid2012-05-24
| | | | | | | | layer name disappear.
* | animation name string fixJonathan Duran2012-05-25
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | remove console logsJonathan Duran2012-05-25
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | update retrieveStoredTweens methodJonathan Duran2012-05-25
|/ | | | | | change the method to retrieve the keyframe styles for each keyframe generically instead of hard coding for top, left, width and height Signed-off-by: Jonathan Duran <jduran@motorola.com>
* collapse fix for restored style layersJonathan Duran2012-05-24
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-24
|\
| * Timeline: Easing selection per keyframe.Jon Reid2012-05-23
| |
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-05-23
| |\
| * \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-05-22
| |\ \
| * | | Timeline: New easing selector in spans.Jon Reid2012-05-22
| | | |
| * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-05-22
| |\ \ \
* | | | | recreating layer propsJonathan Duran2012-05-24
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Diamond keyframesJonathan Duran2012-05-23
| |_|/ |/| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | update ease method to distinguish between main animation and prop animationsJonathan Duran2012-05-22
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-22
|\| | | |/ |/|
| * Timeline: Code cleanupJon Reid2012-05-18
| |
| * Timeline: Bug fixes for deleting elements.Jon Reid2012-05-18
| |
| * Timeline: Fix element insertion to use new TimelinePanel properties andJon Reid2012-05-18
| | | | | | | | | | multiselect. Fix Property Panel so changing an ID there will actually change an ID on the element (broken by switch from id to data-montage-id change).
| * Timeline: More bug fixes and code cleanup for multiselect.Jon Reid2012-05-17
| |
| * Timeline: Bug fixes for multiselectJon Reid2012-05-17
| |
| * Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-localJon Reid2012-05-17
| |\
| * | Timeline: Multiselect improvements. New convenience methods. MultiselectJon Reid2012-05-17
| | | | | | | | | | | | drag and drop.
| * | Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-localJon Reid2012-05-16
| |\ \
| * \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into ↵Jon Reid2012-05-15
| |\ \ \ | | | | | | | | | | | | | | | timeline-multiselect
| * | | | Timeline: Multiselect from the layer panel.Jon Reid2012-05-15
| | | | |
| * | | | Merge branch 'timeline-local' into timeline-multiselectJon Reid2012-05-15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
| | * | | | Timeline: Code cleanup. Improve efficiency for track scrolling.Jon Reid2012-05-15
| | | | | |
| * | | | | Timeline: Multiselect.Jon Reid2012-04-27
| | | | | |
* | | | | | more sub prop doc open supportJonathan Duran2012-05-22
| |_|_|_|/ |/| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | Fix restore tween for main layer track with multiple animation namesJonathan Duran2012-05-16
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | methods for setting simple ease and splitting sub prop spansJonathan Duran2012-05-16
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Remove span highlighting and start syncing pos tracks and main track keyframesJonathan Duran2012-05-16
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | CSS pixel fix for prop tracksJonathan Duran2012-05-16
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | remove old methodJonathan Duran2012-05-15
| |_|/ |/| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | fix keyframe splittingJonathan Duran2012-05-15
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | remove console logs. add retrieve tweens method for prop tracksJonathan Duran2012-05-15
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | update stage element on sub prop keyframe selectJonathan Duran2012-05-15
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | fix bug with animation names string not reset on open docJonathan Duran2012-05-15
| |/ |/| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | support width and height tween prop on re-opening saved docJonathan Duran2012-05-15
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | handle more prop types in subgroup keyframe rulesJonathan Duran2012-05-14
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | fix keyframe bug when adding keyframes to sub propertiesJonathan Duran2012-05-14
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | handle style changes on keyframesJonathan Duran2012-05-14
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | style keyframe rule additionJonathan Duran2012-05-14
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Squashed commit of the following:Jonathan Duran2012-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit b23502b8ed6856981d09577d4cf24283e5db8afa Author: Kruti Shah <kruti.shah@motorola.com> Date: Mon May 14 10:48:16 2012 -0700 Removed Debugger Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit c0b531a074e9cf9a964da0cda496bba8d7453ec1 Author: Kruti Shah <kruti.shah@motorola.com> Date: Fri May 11 13:55:18 2012 -0700 Changing Doc Layer Name Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | repetition fixJonathan Duran2012-05-11
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge branch 'refs/heads/TimelineUber' into TimelinePropsJonathan Duran2012-05-11
|\ \
| * | Timeline: Bug fixes for keyframe drag and drop.Jon Reid2012-05-09
| | |