| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 |
| | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||
| | * | | | | | | | | | | | | changing the RSS reader default sized and padding. | Valerio Virgillito | 2012-03-20 |
| | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Eric Guzman | 2012-03-20 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | FeedReaderAnimation | ||
| | | * | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal | Valerio Virgillito | 2012-03-20 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | Removing the youtube channel video black background | Valerio Virgillito | 2012-03-20 |
| | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | | | | | Feed Reader - Fix reference closure'd "this" | Eric Guzman | 2012-03-20 |
| | | |/ / / / / / / / / | |/| | | | | | | | | | |||
| | * | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Eric Guzman | 2012-03-20 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FeedReaderAnimation | ||
| | | * | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal | Valerio Virgillito | 2012-03-20 |
| | | |\ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | Fixing the selection issues | Valerio Virgillito | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | | | | | | giving the feed reader a default size when empty | Valerio Virgillito | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | | | | | Feed Reader - change default display mode to "timer" | Eric Guzman | 2012-03-20 |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal | Eric Guzman | 2012-03-20 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||
| | | * | | | | | | | | | | Reset the animation event handlers/timer when the display mode changes. | Kishore Subramanian | 2012-03-20 |
| | | |/ / / / / / / / / | |||
| | * | | | | | | | | | | Feed Reader - Add PI field for display mode | Eric Guzman | 2012-03-20 |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | Presets - Animation update | Eric Guzman | 2012-03-20 |
| | |/ / / / / / / / / | |||
| | * | | | | | | | | | Animation for the Feed reader | Kishore Subramanian | 2012-03-20 |
| | | | | | | | | | | | |||
| | * | | | | | | | | | Change Youtube channel transition to avoid rendering bug | Stuart Knightley | |