| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 |
| |\ | |||
| | * | Merge pull request #317 from joseeight/Color | Valerio Virgillito | 2012-06-20 |
| | |\ | | | | | | | Color | ||
| | | * | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-20 |
| | | |\ | |||
| | | * | | Fixes: IKNINJA-1448 | Jose Antonio Marquez | 2012-06-20 |
| | | | | | | | | | | | | | | | | | Improving logic on calculating position of the color stops in the gradient picker. | ||
| * | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 |
| |\| | | | |||
| | * | | | fixing the css panel button hover | Valerio Virgillito | 2012-06-20 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Merge branch 'refs/heads/master' into montage-v11-integration | Valerio Virgillito | 2012-06-20 |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | fixing the css bugs with montage v11 | Valerio Virgillito | 2012-06-18 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Merge branch 'refs/heads/master' into montage-v11-integration | Valerio Virgillito | 2012-06-18 |
| | |\ \ \ | | | |/ | | |/| | |||
| | * | | | 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/NINJAmaster' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 |
| |\ \ \ \ | | |_|/ | |/| | | |||
| | * | | | Merge branch 'IKNINJA-1754' of github.com:mencio/ninja-internal | Valerio Virgillito | 2012-06-19 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/menu/menu-entry.reel/menu-entry.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | IKNINJA 1754 menu not opening on hover | Valerio Virgillito | 2012-06-19 |
| | | | |/ | | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Merge branch 'bugfix-master' of github.com:ananyasen/ninja-internal | Valerio Virgillito | 2012-06-19 |
| | |\ \ \ | | |/ / | |/| | | |||
| | | * | | Reverting last change since this is is being made in a different pull request. | Ananya Sen | 2012-06-19 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | Fix for IKNINJA-1754 (CLONE) - Menu Component: Hovering over another main ↵ | Ananya Sen | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | menu does not work when a main menu drop down is already displayed. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ↵ | Ananya Sen | 2012-06-18 |
| | | |/ | | | | | | | | | | | | | | | | is opened Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-19 |
| |\| | | |||
| | * | | 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 |
| | |/ | |||
| * | | Merge remote-tracking branch 'ninja-internal/master' into test-merge | Jon Reid | 2012-06-15 |
| |\| | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | ||
| | * | 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/NINJAmaster' into TimelineUber | Jonathan Duran | 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> | ||
| | * | | | | | 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> | ||
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-06 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||