| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Timeline: Bug fixes: Document switching between new documents now working. | Jon Reid | 2012-04-12 |
| | | | | | | Fixed problem with MasterDuration not being set correctly on document switch. | ||
| * | Timeline: Fixing the animated Element | Kruti Shah | 2012-04-12 |
| | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Timeline : Replace Element Taken Care of | Kruti Shah | 2012-04-12 |
| | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-12 |
| |\ | |||
| | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-11 |
| | |\ | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used mine. | ||
| | * | | Timeline: Change Master Layer configuration menu to be on click; bug fix: | Jon Reid | 2012-04-11 |
| | | | | | | | | | | | | | | | | Master Layer config menu does not scroll with layers. Bug fix: New layers do not take into account "show only animated layers" feature. | ||
| * | | | Merge branch 'refs/heads/timeline-kruti-local' into TimelineUber | Jonathan Duran | 2012-04-12 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | Timeline:Changing function name | Kruti Shah | 2012-04-12 |
| | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | More Absolute vs Relative changes and cleanup | Jonathan Duran | 2012-04-11 |
| | |/ |/| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Timeline: Bug fix: Drag and Drop now working again. | Jon Reid | 2012-04-10 |
| | | | |||
| * | | Timeline: New files. | Jon Reid | 2012-04-10 |
| | | | |||
| * | | Timeline: New Features: Tag name now present in each layer. Configuration | Jon Reid | 2012-04-10 |
| | | | | | | | | | dropdown in Master Layer; Show Only Animated Layers toggle. | ||
| * | | Timeline: Bug fix, IKNINJA 1467, "Timeline: Changing layer names should not | Jon Reid | 2012-04-09 |
| |/ | | | | require hitting "Return" key to commit the change" | ||
| * | Timeline : Deleting of layers. And master duration track updating with ↵ | Kruti Shah | 2012-04-06 |
| | | | | | | | deletion of layers Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Timeline: Improved drag-and-drop performance. Also fix problems with | Jon Reid | 2012-04-05 |
| | | | | | expand/collapse getting out of synch during drag-and-drop. | ||
| * | Should not select any layer on element delete | Jonathan Duran | 2012-04-04 |
| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Update timeline to work with new element removed event | Jonathan Duran | 2012-04-04 |
| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-04 |
| |\ | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/tools/SelectionTool.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Squashed commit of Preparing for the montage undo-manager: Architecture changes | Valerio Virgillito | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'timeline-k' of github.com:ntfx47/ninja-internal into TimelineUber | Jonathan Duran | 2012-04-04 |
| |\ \ | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | Timeline: Saving layername | Kruti Shah | 2012-04-04 |
| | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | TImeline : Bug Fix 1429 & The zoom tweendata | Kruti Shah | 2012-04-02 |
| | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | FIX IKNINJA-1309 Timeline:Master Layer animation span is gone when another ↵ | Jonathan Duran | 2012-04-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | new file is open Fix for master duration indicator not updating when switching files Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Timeline: Autoscrolling when dragging a layer within a scrollable layer | Jon Reid | 2012-04-02 |
| | | | | | | | | | | | | | list. | ||
| * | | | Timeline: Move drag-and-drop helper deletion to draw routine. Bug fix: | Jon Reid | 2012-03-30 |
| | | | | | | | | | | | | | better handling of drag-and-drop finish events and cleanup of helper. | ||
| * | | | Timeline: Link layerDragEnd and layerDrop events to better handle end of | Jon Reid | 2012-03-30 |
| |/ / | | | | | | | drag-and-drop events. | ||
| * | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-03-29 |
| |\ \ | |||
| | * | | Timeline: Stability fixes for drag-and-drop and page switching. | Jon Reid | 2012-03-27 |
| | | | | |||
| * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-29 |
| |\ \ \ | |/ / |/| / | |/ | |||
| | * | Resizers updated | Armen Kesablyan | 2012-03-23 |
| | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | Merge branch 'Timeline-latest-change' of github.com:ntfx47/ninja-internal ↵ | Jonathan Duran | 2012-03-27 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into TimelineUber Conflicts: js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | Timeline : Zoom Slider Styling | Kruti Shah | 2012-03-27 |
| | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | Timeline : Breadcrumb Fix | Kruti Shah | 2012-03-26 |
| | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | Timeline : Adding Zoom Slider | Kruti Shah | 2012-03-26 |
| | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | Timeline: Change dragIcon to be a data-uri. | Jon Reid | 2012-03-26 |
| | | | | |||
| * | | | Timeline: Drag and Drop of layers. | Jon Reid | 2012-03-26 |
| |/ / | |||
| * | | Timeline : Bug Fix : IKNINJA 1374 | Jonathan Duran | 2012-03-23 |
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Timeline: Bug fix: style collapsers not staying in synch. Also, removed ↵ | Jon Reid | 2012-03-21 |
| | | | | | | | | | console.log calls in hintable component. | ||
| * | | Fix: Change click handler to mousedown for better responsiveness in layer ↵ | Jon Reid | 2012-03-21 |
| | | | | | | | | | selection UI. | ||
| * | | Timeline: fix layer and style select problems. | Jon Reid | 2012-03-20 |
| | | | |||
| * | | Timeline: Re-enable adding/removing styles to layers. New methods in ↵ | Jon Reid | 2012-03-19 |
| | | | | | | | | | TimelinePanel for creating new styles on document load. | ||
| * | | Fix layer order and selection on reopen | Jonathan Duran | 2012-03-16 |
| | | | | | | | | | | | | | Layer order should be in the same order as created. Nothing should be selected with opening a doc. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Merge branch 'refs/heads/Timeline-local' into TimelineDOM | Jonathan Duran | 2012-03-16 |
| |\ \ | |||
| | * \ | Merge branch 'Timeline-local' into Timeline-local-2 | Jon Reid | 2012-03-16 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | ||
| | | * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local | Jon Reid | 2012-03-16 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | ||
| | | * | | Timeline: Hook up data binding for changes on subproperties. | Jon Reid | 2012-03-16 |
| | | | | | |||
| | | * | | Timeline: remove comment. | Jon Reid | 2012-03-15 |
| | | | | | |||
| | | * | | Timeline: Remove selection timer on add new layer method. | Jon Reid | 2012-03-15 |
| | | | | | |||
| | | * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local | Jon Reid | 2012-03-15 |
| | | |\ \ | |||
| | | * | | | Timeline: Fix for layer selection problems on file open and switch. | Jon Reid | 2012-03-15 |
| | | | | | | |||