aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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 branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-03-01
|\ \ | |/ |/|
| * Merge pull request #91 from mayhewinator/WorkingBranchmayhewinator2012-03-01
| |\
| | * updated name in our manifest and incremented base build numberJohn Mayhew2012-03-01
| |/
| * Merge pull request #90 from mencio/stage-fixesValerio Virgillito2012-03-01
| |\
| | * Merge branch 'refs/heads/master' into stage-fixesValerio Virgillito2012-03-01
| | |\ | | |/ | |/|
| * | Squashed commit of the workspace-bugsValerio Virgillito2012-03-01
| | * Merge branch 'stage-fixes' of github.com:mencio/ninja-internal into stage-fixesValerio Virgillito2012-03-01
| | |\
| | | * revert removing the webkit transform from elements.Valerio Virgillito2012-03-01
| | * | revert removing the webkit transform from elements.Valerio Virgillito2012-03-01
| | |/
| | * stage and elements fixesValerio Virgillito2012-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
| |\|
| | * Merge branch 'refs/heads/integration-candidate'Valerio Virgillito2012-02-29
| | |\
| | | * Merge pull request #88 from mqg734/ToolFixesValerio Virgillito2012-02-29
| | | |\
| | | | * Fix for performance issue when moving shapes. We don't need to call render e...Nivesh Rajbhandari2012-02-29
| | | * | Merge branch 'SnapManagerFixes' of https://github.com/mqg734/ninja-internal i...Valerio Virgillito2012-02-29
| | | |\ \
| | | * \ \ Merge branch 'integration-candidate' of github.com:Motorola-Mobility/ninja-in...Valerio Virgillito2012-02-29
| | | |\ \ \
| | | | * \ \ Merge pull request #87 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-02-29
| | | | |\ \ \
| | | | | * \ \ Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-02-29
| | | | | |\ \ \
| | | | | | * | | Preview FixJose Antonio Marquez2012-02-29
| | | | | * | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-02-29
| | | | | |\| | |
| | | | | | * | | Fix: Caching issue with chrome tab APIJose Antonio Marquez2012-02-29
| | | | | | * | | Making class level url template variableJose Antonio Marquez2012-02-29
| | | | * | | | | Merge pull request #86 from imix23ways/TimelineValerio Virgillito2012-02-29
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge pull request #85 from pushkarjoshi/brushtoolValerio Virgillito2012-02-29
| | | | |\ \ \ \ \ \