aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into FeedRe...Eric Guzman2012-03-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Flow doesn't reset to origin 0 when changing the feedFrançois Frisch2012-03-21
| | * | | | | | | | | | | | | | Making flow flat on stageFrançois Frisch2012-03-21
| | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Feed Reader - Remove hard-coded font color for feed readerEric Guzman2012-03-21
| * | | | | | | | | | | | | | Presets Panel - Add Font style presetEric Guzman2012-03-21
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #129 from mqg734/WebGLMaterialsValerio Virgillito2012-03-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Button's enabled property binding should be oneway only.Nivesh Rajbhandari2012-03-20
| | * | | | | | | | | | | | Deleting unused Materials.xml file since we converted to JSON.Nivesh Rajbhandari2012-03-20
| | * | | | | | | | | | | | Support edit material button in oval and line PI.Nivesh Rajbhandari2012-03-20
| | * | | | | | | | | | | | Support button control in Properties Panel and use them for edit fill and str...Nivesh Rajbhandari2012-03-20
| | * | | | | | | | | | | | Fixing error in drawUtils when closing document - should set _eltArray and _p...Nivesh Rajbhandari2012-03-20
| | * | | | | | | | | | | | Removing zoom from element's getMatrix. Zoom should only be checked on stage.Nivesh Rajbhandari2012-03-20
| | * | | | | | | | | | | | Use new tree control in Materials panel.Nivesh Rajbhandari2012-03-19
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | / / / / / / / | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Initializing carousel in middle positionFrançois Frisch2012-03-20
* | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-20
|\| | | | | | | | | | |
| * | | | | | | | | | | changing the RSS reader default sized and padding.Valerio Virgillito2012-03-20
* | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-20
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into FeedRe...Eric Guzman2012-03-20
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Feed Reader - Fix reference closure'd "this"Eric Guzman2012-03-20
* | | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internalValerio Virgillito2012-03-20
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into FeedRe...Eric Guzman2012-03-20
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Feed Reader - change default display mode to "timer"Eric Guzman2012-03-20
| | * | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internalEric Guzman2012-03-20
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Feed Reader - Add PI field for display modeEric Guzman2012-03-20
| | * | | | | | | | | | | | | Presets - Animation updateEric Guzman2012-03-20
| * | | | | | | | | | | | | | Removing the youtube channel video black backgroundValerio Virgillito2012-03-20
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-20
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internalValerio Virgillito2012-03-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Reset the animation event handlers/timer when the display mode changes.Kishore Subramanian2012-03-20
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | Fixing the selection issuesValerio Virgillito2012-03-20
| * | | | | | | | | | | | giving the feed reader a default size when emptyValerio Virgillito2012-03-20
| |/ / / / / / / / / / /
| * | | | | | | | | | | Animation for the Feed readerKishore Subramanian2012-03-20
| * | | | | | | | | | | Change Youtube channel transition to avoid rendering bugStuart Knightley2012-03-20
* | | | | | | | | | | | Merge branch 'refs/heads/button-switch' into montage-integrationValerio Virgillito2012-03-20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fully removing our old button component from NinjaValerio Virgillito2012-03-19
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-19
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Reformating carouselFrançois Frisch2012-03-19
| * | | | | | | | | | | Update manifest to remove youtubeStuart Knightley2012-03-19
| * | | | | | | | | | | Need to allow youtube.com content in Ninja's manifest. Note you will have to ...Nivesh Rajbhandari2012-03-19
* | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-19
|\| | | | | | | | | | |
| * | | | | | | | | | | Preserve-3d on flow and specify default dimensions on picasa-carousel.Nivesh Rajbhandari2012-03-19
* | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-19
|\| | | | | | | | | | |
| * | | | | | | | | | | fixing the selection for the picasa carouselValerio Virgillito2012-03-19
| * | | | | | | | | | | Update Youtube channel to have three thumbnailsStuart Knightley2012-03-19
* | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-19
|\| | | | | | | | | | |
| * | | | | | | | | | | Map - width and height should be 100% so resize handles work.Nivesh Rajbhandari2012-03-19