| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-22 |
| |\ | | | | | | | FileIO-Montage-Components | ||
| | * | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-22 |
| | |\ | | | | | | | | | | montage-integration | ||
| | | * | Update Youtube Channel to work in Chrome Beta | Stuart Knightley | 2012-03-22 |
| | | | | |||
| | | * | Add scale animation back to youtube channel | Stuart Knightley | 2012-03-21 |
| | | | | | | | | | | | | | | | | | | | Masks animation error on Canary. Also looks cool. | ||
| | | * | Make Youtube video fill the full page | Stuart Knightley | 2012-03-21 |
| | | | | | | | | | | | | | Includes Chrome and Canary code paths for rendering bug fixes | ||
| * | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-22 |
| |\| | | | | | | | | | | | FileIO-Montage-Components | ||
| | * | | Changes to the webrequest blocking and adding a google.com permission workaround | Valerio Virgillito | 2012-03-21 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Adding firstDraw event to components added | Jose Antonio Marquez | 2012-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 Marquez | 2012-03-21 |
| |\| | | | | | | | | | | | FileIO-Montage-Components | ||
| | * | | Adding 'addComponentFirstDraw' event from the user document main component. | Valerio Virgillito | 2012-03-21 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Removing the gradient background in the picasa carousel | Valerio Virgillito | 2012-03-21 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-21 |
| |\| | | | | | | | | | | | FileIO-Montage-Components | ||
| | * | | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integration | Valerio Virgillito | 2012-03-21 |
| | |\ \ | |||
| | * \ \ | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integration | Valerio Virgillito | 2012-03-21 |
| | |\ \ \ | |||
| | * \ \ \ | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-21 |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | montage-integration | ||
| | | * | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Eric Guzman | 2012-03-21 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | FeedReaderAnimation | ||
| | | | * | | | Flow doesn't reset to origin 0 when changing the feed | François Frisch | 2012-03-21 |
| | | | | | | | |||
| | | | * | | | Making flow flat on stage | François Frisch | 2012-03-21 |
| | | | | | | | |||
| | | * | | | | Feed Reader - Remove hard-coded font color for feed reader | Eric Guzman | 2012-03-21 |
| | | | | | | | |||
| | | * | | | | Presets Panel - Add Font style preset | Eric Guzman | 2012-03-21 |
| | | |/ / / | |||
| | * | | | | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-21 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-21 |
| | |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | montage-integration | ||
| * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||
| | * | | | | | Merge pull request #125 from ananyasen/IO-patch-ninja-internal-master-ananya | Valerio Virgillito | 2012-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 Sen | 2012-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-Components | Jose Antonio Marquez | 2012-03-21 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| | * | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-20 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | montage-integration | ||
| | * \ \ \ \ \ | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-20 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration | ||
| | * \ \ \ \ \ \ | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-20 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration | ||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-20 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration | ||
| | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/button-switch' into montage-integration | Valerio Virgillito | 2012-03-20 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | fully removing our old button component from Ninja | Valerio Virgillito | 2012-03-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-19 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration | ||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-19 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration | ||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-19 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration | ||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-19 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration | ||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-19 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | Updating descriptor file | Jose Antonio Marquez | 2012-03-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still an outstanding issue of assets loaded dynamically. | ||
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | | | | Fix: Chrome 19 I/O Bug | Jose Antonio Marquez | 2012-03-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed creating new files. | ||
| | * | | | | | | | | | | | | | | | Removing usage of webRequest APIs | Jose Antonio Marquez | 2012-03-21 |
| | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the usage of the webRequest API since all files are parsed on open to handle prefixing correct origin. This will most likely not work for assets that are added dynamically and will most likely break, all those adding linking to assets should make use of a function in the mediator to mask the display value and actual value of the linked asset. | ||
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵ | Jose Antonio Marquez | 2012-03-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | ||
| | * | | | | | | | | | | | | | | Initializing carousel in middle position | François Frisch | 2012-03-20 |