| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-20 |
| |\ | |||
| | * | Binding View - Hover Scroll | Armen Kesablyan | 2012-06-20 |
| | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-20 |
| |\| | |||
| | * | Showing Bound Items in hud | Armen Kesablyan | 2012-06-19 |
| | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | Binding View - Added Line cap in drawing line & Fixed bug to not pop up on ↵ | Armen Kesablyan | 2012-06-19 |
| | | | | | | | | | | | | | current component Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-19 |
| |\| | |||
| | * | Binding View - Mouse Over Element Pop up Hud | Armen Kesablyan | 2012-06-19 |
| | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | Objects Tray - Show only "off stage" objects | Eric Guzman | 2012-06-19 |
| |/ | |||
| * | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-19 |
| |\ | | | | | | | | | Conflicts: js/stage/binding-view.reel/binding-view.js | ||
| | * | Bug: Text Tool Breaking canvas space. | Armen Kesablyan | 2012-06-19 |
| | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-19 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-19 |
| | | |\ | |||
| | | | * | IKNinja-1710 - Boundary box is drawn offset when switching between docs. ↵ | Nivesh Rajbhandari | 2012-06-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This issue is related to move object to negative space. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-11 |
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | | * | removing console log | Valerio Virgillito | 2012-06-11 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | | * | rewrite: currentSelectedContainer -> domContainer | Valerio Virgillito | 2012-06-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | first iteration of adding serializable to ninja plus other changes to run ↵ | Valerio Virgillito | 2012-06-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Binding-View: Visual Bind Item Working | Armen Kesablyan | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | Binding Hud CSS Change | Eric Guzman | 2012-06-19 |
| |/ / / / | |||
| * | | | | Latest Changes Visual Binding Starting | Armen Kesablyan | 2012-06-18 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding | Armen Kesablyan | 2012-06-18 |
| |\ \ \ \ | |||
| | * | | | | Objects Tray - Move back to binding view | Eric Guzman | 2012-06-18 |
| | | | | | | |||
| | * | | | | Binding - Show tray when there are objects. Edit binding view css update. | Eric Guzman | 2012-06-18 |
| | | | | | | |||
| | * | | | | Objects Tray - Moved to stage object from binding view | Eric Guzman | 2012-06-15 |
| | | | | | | |||
| * | | | | | Binding - Drop Locate connector | Armen Kesablyan | 2012-06-18 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | Binding View - validate over huds | Armen Kesablyan | 2012-06-18 |
| |/ / / / | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-15 |
| |\ \ \ \ | |||
| | * | | | | 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 |
| | |\ \ \ \ | |||
| | * | | | | | Binding Hud: Calling Option Selection to view | Armen Kesablyan | 2012-06-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | | Objects Tray - Add hiding based on workspace mode. | Eric Guzman | 2012-06-15 |
| | |/ / / / |/| | | | | |||
| * | | | | | Objects Tray - Add objects tray to binding view | Eric Guzman | 2012-06-15 |
| |/ / / / | |||
| * | | | | 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> | ||