aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-09
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-09
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Timeline: First pass at cleaning up TimelineTrack code. Changes propagatedJon Reid2012-07-03
| | | | * | | | | | | | | Timeline: Refactor style and layer to use pointers to parent components.Jon Reid2012-07-03
| | | | * | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-03
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / | | | | | |/| | | | | | |
| | | | * | | | | | | | | Timeline: Code refactor for Style.jsJon Reid2012-07-03
| | | * | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-07-09
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-03
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-03
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Timeline: Code refactor for Layer.jsJon Reid2012-07-03
| | | | * | | | | | | | | | Merge remote-tracking branch 'origin/timeline-local' into timeline-localJon Reid2012-07-02
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Timeline: Bug fix IKNINJA-1792, Cut pasting multiple selected objects throwsJon Reid2012-07-02
| | | | * | | | | | | | | | | Timeline: Bug fix IKNINJA-1792, Cut pasting multiple selected objects throwsJon Reid2012-07-02
| | | | |/ / / / / / / / / /
| | | * | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-07-03
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | Cleanup PropertyTrack.jsJonathan Duran2012-07-03
| | | * | | | | | | | | | | Cleanup Keyframe.jsJonathan Duran2012-07-03
| | | * | | | | | | | | | | Cleanup Tween.jsJonathan Duran2012-07-03
| | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Cleanup TimelineTrack.jsJonathan Duran2012-07-03
| | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-03
| | |\| | | | | | | | |
| | | * | | | | | | | | Fix re-open 3D tweens correctlyJonathan Duran2012-07-03
| | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Fix performance bug when moving between nested levelsJonathan Duran2012-07-02
| | | * | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-02
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Timeline: Bug fix: Unable to reselect a layer with control-click that wasJon Reid2012-06-29
| | | | * | | | | | | | Timeline: Bug fix: IKNINJA-1857, "Using keyboard shortcut for chrome-previewJon Reid2012-06-29
| | | * | | | | | | | | Fix 3d rotate tweens not showing upJonathan Duran2012-07-02
| | | * | | | | | | | | select keyframe when first createdJonathan Duran2012-07-02
| | | * | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-07-02
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-29
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-07-03
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | / / / / / / / / | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-28
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | clean upJonathan Duran2012-06-28
| | | * | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-28
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-28
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Timeline: Better deselection of tweens when selecting/deselecting layers.Jon Reid2012-06-28
| | * | | | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-28
| | |\| | | | | | | | | | | |
| | * | | | | | | | | | | | | Bug Fix : Hot text updates with keyframe selectionKruti Shah2012-06-28
| | * | | | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Creating a v0.7.1 branch and updating the manifest.json accordinglyValerio Virgillito2012-07-12
* | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/|