Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Update copyright boilerplate | Kris Kowal | 2012-07-06 |
| | |||
* | adding missing montage to the user library and temporary fix for picas ↵ | Valerio Virgillito | 2012-07-03 |
| | | | | | | screen trash Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | gh-329 Make Template Creator restore the elements after serialization | António Afonso | 2012-07-03 |
| | | | To create the serialization the element of each component needs to point to a new one, since the code was not restoring these elements the components were left in an undefined state. | ||
* | Fix for the youtube component close button on windows | Valerio Virgillito | 2012-06-28 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | including the map icons inside the component and adding the empty category | Valerio Virgillito | 2012-06-26 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | fix for the youtube giving an error when having less than 3 images | Valerio Virgillito | 2012-06-26 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Reverting binding.js | Armen Kesablyan | 2012-06-26 |
| | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | Can bind Multiple instance | Armen Kesablyan | 2012-06-25 |
| | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-25 |
|\ | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | fixing the size of the picasa images | Valerio Virgillito | 2012-06-22 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Fixed issue with Youtube not updating after save and Picasa bacground | Valerio Virgillito | 2012-06-21 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Text Tool Fix - Can Not Switch Document when Text Tool Initialized | Armen Kesablyan | 2012-06-23 |
| | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | Binding View :Requested Changes for Pull Request | Armen Kesablyan | 2012-06-21 |
| | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-20 |
|\| | | | | | | | | | | | | | Conflicts: node_modules/montage/ui/application.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | fixing the components. | Valerio Virgillito | 2012-06-18 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | updating the components and descriptor.json to support montage v.11 | Valerio Virgillito | 2012-06-17 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | montage v11 merge into ninja | Valerio Virgillito | 2012-06-17 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-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 fix | Valerio Virgillito | 2012-06-14 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | disabling the warnings | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | fixing the feed reader | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | fix for the the components not rendering and not selecting | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-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 montage | Valerio Virgillito | 2012-06-05 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-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/Components | Valerio Virgillito | 2012-06-05 |
| |\ \ | | | | | | | | | Saving Google Components (reel components) | ||
| | * | | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-06-01 |
| | |\| | |||
| | * | | Fixing feedread component | Jose Antonio Marquez | 2012-06-01 |
| | | | | |||
| | * | | Map fixes | Jose Antonio Marquez | 2012-06-01 |
| | | | | |||
| | * | | Fixing Google Map component | Jose Antonio Marquez | 2012-06-01 |
| | | | | | | | | | | | | | | | | Pulled in from components branch. | ||
| | * | | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-06-01 |
| | |\ \ | |||
| | * \ \ | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-05-31 |
| | |\ \ \ | |||
| * | | | | | components fix: adding a first draw event to components | Valerio Virgillito | 2012-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-internal | Valerio Virgillito | 2012-06-01 |
| |\ \ \ \ | |||
| | * \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-01 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||
| | * | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-05-31 |
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| | |||
| | * | | | Attempting to track clean nodes | Jose Antonio Marquez | 2012-05-30 |
| | | | | | | | | | | | | | | | | | | | | Need to figure out CSS overwrite issue <style> | ||
| * | | | | removing the search bar component | Valerio Virgillito | 2012-06-01 |
| | |_|/ | |/| | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | updating the feed reader to enable serialization | Valerio Virgillito | 2012-05-31 |
| | |/ | |/| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | updating the google components serialization to enable saving | Valerio Virgillito | 2012-05-31 |
| |/ | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Object Controller | Armen Kesablyan | 2012-06-06 |
| | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | Manually Add Fix for Montage serialization problem | Eric Guzman | 2012-06-01 |
| | | |||
* | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-05-31 |
|\ \ | |||
| * | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-05-30 |
| |\| | |||
| | * | Initialize an internal Template variable in TemplateCreator | António Afonso | 2012-05-30 |
| | | | |||
| | * | Stop serializing the child components of the top components are not serialized | António Afonso | 2012-05-30 |
| | | | | | | | | | We just removed them before serializing and add them again afterwards. | ||
| | * | Stop adding ids to elements in template creator | António Afonso | 2012-05-30 |
| | | | | | | | | | | | | This is the fix for Motorola-Mobility/montage#648 | ||
| | * | Avoid duplicate labels in template creator | António Afonso | 2012-05-30 |
| | | | | | | | | | This is the fix for Motorola-Mobility/montage#649 | ||
* | | | 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> |