aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
...
| | * | | | | | 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
| | * | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
| | |\| |
| | * | | Presets Panel - Adding presets controller and removing functionality from ↵Eric Guzman2012-03-22
| | | |/ | | |/| | | | | | | | | panel code
| * | | Merge pull request #139 from dhg637/ResizersRefactoringValerio Virgillito2012-03-28
| |\ \ \ | | |_|/ | |/| | Resizers refactoring
| | * | Resizers updatedArmen Kesablyan2012-03-23
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Merge branch 'refs/heads/master' into DataBindingArmen Kesablyan2012-03-22
| | |\|
| | * | Updated Resizers for Panels and timelineArmen Kesablyan2012-03-22
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | Merge pull request #142 from joseeight/ColorValerio Virgillito2012-03-26
| |\ \ \ | | | | | | | | | | Color Bug Fix
| | * | | Fix: IKNINJA-1362Jose Antonio Marquez2012-03-26
| | | |/ | | |/|
| * | | Merge pull request #138 from joseeight/FileIO-Montage-ComponentsValerio Virgillito2012-03-23
| |\ \ \ | | | | | | | | | | I/O Fixes
| | * \ \ Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-23
| | |\ \ \ | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| | * | | | Adding firstDraw event to components addedJose Antonio Marquez2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | This will allow us to re-parse the document for styles added dynamically.
| * | | | | Presets - fixed preset group name ("2D")Eric Guzman2012-03-23
| | |/ / / | |/| | |
| * | | | Presets Panel - Add slide/fade out animationEric Guzman2012-03-23
| | | | |
| * | | | Adding enabled/disabled support for PI's checkbox control.Nivesh Rajbhandari2012-03-22
| |/ / / | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-21
| |\ \ \ | | | | | | | | | | | | | | | montage-integration
| | * | | Presets Panel - Add Font style presetEric Guzman2012-03-21
| | | | |
| * | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-21
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-20
| |\ \ \ \ |