| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/master' into montage-v11-integration | Valerio Virgillito | 2012-06-18 |
| |\ | |||
| | * | Cleaning reel | Jose Antonio Marquez | 2012-06-17 |
| | | | |||
| | * | Cleaning up element references | Jose Antonio Marquez | 2012-06-17 |
| | | | |||
| | * | Tidying up color bar | Jose Antonio Marquez | 2012-06-17 |
| | | | |||
| * | | updating the components and descriptor.json to support montage v.11 | Valerio Virgillito | 2012-06-17 |
| |/ | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Fix: IKNINJA-1187 | Jose Antonio Marquez | 2012-06-13 |
| | | | | | Clean up and fixing masking of color wheel. | ||
| * | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-13 |
| |\ | |||
| | * | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes | Nivesh Rajbhandari | 2012-06-13 |
| | |\ | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-13 |
| | | |\ | |||
| | | * | | fixed document switching issues | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | adding more missing properties to the serialization | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | adding more missing properties | Valerio Virgillito | 2012-06-11 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | adding more missing properties | Valerio Virgillito | 2012-06-11 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | removing serializable to the tree and adding a few more missing properties | Valerio Virgillito | 2012-06-11 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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> | ||
| | | * \ \ | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-06 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js 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> | ||
| | * | | | | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes | Nivesh Rajbhandari | 2012-06-13 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||
| | * | | | | | Fixing properties panel to support px and % for body and other elements. | Nivesh Rajbhandari | 2012-06-12 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | Cleaning up color wheel component | Jose Antonio Marquez | 2012-06-13 |
| | |/ / / |/| | | | | | | | | | | | Minor code clean up and refactoring. | ||
| * | | | | Merge branch 'refs/heads/Ninja-Internal' into TempPromptUI | Jose Antonio Marquez | 2012-06-12 |
| |\| | | | |||
| | * | | | 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> | ||
| * | | | | Adding temp prompt UI component | Jose Antonio Marquez | 2012-06-11 |
| |/ / / | | | | | | | | | | Added a temp prompt component and added on before close logic to ensure user does not lose data if the file needs saving when they close. | ||
| * | | | 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> | ||
| * | | | 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> | ||
| * | | 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. | ||
| * | | 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 |
| | |\ \ | |||