aboutsummaryrefslogtreecommitdiff
path: root/node_modules
Commit message (Collapse)AuthorAge
* Text Tool Fix - Can Not Switch Document when Text Tool InitializedArmen Kesablyan2012-06-23
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Binding View :Requested Changes for Pull RequestArmen Kesablyan2012-06-21
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
|\ | | | | | | | | | | | | Conflicts: node_modules/montage/ui/application.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * fixing the components.Valerio Virgillito2012-06-18
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * montage v11 merge into ninjaValerio Virgillito2012-06-17
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * merging Stuart youtube fixValerio Virgillito2012-06-14
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * disabling the warningsValerio Virgillito2012-06-12
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixing the feed readerValerio Virgillito2012-06-12
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fix for the the components not rendering and not selectingValerio Virgillito2012-06-12
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-06
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | adding the latest v0.10 montageValerio Virgillito2012-06-05
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-11
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | Merge pull request #263 from joseeight/ComponentsValerio Virgillito2012-06-05
| |\ \ | | | | | | | | Saving Google Components (reel components)
| | * | 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
| | | | | | | | | | | | | | | | Pulled in from components branch.
| | * | 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
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Adding a first draw allows the component to have the right element so that ninja can use it's controller to get the component instance Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Need to figure out CSS overwrite issue <style>
| * | | | removing the search bar componentValerio Virgillito2012-06-01
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | updating the feed reader to enable serializationValerio Virgillito2012-05-31
| | |/ | |/| | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | updating the google components serialization to enable savingValerio Virgillito2012-05-31
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Object ControllerArmen Kesablyan2012-06-06
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | 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
| | | | | | | | | 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
* | | Data Binding - Hacked patch to Montage to enable serialization of ↵Eric Guzman2012-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 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 12:41:30 +0000