aboutsummaryrefslogtreecommitdiff
path: root/node_modules
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-05-30
|\
| * Initialize an internal Template variable in TemplateCreatorAntónio Afonso2012-05-30
| |
| * Stop serializing the child components of the top components are not serializedAntónio Afonso2012-05-30
| | | | | | We just removed them before serializing and add them again afterwards.
| * Stop adding ids to elements in template creatorAntónio Afonso2012-05-30
| | | | | | | | This is the fix for Motorola-Mobility/montage#648
| * Avoid duplicate labels in template creatorAntónio Afonso2012-05-30
| | | | | | This is the fix for Motorola-Mobility/montage#649
* | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-17
|\| | | | | | | | | | | | | | | Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * montage v.0.10 integrationValerio Virgillito2012-05-16
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Fixing preview bugJose Antonio Marquez2012-05-16
| | | | | | | | Also setting up for Montage component serialization.
| * Squashed master into dom-architectureValerio Virgillito2012-05-16
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Objects Panel - Add Objects controller and montage/application hack to ↵Eric Guzman2012-05-16
| | | | | | | | expose template
* | Merge branch 'dom-architecture' of ↵Armen Kesablyan2012-05-15
|\| | | | | | | github.com:Motorola-Mobility/ninja-internal into binding
| * Preliminary Montage Template CleanupJose Antonio Marquez2012-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 masterValerio Virgillito2012-05-09
|/ | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* reverting to v0.8 flow component for the picasa carouselValerio Virgillito2012-05-04
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* integrating the latest montage versionValerio Virgillito2012-05-03
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Fixing the 3d stack for the youtube channel component.Valerio Virgillito2012-04-20
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Fixing the flow component to layout all the tiles on first draw.Valerio Virgillito2012-04-20
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Squashed commit of the following:Valerio Virgillito2012-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 propertiesValerio Virgillito2012-03-30
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* completing the component simple piValerio Virgillito2012-03-30
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Removing properties from Montage componentsValerio Virgillito2012-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 componentEric Guzman2012-03-23
|
* Adding a select for the feed reader display modeValerio Virgillito2012-03-22
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* 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
* | Removing the gradient background in the picasa carouselValerio Virgillito2012-03-21
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integrationValerio Virgillito2012-03-21
|\ \
| * | Updating descriptor fileJose Antonio Marquez2012-03-21
| | | | | | | | | | | | Still an outstanding issue of assets loaded dynamically.
| * | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵Jose Antonio Marquez2012-03-21
| |\ \ | | | | | | | | | | | | FileIO-Montage-Components
* | | | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integrationValerio Virgillito2012-03-21
|\| | | | |_|/ |/| |
| * | Tests and clean-upJose Antonio Marquez2012-03-18
| | |
| * | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵Jose Antonio Marquez2012-03-18
| |\ \ | | | | | | | | | | | | FileIO-Montage-Components
| * | | Temp I/O functionality for M-JS componentsJose Antonio Marquez2012-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 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
|/ / /
* | | Initializing carousel in middle positionFrançois Frisch2012-03-20
| | |
* | | changing the RSS reader default sized and padding.Valerio Virgillito2012-03-20
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Eric Guzman2012-03-20
|\ \ \ | | | | | | | | | | | | FeedReaderAnimation
| * \ \ Merge branch 'master' of github.com:francoisfrisch/ninja-internalValerio Virgillito2012-03-20
| |\ \ \
| * | | | Removing the youtube channel video black backgroundValerio Virgillito2012-03-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Feed Reader - Fix reference closure'd "this"Eric Guzman2012-03-20
| |/ / / |/| | |
* | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Eric Guzman2012-03-20
|\| | | | | | | | | | | | | | | FeedReaderAnimation
| * | | Merge branch 'master' of github.com:francoisfrisch/ninja-internalValerio Virgillito2012-03-20
| |\ \ \
| * | | | giving the feed reader a default size when emptyValerio Virgillito2012-03-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Feed Reader - change default display mode to "timer"Eric Guzman2012-03-20
| | | | |
* | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internalEric Guzman2012-03-20
|\ \ \ \ \ | | |/ / / | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 01:40:02 +0000