aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | | | * | | | | | | | | | | | | | | | | | 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
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-30
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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 branch 'Timeline-latest-change' of github.com:ntfx47/ninja-internal int...Jonathan Duran2012-03-27
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | Timeline : Zoom Slider StylingKruti Shah2012-03-27
| | | | | * | | | | | | | | | | | | | | | | | | Timeline : Breadcrumb FixKruti Shah2012-03-26
| | | | | * | | | | | | | | | | | | | | | | | | Timeline : Adding Zoom SliderKruti Shah2012-03-26
| | | | * | | | | | | | | | | | | | | | | | | | Timeline: Change dragIcon to be a data-uri.Jon Reid2012-03-26
| | | | * | | | | | | | | | | | | | | | | | | | Timeline: Drag and Drop of layers.Jon Reid2012-03-26
| | | | * | | | | | | | | | | | | | | | | | | | Remove console logsJonathan Duran2012-03-26
| | | | * | | | | | | | | | | | | | | | | | | | Fix bug with track properties getting over writtenJonathan Duran2012-03-26
| | | | |/ / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | Timeline : Bug Fix : IKNINJA 1374Jonathan Duran2012-03-23
| | | | * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-23
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | Timeline: First integration of drag and drop of layers.Jon Reid2012-03-21
| | | | | * | | | | | | | | | | | | | | | | | | Timeline: Bug fix: style collapsers not staying in synch. Also, removed conso...Jon Reid2012-03-21
| | | | | * | | | | | | | | | | | | | | | | | | Fix: Change click handler to mousedown for better responsiveness in layer sel...Jon Reid2012-03-21
| | | | | * | | | | | | | | | | | | | | | | | | Timeline: fix layer and style select problems.Jon Reid2012-03-20
| | | | | * | | | | | | | | | | | | | | | | | | Timeline: Re-enable adding/removing styles to layers. New methods in Timeline...Jon Reid2012-03-19
| | | | * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-23
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Fix layer order and selection on reopenJonathan Duran2012-03-16
| | | | * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineDOMJonathan Duran2012-03-16
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'Timeline-local' into Timeline-local-2Jon Reid2012-03-16
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-16
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | | Timeline: Hook up data binding for changes on subproperties.Jon Reid2012-03-16
| | | | | | * | | | | | | | | | | | | | | | | | | | | Timeline: remove comment.Jon Reid2012-03-15
| | | | | | * | | | | | | | | | | | | | | | | | | | | Timeline: Remove selection timer on add new layer method.Jon Reid2012-03-15
| | | | | | * | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-15
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | | | Timeline: Fix for layer selection problems on file open and switch.Jon Reid2012-03-15
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Consolidate conversion functionsJonathan Duran2012-03-16
| | | | * | | | | | | | | | | | | | | | | | | | | | | | CleanupJonathan Duran2012-03-16
| | | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | | | | Bug fix and cleanupJonathan Duran2012-03-16
| | | | * | | | | | | | | | | | | | | | | | | | | | | Fix layer select on selection changeJonathan Duran2012-03-16
| | | | * | | | | | | | | | | | | | | | | | | | | | | Start enforcing one element per layerJonathan Duran2012-03-16
| | | | | |_|/ / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-26
|\| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #178 from mqg734/PerspectiveFixValerio Virgillito