Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Put Objects in front of Huds | Armen Kesablyan | 2012-06-15 |
| | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding | Armen Kesablyan | 2012-06-15 |
|\ | |||
| * | Objects Tray - Add objects tray to binding view | Eric Guzman | 2012-06-15 |
| | | |||
* | | Binding Hud: Calling Option Selection to view | Armen Kesablyan | 2012-06-15 |
|/ | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | Binding-Huds draw to component | Armen Kesablyan | 2012-06-14 |
| | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | Merge pull request #12 from ericguzman/binding | Armen Kesablyan | 2012-06-13 |
|\ | | | | | Binding Panel update | ||
| * | Binding View - Use same icon component as objects panel | Eric Guzman | 2012-06-12 |
| | | |||
* | | Binding-View: Translate huds | Armen Kesablyan | 2012-06-13 |
|/ | | | | Signed-off-by: Armen Kesablyan <armen@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 branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-11 |
| |\ | |||
| | * | Merge pull request #274 from ananyasen/bugfix-master | Valerio Virgillito | 2012-06-06 |
| | |\ | | | | | | | | | Bugfix master | ||
| | | * | IKNINJA-1662 - fixed js error while resizing brewing in code view | Ananya Sen | 2012-06-05 |
| | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | handle switching between multiple documents for Pen tool by having its own ↵ | Pushkar Joshi | 2012-06-05 |
| | |/ | | | | | | | | | | selection change handler | ||
| * / | Initial Text Tool Changes | Armen Kesablyan | 2012-06-05 |
| |/ | | | | | | | Signed-off-by: Armen Kesablyan <armen@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> | ||
| | * | 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> | ||
| * | Adding back the stage references in the 3d classes. | Nivesh Rajbhandari | 2012-05-31 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | remove current document binding from the stage deps | Valerio Virgillito | 2012-05-30 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge branch 'Dom-Architecture' of github.com:mqg734/ninja-internal into ↵ | Valerio Virgillito | 2012-05-30 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | document-bindings-fix Conflicts: js/stage/stage-deps.js js/stage/stage.reel/stage.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Fix for snap-align not working correctly after resizing the stage. | Nivesh Rajbhandari | 2012-05-30 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Fixed bug with scrolling too much when moving objects in negative space. | Nivesh Rajbhandari | 2012-05-29 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Moving layout and stageDeps' handleOpenDocument into stage. | Nivesh Rajbhandari | 2012-05-29 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Sped up user-interaction by moving grid drawing into its own canvas so the ↵ | Nivesh Rajbhandari | 2012-05-29 |
| | | | | | | | | | | | | | | | | | | layout code doesn't have to be run when modifying selected elements. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Don't loop through layout drawing code if layout view is off. | Nivesh Rajbhandari | 2012-05-24 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Fixing the close document. | Valerio Virgillito | 2012-05-30 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | fixing the menu bindings and some cleanup of the stage | Valerio Virgillito | 2012-05-29 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | fix for the document tab close button and rulers on initial document | Valerio Virgillito | 2012-05-29 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | document bindings phase 1 | Valerio Virgillito | 2012-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> | ||
* | | Binding-View : Deselect Works Now, Rendering multiple Huds Available | Armen Kesablyan | 2012-06-11 |
| | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | Render Hud Multiple | Armen Kesablyan | 2012-06-08 |
| | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | Changes to Binding View | Armen Kesablyan | 2012-06-07 |
| | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | Object Controller | Armen Kesablyan | 2012-06-06 |
| | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | Changes for binding View | Armen Kesablyan | 2012-06-05 |
| | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | binding canvas | Armen Kesablyan | 2012-06-02 |
| | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | Binding View Canvas Initial Development | Armen Kesablyan | 2012-06-01 |
| | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | Visual Bindings Initial generate from Array. | Armen Kesablyan | 2012-05-30 |
| | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | Merge branch 'refs/heads/dom-architecture' into binding | Armen Kesablyan | 2012-05-25 |
|\| | |||
| * | 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 | ||
| | * | Removed unused variables and methods in stage-deps, layout design, and ↵ | Nivesh Rajbhandari | 2012-05-24 |
| | | | | | | | | | | | | | | | | | | snap-manager. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Fixed selection bug when switching/opening documents. Also, use saved scroll ↵ | Nivesh Rajbhandari | 2012-05-24 |
| | | | | | | | | | | | | | | | | | | values when switching between documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Update stage to handle switching between documents. | Nivesh Rajbhandari | 2012-05-24 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> |