aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-06-12
|\ | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * remove unneeded serializationJonathan Duran2012-06-12
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * montage v10 serialization updates for timelineJonathan Duran2012-06-12
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * remove some console logs and simply the prop tween retrieval conditionsJonathan Duran2012-06-12
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Squashed commit of the following:Jonathan Duran2012-06-11
| | | | | | | | | | | | | | | | | | | | commit 8e98ce012f55576ddb979969a3a1d834301af0c7 Author: Jon Reid <tjh487@motorola.com> Date: Fri Jun 8 18:08:38 2012 -0700 Timeline: New feature: Only one easing menu can be open at a time. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * changes to reopen sub property functionsJonathan Duran2012-06-11
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Fix references to documentController.activeDocument to currentDocument.modelJonathan Duran2012-06-06
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Fix error when opening file with no animationsJonathan Duran2012-06-05
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Timeline: Merge branch 'pull-request' into timeline-localJon Reid2012-06-05
| |\ | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
| | * Timeline: Fix line endings, set to UNIX.Jon Reid2012-06-05
| | |
| | * Timeline: Fixes to timeline to handle document switching & breadcrumbJon Reid2012-06-04
| | | | | | | | | | | | interactions under new DOM Architecture.
| * | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-05
| |\ \
| | * | Timeline: Better style selection and deselection. Automatic re-selection ofJon Reid2012-06-01
| | | | | | | | | | | | | | | | previously selected style when parent layer is reselected.
| | * | Timeline: Bug fixes for deleting styles and their associated tracksJon Reid2012-05-31
| | | | | | | | | | | | | | | | correctly.
| * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * fixing the timeline current document bindingsValerio Virgillito2012-05-30
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * document bindings phase 1Valerio Virgillito2012-05-29
| | | | | | | | | | | | | | | | | | | | | | | | - using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Sub PropsKruti Shah2012-06-12
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Color chip in TPKruti Shah2012-06-08
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Sub propertyKruti Shah2012-06-07
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | LCKruti Shah2012-06-04
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | LayerControlKruti Shah2012-06-01
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Clean upKruti Shah2012-06-01
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Layer ControlsKruti Shah2012-06-01
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 11:25:51 +0000