aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | | | | | | | | | | | | | | | | | * | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-29
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | | | | | | | |/| | | | | | | | | | / / / / / / / / | | | | | | | | | | | | | | | | | | |/ / / / / / / /
| | | | | | | | | | | | | | | | | | * | | | | | | | Merge branch 'Timeline-latest-change' of github.com:ntfx47/ninja-internal ↵Jonathan Duran2012-03-27
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into TimelineUber Conflicts: js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | | | | | | | | | | | | | | | | | * | | | | | | | Timeline : Zoom Slider StylingKruti Shah2012-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | | | | | | | | | | | | | | | | | | * | | | | | | | Timeline : Breadcrumb FixKruti Shah2012-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | | | | | | | | | | | | | | | | | | * | | | | | | | Timeline : Adding Zoom SliderKruti Shah2012-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | | | | | | | | | | | | | | | | | * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | | | | | | | | | | | | | | | | * | | | | | | | | Fix bug with track properties getting over writtenJonathan Duran2012-03-26
| | | | | | | | | | | | | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | | | | | | | | | | | | | | | | * | | | | | | | Timeline : Bug Fix : IKNINJA 1374Jonathan Duran2012-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | | | | | | | | | | | | | | | | * | | | | | | | 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 ↵Jon Reid2012-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | console.log calls in hintable component.
| | | | | | | | | | | | | | | | | | | * | | | | | | | Fix: Change click handler to mousedown for better responsiveness in layer ↵Jon Reid2012-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selection UI.
| | | | | | | | | | | | | | | | | | | * | | | | | | | Timeline: fix layer and style select problems.Jon Reid2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | * | | | | | | | Timeline: Re-enable adding/removing styles to layers. New methods in ↵Jon Reid2012-03-19
| | | | |