aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* montage v11 merge into ninjaValerio Virgillito2012-06-17
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge pull request #306 from mqg734/GIO_FixesValerio Virgillito2012-06-15
|\ | | | | Do not save ninja-specific body or html styles.
| * Remove ninja's author-time styles for banner and animation templates on ↵Nivesh Rajbhandari2012-06-14
| | | | | | | | | | | | | | | | publish/save. Missed the banner and animation case in the previous checkin. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Moving location to copy body style attributeJose Antonio Marquez2012-06-14
| | | | | | | | Fixes issue with removing styles from other elements. This now only applies to HTML and Body tags
| * Adding clean up for ninja style attributes.Jose Antonio Marquez2012-06-14
| | | | | | | | I/O step in template.
| * Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-14
| |\
| * \ Merge pull request #36 from mqg734/FileIO_JoseJose Antonio Marquez Russo2012-06-14
| |\ \ | | | | | | | | Save user's html and body styles and inline body styles for 3d so they don't get saved out with the document.
| | * | Save user's html and body styles and inline body styles for 3d so they don't ↵Nivesh Rajbhandari2012-06-14
| |/ / | | | | | | | | | | | | | | | | | | | | | get saved out with the document. This still requires some changes by Jose. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge pull request #307 from mencio/youtube-fixValerio Virgillito2012-06-15
|\ \ \ | |_|/ |/| | merging Stuart youtube fix
| * | merging Stuart youtube fixValerio Virgillito2012-06-14
|/ / | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge pull request #305 from joseeight/DocumentValerio Virgillito2012-06-14
|\ \ | | | | | | Adding banner template
| * | Adding banner templateJose Antonio Marquez2012-06-14
| |/ | | | | | | Added 'leader board' template to banners.
* | Merge pull request #304 from mqg734/GIO_FixesValerio Virgillito2012-06-14
|\ \ | | | | | | IKNinja-1710 - Boundary box is drawn offset when switching between docs. This issue is related to move object to negative space.
| * | IKNinja-1710 - Boundary box is drawn offset when switching between docs. ↵Nivesh Rajbhandari2012-06-14
| | | | | | | | | | | | | | | | | | This issue is related to move object to negative space. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge pull request #302 from joseeight/ColorValerio Virgillito2012-06-14
|\ \ \ | | | | | | | | Color fixes
| * | | Fix: IKNINJA-1608Jose Antonio Marquez2012-06-13
| | | | | | | | | | | | | | | | Changing icon, seems low res and improper size, should be hi-res PNG for future reference, using negative space offset to better display.
| * | | Clean upJose Antonio Marquez2012-06-13
| | | |
| * | | Fix: IKNINJA-1187Jose Antonio Marquez2012-06-13
| | | | | | | | | | | | | | | | Clean up and fixing masking of color wheel.
| * | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-13
| |\ \ \ | | | |/ | | |/|
| * | | Cleaning up color wheel componentJose Antonio Marquez2012-06-13
| | | | | | | | | | | | | | | | Minor code clean up and refactoring.
* | | | Merge pull request #301 from pushkarjoshi/brushtoolValerio Virgillito2012-06-14
|\ \ \ \ | |_|_|/ |/| | | Brushtool
| * | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-13
| |\ \ \ | | | |/ | | |/|
| * | | fix bug #1718 (trying to delete a non-existent canvas)Pushkar Joshi2012-06-13
| | | |
| * | | fix bug #1704 where small paths/strokes with large stroke width caused a ↵Pushkar Joshi2012-06-13
| | | | | | | | | | | | | | | | flip of the gradient colors
| * | | correct path resizing in case of stroke width other than 1Pushkar Joshi2012-06-13
| | | |
| * | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-13
| |\ \ \ | | | |/ | | |/|
| * | | fixes bug #1623: middle transform handle causes the brush stroke to have a ↵Pushkar Joshi2012-06-13
| | | | | | | | | | | | | | | | zero width or height and brush stroke cannot be recovered
* | | | Merge pull request #300 from mqg734/IKNinja_1715Valerio Virgillito2012-06-13
|\ \ \ \ | |_|_|/ |/| | | IKNinja-1715 - GIO: canvas tag is not saved after switching WebGL option On/Off in the PI for the shape object.
| * | | IKNinja-1715 - GIO: canvas tag is not saved after switching WebGL option ↵Nivesh Rajbhandari2012-06-13
| | |/ | |/| | | | | | | | | | | | | | | | | | | On/Off in the PI for the shape object. We need to add the 'data-ninja'node' in replaceEelement as well. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge pull request #297 from mqg734/PI_HotTextFixesValerio Virgillito2012-06-13
|\ \ \ | | | | | | | | Fixing properties panel to support px and % for body and other elements.
| * \ \ Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-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-integrationValerio Virgillito2012-06-13
|\ \ \ \ | | |/ / | |/| |
* | | | fixed document switching issuesValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | disabling the warningsValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | 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 branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
|\ \ \ \ \
* \ \ \ \ \ Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
|\ \ \ \ \ \
* | | | | | | 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
|/ / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 17:41:01 +0000