aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Commit message (Collapse)AuthorAge
...
* Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
|\ | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
| * fix a typoValerio Virgillito2012-06-12
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Timeline: Fix document switching under Montage v.10Jon Reid2012-06-12
| |
| * removing the serializable from the timeline repetition and fixing the panels ↵Valerio Virgillito2012-06-12
| | | | | | | | | | | | currentDocument binding Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| | | | | | | | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-06
| |\| | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | first iteration of adding serializable to ninja plus other changes to run ↵Valerio Virgillito2012-06-06
| | | | | | | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Remove obsolete absolute/relative options from timeline config menuJonathan Duran2012-06-15
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | F6 support for keyframesJonathan Duran2012-06-15
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Timeline: fix serialization error.Jon Reid2012-06-14
| | |
* | | Timeline: More work on new easing menu.Jon Reid2012-06-13
| | |
* | | Timeline: New popup menu for easing choices.Jon Reid2012-06-12
| | |
* | | Timeline: New feature: Only one easing menu can be open at a time.Jon Reid2012-06-08
| | |
* | | 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>
* | 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>
* | Timeline: bug fix: better selection/deselection of styles within layers.Jon Reid2012-05-25
| |
* | Timeline: Easing selection per keyframe.Jon Reid2012-05-23
| |
* | 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
| |
* | Timeline: Multiselect improvements. New convenience methods. MultiselectJon Reid2012-05-17
| | | | | | | | drag and drop.
* | 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
| | |
| * | 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>
| * | Timeline: Bug fixes for keyframe drag and drop.Jon Reid2012-05-09
| | |
| * | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-09
| |\ \
| | * | Timeline: Automatic scrolling during dragging of keyframes.Jon Reid2012-05-08
| | | |
| | * | Timeline: Bug fix: Account for horizontal scroll when dragging keyframes.Jon Reid2012-05-08
| | | |
| | * | Timeline: Update drag and drop handlers to be unique for drag and drop type.Jon Reid2012-05-08
| | | |
| | * | Timeline: Move keyframe dragover and drop listeners to TimelinePanel forJon Reid2012-05-07
| | | | | | | | | | | | | | | | interaction improvements.
| * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-09
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * temporary commenting a timeline bug preventing nested selectionValerio Virgillito2012-05-04
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 10:13:02 +0000