| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Removing m-js components I/O and fix for webGL | Jose Antonio Marquez | 2012-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 Marquez | 2012-03-22 |
| |\ | | | | | | | FileIO-Montage-Components | ||
| | * | Merge branch 'montage-integration' of ↵ | Valerio Virgillito | 2012-03-22 |
| | |\ | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into montage-integration | ||
| | | * | fixing the shape properties border bindings. | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | fixing the shape properties border bindings. | Valerio Virgillito | 2012-03-22 |
| | |/ | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Squashed commit of the following GL integration | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Fixed the lock button for the shape properties bar | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Adding a select for the feed reader display mode | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Adding Ninja URL method to io-mediator | Jose Antonio Marquez | 2012-03-22 |
| | | | |||
| * | | 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. | ||
| | * | | | | | | | | | | | | | |||