aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | | | | | | | | | | | | fix for the document tab close button and rulers on initial documentValerio Virgillito2012-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/dom-architecture' into document-bindings-fixValerio Virgillito2012-05-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | document bindings phase 1Valerio Virgillito2012-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-06-01
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge pull request #262 from joseeight/DocumentValerio Virgillito2012-06-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | Fixing webGL helper, setting up montage flag for clean up
| | | * | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-01
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Fixing webGL helperJose Antonio Marquez2012-06-01
| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-31
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / / / | | | | |/| | | | | | / / / / / / / | | | | |_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fixing CSS overwrite issueJose Antonio Marquez2012-05-30
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Attempting to track clean nodesJose Antonio Marquez2012-05-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to figure out CSS overwrite issue <style>
| | | * | | | | | | | | | | | | | Cleaning upJose Antonio Marquez2012-05-30
| | | | |_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing obsolete files.
| * | / | | | | | | | | | | | | 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>
| * | | | | | | | | | | | | Merge pull request #261 from ericguzman/CSSPanelUpdatesValerio Virgillito2012-05-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | CSS Panel Toolbar - Prevent warning regarding undefined sourceObject
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Eric Guzman2012-05-30
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSSPanelUpdates
| | * | | | | | | | | | | | CSS Panel Toolbar - Prevent warning regarding undefined sourceObjectEric Guzman2012-05-30
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
| | * | | | | | | | | | | | CSS Panel - Handle focus after editing selectorEric Guzman2012-05-29
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | CSS Panel - Find correct previously-rendered rule list after selection.Eric Guzman2012-05-29
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | CSS Panel - Prevent Animation on New StyleEric Guzman2012-05-27
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | updating the google components serialization to enable savingValerio Virgillito2012-05-31
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | | | cut/paste html elements in single documentAnanya Sen2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-05-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/styles-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | | | updating to version 0.6Valerio Virgillito2012-05-30
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |