aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
Commit message (Collapse)AuthorAge
* Color ChipKruti Shah2012-05-31
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-05-31
|\ | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * fix doc model in prop trackJonathan Duran2012-05-31
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-31
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-24
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js
| | | * adding document views checks for the timeline and breadcrumbValerio Virgillito2012-05-23
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * Timeline triggerBinding needs to be set to false in the track data.Nivesh Rajbhandari2012-05-23
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Cleaning up referencing to 'documentRoot' and '_document'Jose Antonio Marquez2012-05-24
| | |/ | | | | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view.
| | * Timeline should not select an element when a layer is selected by code.Valerio Virgillito2012-05-16
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * fixing the timeline selecting when creating a new layerValerio Virgillito2012-05-11
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Fixing the dirty document flag. Disabling the stylesheets dirty flag because ↵Valerio Virgillito2012-05-10
| | | | | | | | | | | | | | | | | | === true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-05-30
| |\ \
| | * | fancy keyframe selectionJonathan Duran2012-05-30
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | fix to set default prop for tweenJonathan Duran2012-05-29
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-05-29
| |\| |
| | * | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-25
| | |\ \
| | * | | 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>
| * | | | Timeline: bug fix: better selection/deselection of styles within layers.Jon Reid2012-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.
| * | 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
| | | | | | | |
* | | | | | | | Style Layer ControlKruti Shah2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-05-22
|\| | | | | | |
| * | | | | | | more sub prop doc open supportJonathan Duran2012-05-22
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>