| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-25 |
| |\ | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-25 |
| | |\ | |||
| | | * | Merge pull request #324 from mqg734/StageGuides | Valerio Virgillito | 2012-06-22 |
| | | |\ | | | | | | | | | Draw stage left and top references lines. Also fixed IKNinja-1720. | ||
| | | | * | IKNINJA-1720 - Object in a document erases 3D grid in other document when ↵ | Nivesh Rajbhandari | 2012-06-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | switching with document tabs. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-20 |
| | | |\| | |||
| | | | * | updating the components and descriptor.json to support montage v.11 | Valerio Virgillito | 2012-06-17 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-19 |
| | | |\| | |||
| | | * | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-12 |
| | | |\ \ | |||
| | | * | | | - removed extra selection change event, | Ananya Sen | 2012-06-11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - displace element after adding it to the document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | Binding View: Fixed If Selected Div Erroring Out | Armen Kesablyan | 2012-06-23 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | Removed Console Logs | Armen Kesablyan | 2012-06-23 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | Binding View - Hide when in code view | Eric Guzman | 2012-06-21 |
| | | | | | | |||
| * | | | | | Binding View :Requested Changes for Pull Request | Armen Kesablyan | 2012-06-21 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-21 |
| |\ \ \ \ \ | |||
| | * | | | | | Binding View: Hud Scroll Limit Is now 8 | Armen Kesablyan | 2012-06-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | | Binding HUD - CSS Update | Eric Guzman | 2012-06-21 |
| |/ / / / / | |||
| * | | | | | Binding-View : Polish state | Armen Kesablyan | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | Merge branch 'refs/heads/binding_eric' into binding | Armen Kesablyan | 2012-06-20 |
| |\ \ \ \ \ | |||
| | * | | | | | Binding HUD - Show hud for "off stage" objects in tray | Eric Guzman | 2012-06-20 |
| | | | | | | | |||
| | * | | | | | Objects Tray - Filter list of components for those without visual representation | Eric Guzman | 2012-06-20 |
| | | | | | | | |||
| | * | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-20 |
| | |\ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-20 |
| | |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-19 |
| | |\ \ \ \ \ \ \ | |||
| | * | | | | | | | | Objects Tray - Show only "off stage" objects | Eric Guzman | 2012-06-19 |
| | | | | | | | | | | |||
| * | | | | | | | | | binding-hud Scroll Up | Armen Kesablyan | 2012-06-20 |
| | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | | | | Binding View - Hover Scroll | Armen Kesablyan | 2012-06-20 |
| | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | | | 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> | ||
| * | | | | | | Binding View - Mouse Over Element Pop up Hud | Armen Kesablyan | 2012-06-19 |
| |/ / / / / | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | 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 |
| | |\ \ \ \ | |||