| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-13 |
| |\ | |||
| | * | Merge pull request #291 from joseeight/TempPromptUI | Valerio Virgillito | 2012-06-13 |
| | |\ | | | | | | | Adding temp prompts | ||
| | | * | Merge branch 'refs/heads/Ninja-Internal' into TempPromptUI | Jose Antonio Marquez | 2012-06-12 |
| | | |\ | |||
| | | * | | 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. | ||
| | | * | | Adding close Ninja prompt | Jose Antonio Marquez | 2012-06-11 |
| | | | | | | | | | | | | | | | | | Adding a prompt to the user to ensure all data is saved prior to closing the application. This will not let me check for documents to need saving, so it must be general and will appear at all times. | ||
| * | | | | fixed document switching issues | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | disabling the warnings | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-12 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Merge pull request #290 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-06-12 |
| | |\ \ \ | | | | | | | | | | | Brushtool | ||
| | | * | | | change the brush runtime to ignore hardness in case of strokewidth of 1 | Pushkar Joshi | 2012-06-12 |
| | | | | | | |||
| | | * | | | ignore hardness for calligraphic brushes if stroke width is 1 | Pushkar Joshi | 2012-06-12 |
| | | | | | | |||
| | | * | | | correct mouse cursor on mousemove | Pushkar Joshi | 2012-06-12 |
| | | | | | | |||
| | | * | | | allow the addition of anchor points to a closed path (the mouse move cursor ↵ | Pushkar Joshi | 2012-06-12 |
| | | | | | | | | | | | | | | | | | | | | | still needs to be updated) | ||
| | | * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-06-12 |
| | | |\ \ \ | | | | |/ | | | |/| | |||
| | | * | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-06-11 |
| | | |\ \ \ | | | | |/ | | | |/| | |||
| | | * | | | fix the brush tool runtime: update the brush coordinates to account for ↵ | Pushkar Joshi | 2012-06-11 |
| | | | | | | | | | | | | | | | | | | | | | change in bounding box due to smoothing | ||
| * | | | | | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-12 |
| |\| | | | | |||
| | * | | | | Merge pull request #299 from mqg734/GIO_Fixes | Valerio Virgillito | 2012-06-12 |
| | |\ \ \ \ | | | | | | | | | | | | | IKNINJA-1675 - Cannot resize SVG using free transform tool. | ||
| | | * | | | | IKNINJA-1675 - Cannot resize SVG using free transform tool. | Nivesh Rajbhandari | 2012-06-12 |
| | | | |_|/ | | |/| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-12 |
| |\| | | | | |||
| | * | | | | Merge pull request #289 from mqg734/PI_Global3d | Valerio Virgillito | 2012-06-12 |
| | |\ \ \ \ | | |/ / / | |/| | | | IKNinja-1377 - Global rotation does not work if object is translated in z. | ||
| | | * | | | Fixing typo. | Nivesh Rajbhandari | 2012-06-11 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | Removing unused requires from 3d PI section. | Nivesh Rajbhandari | 2012-06-11 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | IKNinja-1377 - Global rotation does not work if object is translated in z. | Nivesh Rajbhandari | 2012-06-11 |
| | | | |/ | | |/| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | hack fix for the PI section throwing errors when dom is not ready to draw | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | remove serializable from custom section | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | fixing the feed reader | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | fix for the the components not rendering and not selecting | 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> | ||
| * | | | | Merge branch 'montage-v10-integration' of ↵ | Valerio Virgillito | 2012-06-12 |
| |\ \ \ \ | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into montage-v10-integration | ||
| | * \ \ \ | Merge pull request #296 from imix23ways/jd-pullreq | Valerio Virgillito | 2012-06-12 |
| | |\ \ \ \ | | | | | | | | | | | | | fix montage serialization in timeline for v10 | ||
| | | * | | | | montage v10 serialization updates for timeline | Jonathan Duran | 2012-06-12 |
| | |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | adding more nonexistent properties | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | fixing a default property | Valerio Virgillito | 2012-06-12 |
| |/ / / / | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | fix a typo | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | Merge pull request #295 from jreid01/pullrequest-v10 | Valerio Virgillito | 2012-06-12 |
| |\ \ \ \ | | | | | | | | | | | Timeline: Update document switching to work under Montage v.10 | ||
| | * | | | | Timeline: Fix document switching under Montage v.10 | Jon Reid | 2012-06-12 |
| |/ / / / | |||
| * | | | | fixing a timeline issue | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | adding more missing properties to the timeline | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | removing the serializable from the timeline repetition and fixing the panels ↵ | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | currentDocument binding 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 pull request #288 from mencio/dom-container | Valerio Virgillito | 2012-06-11 |
| | |\ \ \ | | |/ / | |/| | | Dom container - Fixing the current selected container | ||
| | | * | | Merge branch 'refs/heads/master' into dom-container | Valerio Virgillito | 2012-06-11 |
| | | |\ \ | | |/ / | |/| | | |||
| | * | | | Merge pull request #286 from mqg734/ScrollBarFix | Valerio Virgillito | 2012-06-11 |
| | |\ \ \ | | | | | | | | | | | Overriding scrollbar styles on the template so the scroll track is not white. | ||
| | | * \ \ | Merge branch 'refs/heads/ninja-internal' into ScrollBarFix | Nivesh Rajbhandari | 2012-06-08 |
| | | |\ \ \ | |||
| | | * | | | | Removing iframeContainer scroll styles since the scrollbars are not drawn in ↵ | Nivesh Rajbhandari | 2012-06-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the iframeContainer now. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | Overriding scrollbar styles on the template so the scroll track is not ↵ | Nivesh Rajbhandari | 2012-06-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | white. This has the side benefit of fixing some of the zoom issues with the scrollbar too. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||