Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/ninja-internal' into ToolOptions | Nivesh Rajbhandari | 2012-06-05 |
|\ | |||
| * | Merge pull request #266 from mencio/element-model-fixes | Valerio Virgillito | 2012-06-05 |
| |\ | | | | | | | components fix: adding a first draw event to components | ||
| | * | 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 pull request #265 from jreid01/pull-request | Valerio Virgillito | 2012-06-05 |
| |\ \ | | |/ | |/| | Timeline: Fixes to timeline to handle document switching & breadcrumb interactions | ||
| | * | Timeline: Fix line endings, set to UNIX. | Jon Reid | 2012-06-05 |
| | | | |||
| | * | Timeline: Fixes to timeline to handle document switching & breadcrumb | Jon Reid | 2012-06-04 |
| |/ | | | | | | | interactions under new DOM Architecture. | ||
* | | Updated ink bottle tool to support color-chip's checkbox and undo/redo for ↵ | Nivesh Rajbhandari | 2012-06-05 |
| | | | | | | | | | | | | strokes/borders. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Fill and Ink-Bottle fixes. | Nivesh Rajbhandari | 2012-06-04 |
|/ | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Merge pull request #264 from mencio/document-bindings-fix | Valerio Virgillito | 2012-06-04 |
|\ | | | | | Document bindings fix - Changing the documents architecture to use bindings instead of events | ||
| * | fix for the css panel | Valerio Virgillito | 2012-06-01 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | 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 #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 | ||
| * | | | | 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 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal ↵ | Valerio Virgillito | 2012-05-30 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | into document-bindings-fix | ||
| | * \ \ \ | Merge pull request #3 from mqg734/dom-architecture-pentool | Valerio Virgillito | 2012-05-30 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Fixed bad reference to stage from pen tool. | ||
| | | * | | | | PI's 3d section was not binding correctly to the current document. | Nivesh Rajbhandari | 2012-05-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | Fixed bad reference to stage element in pen tool. | Nivesh Rajbhandari | 2012-05-30 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * / / / / | fixing the timeline current document bindings | Valerio Virgillito | 2012-05-30 |
| |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | Merge branch 'refs/heads/dom-architecture' into document-bindings-fix | Valerio Virgillito | 2012-05-30 |
| |\ \ \ \ |