aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
|\ | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge pull request #290 from pushkarjoshi/brushtoolValerio Virgillito2012-06-12
| |\ | | | | | | Brushtool
| | * change the brush runtime to ignore hardness in case of strokewidth of 1Pushkar Joshi2012-06-12
| | |
| | * ignore hardness for calligraphic brushes if stroke width is 1Pushkar Joshi2012-06-12
| | |
| | * correct mouse cursor on mousemovePushkar Joshi2012-06-12
| | |
| | * allow the addition of anchor points to a closed path (the mouse move cursor ↵Pushkar Joshi2012-06-12
| | | | | | | | | | | | still needs to be updated)
| | * Merge branch 'master' into pentoolPushkar Joshi2012-06-12
| | |\
| | * \ Merge branch 'master' into brushtoolPushkar Joshi2012-06-11
| | |\ \
| | * | | fix the brush tool runtime: update the brush coordinates to account for ↵Pushkar Joshi2012-06-11
| | | | | | | | | | | | | | | | | | | | change in bounding box due to smoothing
* | | | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
|\| | | |
| * | | | Merge pull request #299 from mqg734/GIO_FixesValerio Virgillito2012-06-12
| |\ \ \ \ | | | | | | | | | | | | IKNINJA-1675 - Cannot resize SVG using free transform tool.
| | * | | | IKNINJA-1675 - Cannot resize SVG using free transform tool.Nivesh Rajbhandari2012-06-12
| | | |_|/ | | |/| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
|\| | | |
| * | | | Merge pull request #289 from mqg734/PI_Global3dValerio Virgillito2012-06-12
| |\ \ \ \ | | |/ / / | |/| | | IKNinja-1377 - Global rotation does not work if object is translated in z.
| | * | | Fixing typo.Nivesh Rajbhandari2012-06-11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Removing unused requires from 3d PI section.Nivesh Rajbhandari2012-06-11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | IKNinja-1377 - Global rotation does not work if object is translated in z.Nivesh Rajbhandari2012-06-11
| | | |/ | | |/| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | hack fix for the PI section throwing errors when dom is not ready to drawValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | remove serializable from custom sectionValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | fixing the feed readerValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | fix for the the components not rendering and not selectingValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | adding more missing properties to the serializationValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'montage-v10-integration' of ↵Valerio Virgillito2012-06-12
|\ \ \ \ | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into montage-v10-integration
| * \ \ \ Merge pull request #296 from imix23ways/jd-pullreqValerio Virgillito2012-06-12
| |\ \ \ \ | | | | | | | | | | | | fix montage serialization in timeline for v10
| | * | | | montage v10 serialization updates for timelineJonathan Duran2012-06-12
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | adding more nonexistent propertiesValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | fixing a default propertyValerio Virgillito2012-06-12
|/ / / / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | fix a typoValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge pull request #295 from jreid01/pullrequest-v10Valerio Virgillito2012-06-12
|\ \ \ \ | | | | | | | | | | Timeline: Update document switching to work under Montage v.10
| * | | | Timeline: Fix document switching under Montage v.10Jon Reid2012-06-12
|/ / / /
* | | | fixing a timeline issueValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | adding more missing properties to the timelineValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | removing the serializable from the timeline repetition and fixing the panels ↵Valerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | currentDocument binding Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | adding more missing propertiesValerio Virgillito2012-06-11
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | adding more missing propertiesValerio Virgillito2012-06-11
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | removing serializable to the tree and adding a few more missing propertiesValerio Virgillito2012-06-11
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-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-containerValerio Virgillito2012-06-11
| |\ \ \ | | |/ / | |/| | Dom container - Fixing the current selected container
| | * | Merge branch 'refs/heads/master' into dom-containerValerio Virgillito2012-06-11
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #286 from mqg734/ScrollBarFixValerio Virgillito2012-06-11
| |\ \ \ | | | | | | | | | | Overriding scrollbar styles on the template so the scroll track is not white.
| | * \ \ Merge branch 'refs/heads/ninja-internal' into ScrollBarFixNivesh Rajbhandari2012-06-08
| | |\ \ \
| | * | | | Removing iframeContainer scroll styles since the scrollbars are not drawn in ↵Nivesh Rajbhandari2012-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 Rajbhandari2012-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/FileIOValerio Virgillito2012-06-11
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Re-adding temp doc type
| | * | | | Re-adding temp doc typeJose Antonio Marquez2012-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/FileIOValerio Virgillito2012-06-08
| |\ \ \ \ | | | | | | | | | | | | Remove doc type from files and adding tag check for html
| | * | | | Remove doc type from files and adding tag check for htmlJose Antonio Marquez2012-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-fixValerio Virgillito2012-06-08
| |\ \ \ \ | | | | | | | | | | | | IKNINJA-1702: Fix the timeline resized throwing a debugger error
| | * | | | IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2Valerio Virgillito2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Merge branch 'refs/heads/master' into timeline-resizer-fixValerio Virgillito2012-06-08
| | |\| | |