| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 branch 'refs/heads/master' into element-model-fixes | Valerio Virgillito | 2012-06-06 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | Merge pull request #272 from pushkarjoshi/pentool | Valerio Virgillito | 2012-06-06 |
| | | | |\ | | | | | | | | | | | Pentool | ||
| | | | | * | Merge branch 'master' into pentool | Pushkar Joshi | 2012-06-04 |
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js | ||
| | | | | * \ | Merge branch 'master' into pentool | Pushkar Joshi | 2012-05-31 |
| | | | | |\ \ | |||
| | | | | * | | | More consistent local and global mouse coords which solves a bug with the ↵ | Pushkar Joshi | 2012-05-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pen minus subtool not removing 1 anchor paths | ||
| | | | | * | | | allow changes in the pen subtool in options to be seen by the pen tool code ↵ | Pushkar Joshi | 2012-05-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (can now select the pen plus, pen minus subtools) AND add keyboard shortcut for brush tool | ||
| | | * | | | | | Merge branch 'refs/heads/master' into element-model-fixes | Valerio Virgillito | 2012-06-05 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/mediators/element-mediator.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | | Fill and Ink-Bottle fixes. | Nivesh Rajbhandari | 2012-06-04 |
| | | | | |_|/ | | | |/| | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * / | | | cleanup and making the webgl-helper only loop canvas on file save | Valerio Virgillito | 2012-06-05 |
| | | |/ / / | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * / / / | Initial Text Tool Changes | Armen Kesablyan | 2012-06-05 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@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> | ||
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Valerio Virgillito | 2012-05-31 |
| | |\ \ \ | | | |/ | | |/| | | | | | document-bindings-fix | ||
| | | * | | CSS Panel Toolbar - Prevent warning regarding undefined sourceObject | Eric Guzman | 2012-05-30 |
| | | | | | |||
| | * | | | fixing the close and save | Valerio Virgillito | 2012-05-31 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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> | ||
| | * | | | cleanup and handling the document views in the document controller for now. | 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> | ||
| * | | | Hintable - Array type check fix for arrays created with map() method. | Eric Guzman | 2012-06-10 |
| | | | | |||
| * | | | 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 | ||
| | | * | | adding document views checks for the timeline and breadcrumb | Valerio Virgillito | 2012-05-23 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Cleaning up referencing to 'documentRoot' and '_document' | Jose Antonio Marquez | 2012-05-24 |
| | |/ / | | | | | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view. | ||
| * | | | Merge branch 'refs/heads/dom-architecture' into binding | Armen Kesablyan | 2012-05-23 |
| |\| | | | | | | | | | | | | | | | | | | | | Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | CSS Panel - Update components to use new serialization format | Eric Guzman | 2012-05-22 |
| | | | | |||
| | * | | CSS Style Component - Moved unit identification to local change handler ↵ | Eric Guzman | 2012-05-21 |
| | | | | | | | | | | | | | instead of delegate | ||
| | * | | CSS Panel - Allow ":" to be used in selector field | Eric Guzman | 2012-05-21 |
| | | | | |||
| | * | | Style sheets view - Fixed drawing of toolbar and "no sheets" message | Eric Guzman | 2012-05-21 |
| | | | | |||
| | * | | Merge branch 'dom-architecture' of ↵ | Eric Guzman | 2012-05-18 |
| | |\ \ | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates | ||
| | | * \ | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-18 |
| | | |\ \ | |||
| | | | * | | fixing the color chip for the document root | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | Fixing radio control in the PI. | Nivesh Rajbhandari | 2012-05-18 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | Fixed Materials Popup to work with new changes to repetition bindings. | Nivesh Rajbhandari | 2012-05-18 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | File Input control in materials panel was not working because of the change ↵ | Nivesh Rajbhandari | 2012-05-18 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | from id to data-montage-id. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | fixed the shape subtool not refreshing the icon | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | enabling basic document switching | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Editable - Trigger change event after stop event | Eric Guzman | 2012-05-17 |
| | | | | | |||
| | * | | | Merge branch 'dom-architecture' of ↵ | Eric Guzman | 2012-05-17 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates Conflicts: js/document/templates/montage-html/default_html.css js/lib/NJUtils.js | ||
| | | * | | Removed unneeded identifier. | Nivesh Rajbhandari | 2012-05-17 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-17 |
| | | |\ \ | |||
| | | * | | | Fixed border radius hot-text linking that was broken by update to montage v.10. | Nivesh Rajbhandari | 2012-05-17 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-17 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||
| | * | | | | Editable - remove formatting on paste | Eric Guzman | 2012-05-17 |
| | | | | | | |||
| | * | | | | CSS Panel - Fix errors from new Montage and remove logs. | Eric Guzman | 2012-05-10 |
| | | | | | | |||
| | * | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-10 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | ||
| | * | | | | | Panel Toolbar - Support hiding and showing of buttons | Eric Guzman | 2012-05-03 |
| | | | | | | | |||
| | * | | | | | CSS Panel - Add focus management to styles view delegate | Eric Guzman | 2012-05-02 |
| | | | | | | | |||