aboutsummaryrefslogtreecommitdiff
path: root/node_modules
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-25
|\
| * fixing the size of the picasa imagesValerio Virgillito2012-06-22
| * Fixed issue with Youtube not updating after save and Picasa bacgroundValerio Virgillito2012-06-21
* | Text Tool Fix - Can Not Switch Document when Text Tool InitializedArmen Kesablyan2012-06-23
* | Binding View :Requested Changes for Pull RequestArmen Kesablyan2012-06-21
* | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
|\|
| * fixing the components.Valerio Virgillito2012-06-18
| * updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
| * montage v11 merge into ninjaValerio Virgillito2012-06-17
* | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
|\|
| * merging Stuart youtube fixValerio Virgillito2012-06-14
| * disabling the warningsValerio Virgillito2012-06-12
| * fixing the feed readerValerio Virgillito2012-06-12
| * fix for the the components not rendering and not selectingValerio Virgillito2012-06-12
| * Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-06
| |\
| * | adding the latest v0.10 montageValerio Virgillito2012-06-05
* | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-11
|\ \ \ | | |/ | |/|
| * | Merge pull request #263 from joseeight/ComponentsValerio Virgillito2012-06-05
| |\ \
| | * | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-01
| | |\|
| | * | Fixing feedread componentJose Antonio Marquez2012-06-01
| | * | Map fixesJose Antonio Marquez2012-06-01
| | * | Fixing Google Map componentJose Antonio Marquez2012-06-01
| | * | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-01
| | |\ \
| | * \ \ Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-05-31
| | |\ \ \
| * | | | | components fix: adding a first draw event to componentsValerio Virgillito2012-06-04
| | |_|_|/ | |/| | |
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-06-01
| |\ \ \ \
| | * \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-01
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-31
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/|
| | * | | Attempting to track clean nodesJose Antonio Marquez2012-05-30
| * | | | removing the search bar componentValerio Virgillito2012-06-01
| | |_|/ | |/| |
| * | | updating the feed reader to enable serializationValerio Virgillito2012-05-31
| | |/ | |/|
| * | updating the google components serialization to enable savingValerio Virgillito2012-05-31
| |/
* | Object ControllerArmen Kesablyan2012-06-06
* | Manually Add Fix for Montage serialization problemEric Guzman2012-06-01
* | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-05-31
|\ \
| * | 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
| | * Stop adding ids to elements in template creatorAntónio Afonso2012-05-30
| | * Avoid duplicate labels in template creatorAntónio Afonso2012-05-30
* | | Data Binding - Hacked patch to Montage to enable serialization of dynamically...Eric Guzman2012-05-25
|/ /
* | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-17
|\|
| * montage v.0.10 integrationValerio Virgillito2012-05-16
| * Fixing preview bugJose Antonio Marquez2012-05-16
| * Squashed master into dom-architectureValerio Virgillito2012-05-16
* | Objects Panel - Add Objects controller and montage/application hack to expose...Eric Guzman2012-05-16
* | Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-interna...Armen Kesablyan2012-05-15
|\|
| * Preliminary Montage Template CleanupJose Antonio Marquez2012-05-09
* | Squashed commit of google-components into masterValerio Virgillito2012-05-09
|/
* reverting to v0.8 flow component for the picasa carouselValerio Virgillito2012-05-04