aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge pull request #137 from ericguzman/montage-integrationValerio Virgillito2012-03-23
|\
| * Presets - fixed preset group name ("2D")Eric Guzman2012-03-23
* | Merge branch 'montage-integration' of github.com:ericguzman/ninja-internal in...Valerio Virgillito2012-03-23
|\|
| * Feed Reader - Change default to timer so it matches componentEric Guzman2012-03-23
| * Presets Panel - Add slide/fade out animationEric Guzman2012-03-23
* | Merge pull request #135 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-23
|\ \ | |/ |/|
| * Respect play/pause WebGL animation when saving files and re-rendering caused ...Nivesh Rajbhandari2012-03-23
|/
* Merge pull request #134 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-22
|\
| * Adding enabled/disabled support for PI's checkbox control.Nivesh Rajbhandari2012-03-22
* | Merge pull request #133 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-22
|\|
| * Start WebGL animation during live preview. And set WebGL animation back to us...Nivesh Rajbhandari2012-03-22
| * Adding checkbox in PI to start/stop WebGL animation preview.Nivesh Rajbhandari2012-03-22
* | Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-inte...Valerio Virgillito2012-03-22
|\ \
| * | Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-inte...Valerio Virgillito2012-03-22
| |\|
* | | Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-inte...Valerio Virgillito2012-03-22
|\ \ \ | |/ / |/| / | |/
| * fixing the shape properties border bindings.Valerio Virgillito2012-03-22
* | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
|/
* Squashed commit of the following GL integrationValerio Virgillito2012-03-22
* Fixed the lock button for the shape properties barValerio Virgillito2012-03-22
* Adding a select for the feed reader display modeValerio Virgillito2012-03-22
* Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-22
|\
| * Update Youtube Channel to work in Chrome BetaStuart Knightley2012-03-22
| * Add scale animation back to youtube channelStuart Knightley2012-03-21
| * Make Youtube video fill the full pageStuart Knightley2012-03-21
* | Changes to the webrequest blocking and adding a google.com permission workaroundValerio Virgillito2012-03-21
* | Adding 'addComponentFirstDraw' event from the user document main component.Valerio Virgillito2012-03-21
* | Removing the gradient background in the picasa carouselValerio Virgillito2012-03-21
* | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integrationValerio Virgillito2012-03-21
|\ \
| * \ Merge branch 'refs/heads/montage-integration' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
| |\ \
| * | | Updating descriptor fileJose Antonio Marquez2012-03-21
| * | | Merge branch 'refs/heads/FileIO' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
| |\ \ \
| | * | | Fix: Chrome 19 I/O BugJose Antonio Marquez2012-03-21
| | * | | Removing usage of webRequest APIsJose Antonio Marquez2012-03-21
| * | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-21
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
| |\ \ \ \ \ | | | |/ / / | | |/| | |
* | | | | | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integrationValerio Virgillito2012-03-21
|\| | | | |
| * | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-19
| |\ \ \ \ \
| * | | | | | Tests and clean-upJose Antonio Marquez2012-03-18
| * | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-18
| |\ \ \ \ \ \
| * | | | | | | Temp I/O functionality for M-JS componentsJose Antonio Marquez2012-03-18
* | | | | | | | 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