Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal ↵ | Valerio Virgillito | 2012-06-01 |
|\ | | | | | | | into document-bindings-fix | ||
| * | Merge pull request #8 from mqg734/dom-architecture-pentool | Valerio Virgillito | 2012-06-01 |
| |\ | | | | | | | IKNinja-1610 and IKNinja-1647 - Can't use transform tool if you haven't used a drawing tool yet. | ||
| | * | IKNinja-1610 and IKNinja-1647 - Can't use transform tool if you haven't used ↵ | Nivesh Rajbhandari | 2012-06-01 |
| | | | | | | | | | | | | | | | | | | a drawing tool yet. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | fixing some selection container changes and the breadcrumb not drawing initially | Valerio Virgillito | 2012-06-01 |
|/ / | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Merge branch 'refs/heads/master' into document-bindings-fix | Valerio Virgillito | 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 |
| | |\ \ | | |/ / | |/| | | |||
| * | | | updating the feed reader to enable serialization | Valerio Virgillito | 2012-05-31 |
| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Fixing webGL helper | Jose Antonio Marquez | 2012-06-01 |
| | | | | |||
| | * | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-05-31 |
| | |\ \ | | |/ / | |/| | | |||
| | * | | 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. | ||
* | | | | Merge pull request #7 from mqg734/dom-architecture-pentool | Valerio Virgillito | 2012-06-01 |
|\ \ \ \ | | |_|/ | |/| | | Fixed stage's styles not getting initialized correctly and stage rotating too fast. | ||
| * | | | Merge branch 'refs/heads/valerio-document-bindings-fix' into ↵ | Nivesh Rajbhandari | 2012-06-01 |
| |\ \ \ | |/ / / |/| | | | | | | | document-bindings-fix | ||
* | | | | Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal ↵ | Valerio Virgillito | 2012-06-01 |
|\ \ \ \ | | | | | | | | | | | | | | | | into document-bindings-fix | ||
| * \ \ \ | Merge pull request #6 from mqg734/dom-architecture-pentool | Valerio Virgillito | 2012-06-01 |
| |\ \ \ \ | | | | | | | | | | | | | We were not saving all the necessary styles for the body. | ||
* | | | | | | fixing the document closing when the first document is closed. | Valerio Virgillito | 2012-06-01 |
|/ / / / / | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | IKNinja-1609 - Stage rotates too fast when closing and re-opening file or ↵ | Nivesh Rajbhandari | 2012-06-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switching between files. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Moving styles controller higher in ninja's serialization so its bindings ↵ | Nivesh Rajbhandari | 2012-06-01 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | will get triggered before stage's bindings. This should fix the stage's styles not getting initialized correctly. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Merge branch 'refs/heads/valerio-document-bindings-fix' into ↵ | Nivesh Rajbhandari | 2012-06-01 |
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | document-bindings-fix Conflicts: js/stage/stage.reel/stage.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | | fixed the 3d grid when switching documents and some cleanup | Valerio Virgillito | 2012-06-01 |
| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | making the document bar handle the current document to hide/show itself | Valerio Virgillito | 2012-06-01 |
| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | fixing the code editor, closing documents and cleanup of the stage | Valerio Virgillito | 2012-06-01 |
| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | Merge pull request #5 from mqg734/dom-architecture-pentool | Valerio Virgillito | 2012-05-31 |
|\ \ \ \ | | | | | | | | | | | Fixing stage's scroll offsets when switching between documents. | ||
* | | | | | removing the stage view component as it is not used anymore | Valerio Virgillito | 2012-05-31 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | SnapManager.setupDragPlaneFromPlane must happen after StylesController has ↵ | Nivesh Rajbhandari | 2012-06-01 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | finished initializeRootStyles. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Fixing scroll offsets when switching between documents. | Nivesh Rajbhandari | 2012-05-31 |
| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Removing unused scroll model save/restore. | Nivesh Rajbhandari | 2012-05-31 |
|/ / / | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | fixing the switching between various types of documents | Valerio Virgillito | 2012-05-31 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | removing the last closeDocument handler | Valerio Virgillito | 2012-05-31 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Merge pull request #4 from mqg734/dom-architecture-pentool | Valerio Virgillito | 2012-05-31 |
|\ \ \ | | | | | | | | | Adding back the stage references in the 3d classes and fixing styles lookup for the stage. | ||
| * | | | Adding back the stage references in the 3d classes. | Nivesh Rajbhandari | 2012-05-31 |
| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Removed temporary hack to support stage styles. | Nivesh Rajbhandari | 2012-05-31 |
| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Valerio Virgillito | 2012-05-31 |
|\ \ \ \ | | |/ / | |/| | | | | | | document-bindings-fix | ||
| * | | | 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 |
| | | | | | | |||
| * | | | | | updating the google components serialization to enable saving | Valerio Virgillito | 2012-05-31 |
| | |_|/ / | |/| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | | fixing the close and save | Valerio Virgillito | 2012-05-31 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | | fixing selection when switching documents | Valerio Virgillito | 2012-05-31 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | | cleanup item | Valerio Virgillito | 2012-05-31 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | | cleanup items | Valerio Virgillito | 2012-05-31 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | | fixing the closing of documents | Valerio Virgillito | 2012-05-30 |
| |_|_|/ |/| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | opening code view documents | Valerio Virgillito | 2012-05-30 |
| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | Merge branch 'refs/heads/master' into document-bindings-fix | Valerio Virgillito | 2012-05-30 |
|\| | | |