aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-16
|\
| * Zooming the tweensKruti Shah2012-07-12
| * Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-11
| |\
| * | Adding Zoom Control to Property TracksKruti Shah2012-07-10
| * | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-09
| |\ \
| * \ \ Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-09
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-03
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-07-03
| |\ \ \ \ \
* | | | | | | Timeline: Disable drag-and-drop on subproperty keyframes. Better errorJon Reid2012-07-16
* | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-11
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix layer arrayJonathan Duran2012-07-10
| * | | | | | Fix more missing charJonathan Duran2012-07-10
| * | | | | | Fix missing char and Temp fix missing imageJonathan Duran2012-07-10
| | |_|_|_|/ | |/| | | |
* | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-09
|\| | | | |
| * | | | | remove commas from var linesJonathan Duran2012-07-09
| * | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCodeKruti Shah2012-07-09
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Adding commentsKruti Shah2012-07-09
| * | | | | Refactoring CodeKruti Shah2012-07-09
| * | | | | Remove CommentKruti Shah2012-07-03
| * | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCodeKruti Shah2012-07-03
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/ninjainternalmaster' into Timeline-RefactorCodeKruti Shah2012-07-03
| |\ \ \ \ \ \
| * | | | | | | Refactor Code + Bug Fix for the Colorchip disappear between breadcrumb naviga...Kruti Shah2012-07-03
| * | | | | | | Refactoring PropertyTrack.js & Span.jsKruti Shah2012-07-03
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Timeline: Delete unused file.Jon Reid2012-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
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | adding missing copyright to the feed reader.Valerio Virgillito2012-07-06
| * | | | | | Merge pull request #373 from kriskowal/bsdValerio Virgillito2012-07-06
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Update copyright boilerplateKris Kowal2012-07-06
| |/ / / / /
* | | | | | 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
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | adding missing montage to the user library and temporary fix for picas screen...Valerio Virgillito2012-07-03
| * | | | | | Merge pull request #369 from aadsm/gh-329_template-creator-restores-elementValerio Virgillito2012-07-03
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | gh-329 Make Template Creator restore the elements after serializationAntónio Afonso2012-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
| |_|/ / |/| | |
* | | | 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
|\ \ \