aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | | | | | | Merge branch 'Timeline-uber' into timeline-serializedJon Reid2012-03-06
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-06
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-06
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Timeline: Code cleanup. Fix bug with unfound property in serialization.Jon Reid2012-03-06
| | * | | | | | | | | | | | | | | | | Merge branch 'Timeline-uber' into timeline-serializedJon Reid2012-03-06
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-06
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-03-06
| | | | |/ / / / / / / / / / / / / / /
| | | | * | | / / / / / / / / / / / / Timeline Fix for layer/element selectionJonathan Duran2012-03-06
| | | | | |_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-02
| | | |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-serial...Jon Reid2012-03-02
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Support writing and reading of animation duration with millsecondsJonathan Duran2012-03-02
| | | * | | | | | | | | | | | | | | Timeline Fix timing functionJonathan Duran2012-03-02
| | | * | | | | | | | | | | | | | | Timeline: Fix for animation iteration countJonathan Duran2012-03-02
| | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Timeline: Serialization of all Collapser componentsJon Reid2012-03-02
| | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Timeline: Fix TODOs for consolidating repetition objects.Jon Reid2012-03-02
| | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Remove console logJonathan Duran2012-03-02
| | * | | | | | | | | | | | | CleanupJonathan Duran2012-03-02
| | * | | | | | | | | | | | | Start looping over tweened properties genericallyJonathan Duran2012-03-02
| | * | | | | | | | | | | | | Timeline bug fixes and cleanupJonathan Duran2012-03-01
| | * | | | | | | | | | | | | Fix for selection change event handlerJonathan Duran2012-03-01
| | * | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Timeline: Merge arrlayers and arrtracks into one object.Jon Reid2012-03-01
| * | | | | | | | | | | | | | | Merge pull request #103 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-07
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | / / / / / / / / / | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Image data fix on OpenJose Antonio Marquez2012-03-07
| | * | | | | | | | | | | | | Adding To-do comments for CDN stylesheetsJose Antonio Marquez2012-03-07
| | * | | | | | | | | | | | | Removing temp viewing of CDN stylesJose Antonio Marquez2012-03-07
| |/ / / / / / / / / / / / /
* / / / / / / / / / / / / / integrating v0.7 montage into ninjaValerio Virgillito2012-03-08
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #99 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-06
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Adding CDN support for URLs in linked CSSJose Antonio Marquez2012-03-06
| | * | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-06
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | / / / / / | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Fixing WebGL not available bugJose Antonio Marquez2012-03-06
| | * | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-06
| | |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-06
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Changing length of characters per line (pretty function)Jose Antonio Marquez2012-03-06
| * | | | | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | CSS on CDN preview fixJose Antonio Marquez2012-03-05
| * | | | | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Temp support for CDN CSSJose Antonio Marquez2012-03-05
| * | | | | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Minor FixJose Antonio Marquez2012-03-05
| * | | | | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Fixed URL parsing issue on actual opened documentJose Antonio Marquez2012-03-05
| * | | | | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Resolved URL path issues in document and CSSJose Antonio Marquez2012-03-05
| | * | | | | | | | | | | | Setting up document level URL parsingJose Antonio Marquez2012-03-04
| | * | | | | | | | | | | | Improved CSS URL cleanedJose Antonio Marquez2012-03-04
| | * | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-02
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | |