aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-06
|\
| * fixing the number fields to not have units.Valerio Virgillito2012-04-04
| * Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| |\
| * | completing the component simple piValerio Virgillito2012-03-30
| * | IKNINJA-1191 - Fixed the order of the componentsValerio Virgillito2012-03-30
| * | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-28
| |\ \
| * | | Cleanup of the components panelValerio Virgillito2012-03-26
* | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-05
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #149 from dhg637/BugFixesValerio Virgillito2012-04-04
| |\ \ \
| | * \ \ Merge branch 'refs/heads/master' into BugFixesArmen Kesablyan2012-04-04
| | |\ \ \
| | * | | | Resizing BugsArmen Kesablyan2012-03-29
| | * | | | Bug #1073: Panels interact with hottest drag dropArmen Kesablyan2012-03-28
| | | |_|/ | | |/| |
| * | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-29
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Presets - Remove style transition when transition doesn't start. Also added t...Eric Guzman2012-03-29
* | | | | Should not select any layer on element deleteJonathan Duran2012-04-04
* | | | | Update timeline to work with new element removed eventJonathan Duran2012-04-04
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-04
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
* | | | | Changing layer name should put dirty flag on docJonathan Duran2012-04-04
* | | | | define "that" var correctlyJonathan Duran2012-04-04
* | | | | Merge branch 'timeline-k' of github.com:ntfx47/ninja-internal into TimelineUberJonathan Duran2012-04-04
|\ \ \ \ \
| * | | | | Timeline: Saving layernameKruti Shah2012-04-04
| * | | | | Timeline: Initial implementation of timeline zoom.Jon Reid2012-04-03
| * | | | | TImeline : Bug Fix 1429 & The zoom tweendataKruti Shah2012-04-02
* | | | | | FIX IKNINJA-1309 Timeline:Master Layer animation span is gone when another ne...Jonathan Duran2012-04-03
* | | | | | 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
| * | | | | | Timeline: Autoscrolling when dragging a layer within a scrollable layerJon Reid2012-04-02
| * | | | | | Timeline: Move drag-and-drop helper deletion to draw routine. Bug fix:Jon Reid2012-03-30
| * | | | | | Timeline: Link layerDragEnd and layerDrop events to better handle end ofJon Reid2012-03-30
| * | | | | | 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
| |\| |
| | * | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
| | |\|
| | * | Presets Panel - Adding presets controller and removing functionality from pan...Eric Guzman2012-03-22
| * | | Merge pull request #139 from dhg637/ResizersRefactoringValerio Virgillito2012-03-28
| |\ \ \ | | |_|/ | |/| |
| | * | Resizers updatedArmen Kesablyan2012-03-23
| | * | Merge branch 'refs/heads/master' into DataBindingArmen Kesablyan2012-03-22
| | |\|
| | * | Updated Resizers for Panels and timelineArmen Kesablyan2012-03-22
| * | | Merge pull request #142 from joseeight/ColorValerio Virgillito2012-03-26
| |\ \ \
| | * | | Fix: IKNINJA-1362Jose Antonio Marquez2012-03-26
| | | |/ | | |/|
| * | | Merge pull request #138 from joseeight/FileIO-Montage-ComponentsValerio Virgillito2012-03-23
| |\ \ \
| | * \ \ Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-23
| | |\ \ \