aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Binding View - Mouse Over Element Pop up HudArmen Kesablyan2012-06-19
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-19
|\ | | | | | | | | Conflicts: js/stage/binding-view.reel/binding-view.js
| * Bug: Text Tool Breaking canvas space.Armen Kesablyan2012-06-19
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-19
| | |\
| | | * Merge pull request #308 from joseeight/ColorValerio Virgillito2012-06-18
| | | |\ | | | | | | | | | | Fixing no color application to all elements.
| | | | * Fixing binding of alpha slider/hottext in popup with panelJose Antonio Marquez2012-06-18
| | | | |
| | | | * Cleaning reelJose Antonio Marquez2012-06-17
| | | | |
| | | | * Cleaning up element referencesJose Antonio Marquez2012-06-17
| | | | |
| | | | * Tidying up color barJose Antonio Marquez2012-06-17
| | | | |
| | | | * More cleaning upJose Antonio Marquez2012-06-16
| | | | | | | | | | | | | | | | | | | | Controller will need a review and refactoring.
| | | | * Fixed slider/hottext bindingsJose Antonio Marquez2012-06-16
| | | | | | | | | | | | | | | | | | | | Also cleaning up, however, needs much refactoring.
| | | | * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-15
| | | | |\
| | | | * | Fixing apply 'no color'Jose Antonio Marquez2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | This should fix canvas and standard DOM elements including the root (body or template wrapper).
| | | | * | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-15
| | | | |\ \
| | | | * \ \ Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-14
| | | | |\ \ \
| | | | * | | | Cleaning up referencesJose Antonio Marquez2012-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still need to do more cleaning up.
| | | * | | | | Merge pull request #309 from mqg734/IKNinja_1746Valerio Virgillito2012-06-18
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | IKNINJA-1746 - Can't select items behind the banner templates' viewport.
| | | | * | | | IKNINJA-1746 - Can't select items behind the banner templates' viewport.Nivesh Rajbhandari2012-06-15
| | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@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