aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Removing m-js components I/O and fix for webGLJose Antonio Marquez2012-03-23
| | | | Removed saving m-js components as new components broke I/O when present. Also made a fix for checking length of webGL array since first item now is non-user data. (That is to be removed)
* Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-22
|\ | | | | | | FileIO-Montage-Components
| * Merge branch 'montage-integration' of ↵Valerio Virgillito2012-03-22
| |\ | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into montage-integration
| | * fixing the shape properties border bindings.Valerio Virgillito2012-03-22
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Fixed the lock button for the shape properties barValerio Virgillito2012-03-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Adding a select for the feed reader display modeValerio Virgillito2012-03-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Adding Ninja URL method to io-mediatorJose Antonio Marquez2012-03-22
| |
* | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-22
|\| | | | | | | FileIO-Montage-Components
| * Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-22
| |\ | | | | | | | | | montage-integration
| | * Update Youtube Channel to work in Chrome BetaStuart Knightley2012-03-22
| | |
| | * Add scale animation back to youtube channelStuart Knightley2012-03-21
| | | | | | | | | | | | | | | | | | Masks animation error on Canary. Also looks cool.
| | * Make Youtube video fill the full pageStuart Knightley2012-03-21
| | | | | | | | | | | | Includes Chrome and Canary code paths for rendering bug fixes
* | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-22
|\| | | | | | | | | | | FileIO-Montage-Components
| * | Changes to the webrequest blocking and adding a google.com permission workaroundValerio Virgillito2012-03-21
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Adding firstDraw event to components addedJose Antonio Marquez2012-03-22
| | | | | | | | | | | | This will allow us to re-parse the document for styles added dynamically.
* | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-21
|\| | | | | | | | | | | FileIO-Montage-Components
| * | Adding 'addComponentFirstDraw' event from the user document main component.Valerio Virgillito2012-03-21
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Removing the gradient background in the picasa carouselValerio Virgillito2012-03-21
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-21
|\| | | | | | | | | | | FileIO-Montage-Components
| * | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integrationValerio Virgillito2012-03-21
| |\ \
| * \ \ Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integrationValerio Virgillito2012-03-21
| |\ \ \
| * \ \ \ Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-21
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | montage-integration
| | * | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Eric Guzman2012-03-21
| | |\ \ \ | | | | | | | | | | | | | | | | | | FeedReaderAnimation
| | | * | | 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 branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-21
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | montage-integration
* | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge pull request #125 from ananyasen/IO-patch-ninja-internal-master-ananyaValerio Virgillito2012-03-21
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json ...
| | * | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json from ↵Ananya Sen2012-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the New file dialog box. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | Merge branch 'refs/heads/montage-integration' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-20
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | montage-integration
| * \ \ \ \ \ Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | montage-integration
| * \ \ \ \ \ \ Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-20
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration
| * \ \ \ \ \ \ \ Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-20
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/button-switch' into montage-integrationValerio Virgillito2012-03-20
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fully removing our old button component from NinjaValerio Virgillito2012-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-19
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-19
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-19
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | Updating descriptor fileJose Antonio Marquez2012-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still an outstanding issue of assets loaded dynamically.
* | | | | | | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix: Chrome 19 I/O BugJose Antonio Marquez2012-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed creating new files.
| * | | | | | | | | | | | | | | Removing usage of webRequest APIsJose Antonio Marquez2012-03-21
| | |_|_|_|_|_|_|_