| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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> | ||
| | * | | | | Merge pull request #287 from joseeight/FileIO | Valerio Virgillito | 2012-06-11 |
| | |\ \ \ \ | | |_|/ / | |/| | | | Re-adding temp doc type | ||
| | | * | | | Re-adding temp doc type | Jose Antonio Marquez | 2012-06-09 |
| | |/ / / | | | | | | | | | | | | | Adding a demo fix to include the document type, it is removed because comments are not supported currently, so we must added in manually. The YouTube component breaks, it does not support any doctype, hence, the component must have a bug filed against it, we MUST include doc types with our files. | ||
| | * | | | Merge pull request #285 from joseeight/FileIO | Valerio Virgillito | 2012-06-08 |
| | |\ \ \ | | | | | | | | | | | Remove doc type from files and adding tag check for html | ||
| | | * | | | Remove doc type from files and adding tag check for html | Jose Antonio Marquez | 2012-06-08 |
| | | |/ / | | | | | | | | | | | | | Removed the HTML5 doctype from files since it was break the YouTube component, also made a fix to check for the HTML tag to be present when copying attributes. | ||
| | * | | | Merge pull request #284 from mencio/timeline-resizer-fix | Valerio Virgillito | 2012-06-08 |
| | |\ \ \ | | | | | | | | | | | IKNINJA-1702: Fix the timeline resized throwing a debugger error | ||
| | | * | | | IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2 | Valerio Virgillito | 2012-06-08 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | Merge branch 'refs/heads/master' into timeline-resizer-fix | Valerio Virgillito | 2012-06-08 |
| | | |\| | | |||
| | | * | | | IKNINJA-1702: Fix the timeline resized throwing a debugger error | Valerio Virgillito | 2012-06-07 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Merge pull request #280 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-06-08 |
| | |\ \ \ \ | | |_|/ / | |/| | | | Brushtool | ||
| | | * | | | fix compile error that was preventing non-gradient brush strokes from being ↵ | Pushkar Joshi | 2012-06-07 |
| | | | | | | | | | | | | | | | | | | | | | rendered in runtime | ||
| | | * | | | change units for smoothing and calligraphic angle in PI | Pushkar Joshi | 2012-06-07 |
| | | | | | | |||
| | | * | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-06-07 |
| | | |\ \ \ | |||
| | | * | | | | change the PI to make it look like the fill color affects the brush stroke color | Pushkar Joshi | 2012-06-07 |
| | | | | | | | |||
| | | * | | | | enable gradients for brush stroke (in authoring as well as runtime) | Pushkar Joshi | 2012-06-06 |
| | | | | | | | |||
| | | * | | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-06-06 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js | ||
| | | * \ \ \ \ | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-06-06 |
| | | |\ \ \ \ \ | |||
| | | * | | | | | | removed repeated declarations in brush stroke runtime class | Pushkar Joshi | 2012-06-04 |
| | | | | | | | | | |||
| | | * | | | | | | runtime version of the brush stroke (similar to the pen paths, this seems to ↵ | Pushkar Joshi | 2012-05-31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not work unless we run it through the debugger) | ||
| | | * | | | | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-05-31 |
| | | |\ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-05-22 |
| | | |\ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-05-22 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | * | 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> | ||
| | * | | | | | | | | | Merge pull request #283 from mqg734/BodyPI | Valerio Virgillito | 2012-06-07 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Body PI fixes. | ||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into BodyPI | Nivesh Rajbhandari | 2012-06-07 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/body-controller.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | | | | Body PI fixes. | Nivesh Rajbhandari | 2012-06-07 |
| | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | | | | | Merge pull request #281 from joseeight/FileIO | Valerio Virgillito | 2012-06-07 |
| | |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | Adding partial unique ID to data files | ||
| | | * | | | | | | | | | Fixing empty property bug with montage class on HTML tag | Jose Antonio Marquez | 2012-06-07 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Minor fixes | Jose Antonio Marquez | 2012-06-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensuring montage style is removed and doctype is included. | ||