aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| / / / / / / / / / / / / | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #148 from ananyasen/integration-candidateValerio Virgillito2012-04-01
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | added text paste detection and updated some menu items
| | * | | | | | | | | | | | - using clipboard data directly to avoid using setTimeoutAnanya Sen2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed logical error to trigger OK on Enter key pressed Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | | | detect paste from context menu for new file and save as dialogAnanya Sen2012-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | | | IKNINJA-719 - removed Zoom In/Zoom Out under View menu in the Main menuAnanya Sen2012-03-28
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled cut, copy, paste, debug, since that functionality is not there yet Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | | | CSS Panel - Fix animation duration value updates from "infinite" to integer.Eric Guzman2012-03-29
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-30
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | Brushtool
| | * | | | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | turn off changing the left and top of the brush stroke canvasPushkar Joshi2012-03-28
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | |