Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-06-01 |
|\ | |||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-06-01 |
| |\ | |||
| * | | removing the search bar component | Valerio Virgillito | 2012-06-01 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Adding open draw to reel components | Jose Antonio Marquez | 2012-06-01 |
| | | | |||
* | | | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-06-01 |
|\ \ \ | | |/ | |/| | |||
| * | | Merge pull request #262 from joseeight/Document | Valerio Virgillito | 2012-06-01 |
| |\ \ | | |/ | |/| | Fixing webGL helper, setting up montage flag for clean up | ||
| | * | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-01 |
| | |\ | | |/ | |/| | |||
| | * | Fixing webGL helper | Jose Antonio Marquez | 2012-06-01 |
| | | | |||
| | * | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-05-31 |
| | |\ | |||
* | | | | Fixing feedread component | Jose Antonio Marquez | 2012-06-01 |
| | | | | |||
* | | | | Add logic to allow dynamic placement of canvas json file | Jose Antonio Marquez | 2012-06-01 |
| | | | | | | | | | | | | | | | | Save to and read from any path on disk (webGL/Canvas data only) | ||
* | | | | Map fixes | Jose Antonio Marquez | 2012-06-01 |
| | | | | |||
* | | | | Creating template mediator class | Jose Antonio Marquez | 2012-06-01 |
| | | | | | | | | | | | | | | | | This is to simplify code, more to be changed and added. | ||
* | | | | 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 |
|\| | | | |||
| * | | | updating the feed reader to enable serialization | Valerio Virgillito | 2012-05-31 |
| | |/ | |/| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-05-31 |
|\| | | |||
| * | | Merge pull request #261 from ericguzman/CSSPanelUpdates | Valerio Virgillito | 2012-05-31 |
| |\ \ | | | | | | | | | CSS Panel Toolbar - Prevent warning regarding undefined sourceObject | ||
| | * \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Eric Guzman | 2012-05-30 |
| | |\ \ | | | | | | | | | | | | | | | | CSSPanelUpdates | ||
| | * | | | CSS Panel Toolbar - Prevent warning regarding undefined sourceObject | Eric Guzman | 2012-05-30 |
| | | | | | |||
| | * | | | Merge branch 'dom-architecture' of ↵ | Eric Guzman | 2012-05-29 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates | ||
| | * | | | | CSS Panel - Handle focus after editing selector | Eric Guzman | 2012-05-29 |
| | | | | | | |||
| | * | | | | CSS Panel - Find correct previously-rendered rule list after selection. | Eric Guzman | 2012-05-29 |
| | | | | | | |||
| | * | | | | CSS Panel - Prevent Animation on New Style | Eric Guzman | 2012-05-27 |
| | | | | | | |||
* | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-05-31 |
|\| | | | | | |_|_|_|/ |/| | | | | |||
| * | | | | updating the google components serialization to enable saving | Valerio Virgillito | 2012-05-31 |
| | |_|/ | |/| | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | Fixing CSS overwrite issue | Jose Antonio Marquez | 2012-05-30 |
| | | | | |||
* | | | | Attempting to track clean nodes | Jose Antonio Marquez | 2012-05-30 |
| | | | | | | | | | | | | | | | | Need to figure out CSS overwrite issue <style> | ||
* | | | | Cleaning up | Jose Antonio Marquez | 2012-05-30 |
|/ / / | | | | | | | | | | Removing obsolete files. | ||
* | | | updating to version 0.6 | Valerio Virgillito | 2012-05-30 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Merge pull request #260 from joseeight/Document | Valerio Virgillito | 2012-05-30 |
|\ \ \ | |_|/ |/| | | Document | ||
| * | | Merge pull request #35 from aadsm/Document | Jose Antonio Marquez Russo | 2012-05-30 |
|/| | | | | | | | | Bug fixes to template creator | ||
| * | | 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 | ||
* | | Merge pull request #257 from joseeight/Document | Valerio Virgillito | 2012-05-28 |
|\ \ | | | | | | | Cleaning and tidying up. | ||
| * \ | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-28 |
| |\ \ | |/ / |/| | | |||
* | | | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-25 |
|\ \ \ | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
* | | | | fix for the id and class controls in the pi | Valerio Virgillito | 2012-05-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | the id and class did not set values from the pi because of the removals of all id's on element. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Cleaning up | Jose Antonio Marquez | 2012-05-27 |
| | | | | |||
| | * | | Cleaning up | Jose Antonio Marquez | 2012-05-27 |
| | | | | |||
| | * | | Cleaning up | Jose Antonio Marquez | 2012-05-27 |
| |/ / | |||
| * | | Merge pull request #256 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-24 |
|/| | | | | | | | | IKNinja-1621 - 3D stage does not reset correctly when the rotation point is set elsewhere on stage. | ||
| * | | IKNinja-1621 - 3D stage does not reset correctly when the rotation point is ↵ | Nivesh Rajbhandari | 2012-05-24 |
| | | | | | | | | | | | | | | | | | | set elsewhere on stage. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | Merge pull request #255 from joseeight/Document | Valerio Virgillito | 2012-05-24 |
|\ \ \ | | | | | | | | | Cleaning up referencing to documentRoot | ||
| * | | | Final clean up of render callback for design view | Jose Antonio Marquez | 2012-05-24 |
| | | | | |||
| * | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-24 |
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js | ||
* | | | | Merge pull request #254 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-24 |
|\ \ \ \ | | |/ / | |/| | | Updates to stage code for handling multiple document workflow. | ||
| * | | | Getter for _liveNodeList should return a copy. | Nivesh Rajbhandari | 2012-05-24 |
| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> |