Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Data Binding - Hacked patch to Montage to enable serialization of ↵ | Eric Guzman | 2012-05-25 |
| | | | | | | dynamically bound objects. We should remove this once montage github issue [gh-657] is in our version of montage. | ||
* | Merge branch 'refs/heads/dom-architecture' into binding | Armen Kesablyan | 2012-05-17 |
|\ | | | | | | | | | | | | | | | Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | montage v.0.10 integration | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Fixing preview bug | Jose Antonio Marquez | 2012-05-16 |
| | | | | | | | | Also setting up for Montage component serialization. | ||
| * | Squashed master into dom-architecture | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Objects Panel - Add Objects controller and montage/application hack to ↵ | Eric Guzman | 2012-05-16 |
| | | | | | | | | expose template | ||
* | | Merge branch 'dom-architecture' of ↵ | Armen Kesablyan | 2012-05-15 |
|\| | | | | | | | github.com:Motorola-Mobility/ninja-internal into binding | ||
| * | Preliminary Montage Template Cleanup | Jose Antonio Marquez | 2012-05-09 |
| | | | | | | | | The template creator is currently not returning serializing code, but does clean the document. Need to investigate reason why, currently all components are removed on save. | ||
* | | Squashed commit of google-components into master | Valerio Virgillito | 2012-05-09 |
|/ | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | reverting to v0.8 flow component for the picasa carousel | Valerio Virgillito | 2012-05-04 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | integrating the latest montage version | Valerio Virgillito | 2012-05-03 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Fixing the 3d stack for the youtube channel component. | Valerio Virgillito | 2012-04-20 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Fixing the flow component to layout all the tiles on first draw. | Valerio Virgillito | 2012-04-20 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Squashed commit of the following: | Valerio Virgillito | 2012-04-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 2054551bfb01a0f4ca2e138b9d724835462d45cd Merge: 765c2da 616a853 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Apr 18 13:48:21 2012 -0700 Merge branch 'refs/heads/master' into integration commit 765c2da8e1aa03550caf42b2bd5f367555ad2843 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 17 15:29:41 2012 -0700 updating the picasa carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406 Merge: d27f2df cacb4a2 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 17 15:03:50 2012 -0700 Merge branch 'refs/heads/master' into integration commit d27f2df4d846064444263d7832d213535962abe7 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Apr 11 10:39:36 2012 -0700 integrating new picasa carousel component Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 10 14:33:00 2012 -0700 fixed the text area case issue Text area was renamed from TextArea to Textarea Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 1e83e26652266136802bc7af930379c1ecd631a6 Author: Valerio Virgillito <valerio@motorola.com> Date: Mon Apr 9 22:10:45 2012 -0700 integrating montage v0.8 into ninja. Signed-off-by: Valerio Virgillito <valerio@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | removing some of the button properties | Valerio Virgillito | 2012-03-30 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | completing the component simple pi | Valerio Virgillito | 2012-03-30 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Removing properties from Montage components | Valerio Virgillito | 2012-03-28 |
| | | | | | | | | | | | Simplified properties for the following components: - anchor - button - checkbox - image - number imput Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Feed Reader - Change default to timer so it matches component | Eric Guzman | 2012-03-23 |
| | |||
* | Adding a select for the feed reader display mode | Valerio Virgillito | 2012-03-22 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | 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 | ||
* | | 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/FileIO-Montage-Components' into montage-integration | Valerio Virgillito | 2012-03-21 |
|\ \ | |||
| * | | Updating descriptor file | Jose Antonio Marquez | 2012-03-21 |
| | | | | | | | | | | | | Still an outstanding issue of assets loaded dynamically. | ||
| * | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' 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 |
|\| | | | |_|/ |/| | | |||
| * | | Tests and clean-up | Jose Antonio Marquez | 2012-03-18 |
| | | | |||
| * | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵ | Jose Antonio Marquez | 2012-03-18 |
| |\ \ | | | | | | | | | | | | | FileIO-Montage-Components | ||
| * | | | Temp I/O functionality for M-JS components | Jose Antonio Marquez | 2012-03-18 |
| | | | | | | | | | | | | | | | | Added the ability to save montages component serialization from Ninja. Very rough, but functional. | ||
* | | | | 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 |
|/ / / | |||
* | | | 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 |
| |\ \ \ | |||
| * | | | | 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 |
|/ / / | |||
* | | | Animation for the Feed reader | Kishore Subramanian | 2012-03-20 |
| | | | |||
* | | | Change Youtube channel transition to avoid rendering bug | Stuart Knightley | 2012-03-20 |
| | | |