aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Timeline: New files.Jon Reid2012-04-10
|
* Timeline: New Features: Tag name now present in each layer. ConfigurationJon Reid2012-04-10
| | | | dropdown in Master Layer; Show Only Animated Layers toggle.
* Timeline: Bug fix, IKNINJA 1467, "Timeline: Changing layer names should notJon Reid2012-04-09
| | | | require hitting "Return" key to commit the change"
* Timeline : Deleting of layers. And master duration track updating with ↵Kruti Shah2012-04-06
| | | | | | deletion of layers Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-06
|\
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-05
| |\
| * | Timeline: Improved drag-and-drop performance. Also fix problems withJon Reid2012-04-05
| | | | | | | | | | | | expand/collapse getting out of synch during drag-and-drop.
| * | Timeline: Bit of code cleanup in Layer.jsJon Reid2012-04-05
| | |
| * | Timeline: Bug fix: IKNINJA-1435Jon Reid2012-04-05
| | |
| * | Timeline: Bug fix for IKNINJA-1086, "CSS Style Suggestion stops working"Jon Reid2012-04-05
| | |
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-06
|\ \ \ | |_|/ |/| |
| * | fixing the number fields to not have units.Valerio Virgillito2012-04-04
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| |\ \
| * | | completing the component simple piValerio Virgillito2012-03-30
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | IKNINJA-1191 - Fixed the order of the componentsValerio Virgillito2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | Components now appear in alphabetical order. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-28
| |\ \ \
| * | | | Cleanup of the components panelValerio Virgillito2012-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed to naming convention. Deleted un-used file. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-05
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | Merge pull request #149 from dhg637/BugFixesValerio Virgillito2012-04-04
| |\ \ \ | | | | | | | | | | Bug fixes
| | * \ \ Merge branch 'refs/heads/master' into BugFixesArmen Kesablyan2012-04-04
| | |\ \ \
| | * | | | Resizing BugsArmen Kesablyan2012-03-29
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | Bug #1073: Panels interact with hottest drag dropArmen Kesablyan2012-03-28
| | | |_|/ | | |/| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: js/controllers/presets-controller.js
| * | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-29
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Presets - Remove style transition when transition doesn't start. Also added ↵Eric Guzman2012-03-29
| | | | | | | | | | | | | | | | | | | | temporary fix for aggregating animations (from timeline/presets)
* | | | | Should not select any layer on element deleteJonathan Duran2012-04-04
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | Update timeline to work with new element removed eventJonathan Duran2012-04-04
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-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 changesValerio Virgillito2012-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>
* | | | | Changing layer name should put dirty flag on docJonathan Duran2012-04-04
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | define "that" var correctlyJonathan Duran2012-04-04
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | Merge branch 'timeline-k' of github.com:ntfx47/ninja-internal into TimelineUberJonathan Duran2012-04-04
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Timeline: Saving layernameKruti Shah2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | Timeline: Initial implementation of timeline zoom.Jon Reid2012-04-03
| | | | | |
| * | | | | TImeline : Bug Fix 1429 & The zoom tweendataKruti Shah2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | FIX IKNINJA-1309 Timeline:Master Layer animation span is gone when another ↵Jonathan Duran2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new file is open Fix for master duration indicator not updating when switching files Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-03
|\ \ \ \ \ \
| * | | | | | Timeline: disable console logs in layer component.Jon Reid2012-04-03
| | | | | | |
* | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-03
|\| | | | | |
| * | | | | | Timeline: Bug fix: IKNINJA-1431, "Adding a new element to the stage with oneJon Reid2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layer in focus whose name is empty, Ninja creates an empty name layer for the element."
| * | | | | | Timeline: Autoscrolling when dragging a layer within a scrollable layerJon Reid2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | list.
| * | | | | | Timeline: Move drag-and-drop helper deletion to draw routine. Bug fix:Jon Reid2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | better handling of drag-and-drop finish events and cleanup of helper.
| * | | | | | Timeline: Link layerDragEnd and layerDrop events to better handle end ofJon Reid2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | drag-and-drop events.
| * | | | | | Timeline: Bug fixes.Jon Reid2012-03-30
| |/ / / / /
* | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-03
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | / / CSS Panel - Fix animation duration value updates from "infinite" to integer.Eric Guzman2012-03-29
| | |/ / | |/| |
* | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-03-29
|\ \ \ \
| * | | | Timeline: Stability fixes for drag-and-drop and page switching.Jon Reid2012-03-27
| | | | |
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-29
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #145 from ericguzman/PresetsPIValerio Virgillito2012-03-28
| |\| | | | | | | | | | Presets - Adding presets controller