aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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
| | |\ | |_|/ |/| |
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-06
|\ \ \
| * \ \ Merge pull request #98 from mencio/panelsValerio Virgillito2012-03-06
| |\ \ \
| | * \ \ Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
| | |\ \ \
| | * | | | Adding drag and dropValerio Virgillito2012-03-05
| | * | | | remove console logValerio Virgillito2012-03-05
| | * | | | removing repetition from the panel container and using a static list of panels.Valerio Virgillito2012-03-05
* | | | | | Squashed commit FileIO-Build-Candidate into MasterValerio Virgillito2012-03-06
|/ / / / /
* | / / / Fixing WebGL not available bugJose 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
| | | |\ | |_|_|/ |/| | |
* | | | Squashed commit of preload-fix into MasterValerio Virgillito2012-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
| |\ \ | |/ / |/| |
* | | Merge pull request #93 from imix23ways/TimelineValerio Virgillito2012-03-02
|\ \ \
| * | | Timeline Fix timing functionJonathan Duran2012-03-02
| * | | Timeline: Fix for animation iteration countJonathan Duran2012-03-02
| * | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-03-01
| |\ \ \
| * \ \ \ Merge branch 'Timeline-main' into Timeline-localJon Reid2012-03-01
| |\ \ \ \
| | * | | | Set doc dirty flag when adding tweens or modifying animationsJonathan Duran2012-03-01
| | * | | | Update master track on duration change instead of tween add.Jonathan Duran2012-03-01
| | * | | | Timeline: Track Duration FixJonathan Duran2012-03-01
| * | | | | Timeline: efficiency improvements to collapser. Document switching.Jon Reid2012-03-01
| * | | | | Timeline: Merge. Set collapser heights.Jon Reid2012-03-01
| * | | | | Merge branch 'Timeline-main' into Timeline-newdocJon Reid2012-03-01
| |\| | | |
| | * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-03-01
| | |\ \ \ \
| | * | | | | Squashed commit of the following:Jonathan Duran2012-02-29
| | * | | | | Merge branch 'Timeline-b2-latest' of github.com:ntfx47/ninja-internal into Ti...Jonathan Duran2012-02-29
| | |\ \ \ \ \
| | | * | | | | Timeline:Revert back to earlier codeKruti Shah2012-02-29
| | | * | | | | TImeline: CleanupKruti Shah2012-02-29
| | | * | | | | Timeline: Changed the variables names to resolve issues.And removed the alert.Kruti Shah2012-02-29