aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/Document' into video-fixValerio Virgillito2012-06-28
|\
| * Relocating codeJose Antonio Marquez2012-06-28
| * Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-28
| |\
| * | Fixing video autoplay bug in PIJose Antonio Marquez2012-06-28
| * | Preventing video playback on openJose Antonio Marquez2012-06-28
| * | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-28
| |\ \
| * \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-28
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-27
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-25
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-22
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-22
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-21
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-21
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-20
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-20
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge pull request #358 from jreid01/timeline-prValerio Virgillito2012-06-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Timeline: Better deselection of tweens when selecting/deselecting layers.Jon Reid2012-06-28
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #361 from ericguzman/PresetsUpdate_6_28Valerio Virgillito2012-06-28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Presets/CSS Panel - Update css panel with preset class.Eric Guzman2012-06-28
* | | | | | | | | | | | | Merge pull request #354 from mencio/IKNINJA-1829Valerio Virgillito2012-06-28
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | removing some commentsValerio Virgillito2012-06-28
| * | | | | | | | | | | | | Fixing the button for the shape piValerio Virgillito2012-06-28
* | | | | | | | | | | | | | Merge pull request #355 from dhg637/GIO_binding-viewValerio Virgillito2012-06-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Binding View - Multi document bug : cleared object bindings when current docu...Armen Kesablyan2012-06-28
| * | | | | | | | | | | | | Merge branch 'Bindables_GIO' of https://github.com/ericguzman/ninja-internal ...Armen Kesablyan2012-06-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Bin...Eric Guzman2012-06-28
| | |\| | | | | | | | | | | |
| | * | | | | | | | | | | | | Binding HUD - Updated CSS for hud and promoted/bound properties.Eric Guzman2012-06-28
| * | | | | | | | | | | | | | Binding View - Bug fix After save corrupts doom and breaks binding viewArmen Kesablyan2012-06-28
| * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'Bindables_GIO' of https://github.com/ericguzman/ninja-internalArmen Kesablyan2012-06-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Bin...Eric Guzman2012-06-27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Binding HUD - CSS UpdateEric Guzman2012-06-27
| | * | | | | | | | | | | | | | | Binding HUD - Show promoted PI properties at top of listEric Guzman2012-06-27
| * | | | | | | | | | | | | | | | Binding View - Hide in Live PreviewArmen Kesablyan2012-06-26
| * | | | | | | | | | | | | | | | Binding Hud Not rendering at correct x and yArmen Kesablyan2012-06-26
* | | | | | | | | | | | | | | | | Merge pull request #359 from mencio/live-preview-buttonValerio Virgillito2012-06-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Changing the livePreview button to do a chromePreview and keeping the canvas ...Valerio Virgillito2012-06-28
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #349 from joseeight/ColorValerio Virgillito2012-06-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixing body PI background getterJose Antonio Marquez2012-06-28
| * | | | | | | | | | | | | | | Fixing chips updating with alpha changeJose Antonio Marquez2012-06-28
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #353 from imix23ways/Timeline-criticalfixValerio Virgillito2012-06-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | FIX layer selection bugJonathan Duran2012-06-28
| | * | | | | | | | | | | | | | Fixing body background bugJose Antonio Marquez2012-06-28
| | * | | | | | | | | | | | | | Fixing init alpha issueJose Antonio Marquez2012-06-28
| | * | | | | | | | | | | | | | Fixing color panel sliders updatingJose Antonio Marquez2012-06-28
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #352 from imix23ways/Timeline-IKNINJA-1843Valerio Virgillito2012-06-27
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Timeline: bug fix IKNINJA-1843Jon Reid2012-06-27
|/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Fixing history bugJose Antonio Marquez2012-06-27