aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #372 from mencio/youtube-fixValerio Virgillito2012-07-09
|\ | | | | Removing the youtube hack now that we have the proper fix from montage
| * Removing the youtube hack now that we have the proper fix from montageValerio Virgillito2012-07-03
| | | | | | | | | | | | Removing the saved instance of the component when opening a file containing the youtube component. Montage made the fix where the instance is now serialized property. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge pull request #371 from ananyasen/menu-bug-fixValerio Virgillito2012-07-09
|\ \ | | | | | | fixed IKNINJA-1877 : Clicking on a menu item should commit on mouse up a...
| * | fixed IKNINJA-1877 : Clicking on a menu item should commit on mouse up and ↵Ananya Sen2012-07-03
| |/ | | | | | | | | | | not on mouse down. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge pull request #368 from mqg734/CopyPasteWebGLValerio Virgillito2012-07-09
|\ \ | | | | | | IKNinja-1736 and IKNinja-1802 - Copy paste WebGL bugs.
| * | IKNinja-1736 and IKNinja-1802 - Copy paste WebGL bugs.Nivesh Rajbhandari2012-07-02
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge pull request #366 from joseeight/ColorValerio Virgillito2012-07-09
|\ \ \ | | | | | | | | Fix: IKNINJA-1634
| * | | Fix: IKNINJA-1634Jose Antonio Marquez2012-07-02
| |/ / | | | | | | | | | Fixing reference error for gradient stops on click.
* | | Merge pull request #364 from ananyasen/bugfix-masterValerio Virgillito2012-07-09
|\ \ \ | | | | | | | | Fixed IKNINJA-1763, IKNINJA-1807 - refresh stage after loading image/svg
| * | | removing unnecessary variableAnanya Sen2012-06-29
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | Fixed IKNINJA-1763, IKNINJA-1807 - refresh stage after loading is done for ↵Ananya Sen2012-06-29
| | | | | | | | | | | | | | | | | | | | | | | | image and svg Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | Merge pull request #357 from ericmueller/GridFixesValerio Virgillito2012-07-09
|\ \ \ \ | | | | | | | | | | Fixes for incorrect line/polygon intersections.
| * | | | Fixes a bug in rectangle containment test.hwc4872012-06-29
| | | | |
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | GridFixes
| * | | | | Fixes for incorrect line/polygon intersections.hwc4872012-06-28
| | | | | |
* | | | | | Merge pull request #346 from mqg734/MaterialsUIValerio Virgillito2012-07-09
|\ \ \ \ \ \ | | | | | | | | | | | | | | UI support for preview, edit, duplicate and delete of WebGL Materials.
| * \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Materials/materials-library-panel.reel/materials-library-panel.css js/panels/Materials/materials-popup.reel/materials-popup.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | adding missing copyright to the feed reader.Valerio Virgillito2012-07-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Merge pull request #373 from kriskowal/bsdValerio Virgillito2012-07-06
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Update copyright boilerplate
| * | | | | | Update copyright boilerplateKris Kowal2012-07-06
|/ / / / / /
* | | | | | adding missing montage to the user library and temporary fix for picas ↵Valerio Virgillito2012-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen trash Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Merge pull request #369 from aadsm/gh-329_template-creator-restores-elementValerio Virgillito2012-07-03
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | gh-329 Make Template Creator restore the elements after serialization
| * | | | | gh-329 Make Template Creator restore the elements after serializationAntónio Afonso2012-07-03
|/ / / / / | | | | | | | | | | To create the serialization the element of each component needs to point to a new one, since the code was not restoring these elements the components were left in an undefined state.
| * | | | PI, drawing and editing fixes for shapes and materials.Nivesh Rajbhandari2012-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1841 - Cannot change webgl shape with LinearGradient and RadialGradient to solid color. IKNINJA-1851 - Cannot draw webgl shapes with Linear/RadialGradient material. IKNINJA-1864 - PI doesn't update the color of shape if WebGL material switches to Flat. IKNINJA-1886 - Gradient edits not applied to WebGL Stage object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | IKNINJA-1246 - Line drawing feedback disappears when using no-color or ↵Nivesh Rajbhandari2012-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gradient for stroke color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-02
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | updating to version 7.0Valerio Virgillito2012-06-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Merge pull request #360 from joseeight/DocumentValerio Virgillito2012-06-29
|\ \ \ \ \ | |_|_|_|/ |/| | | | Adding fix to prevent video from playing
| * | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-29
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #363 from ericguzman/stylesControllerPatch_6_29Valerio Virgillito2012-06-29
|\ \ \ \ \ | | | | | | | | | | | | Styles Controller Patch to ignore unfound rules from getMatchedCSSRules
| * | | | | Another null check on results from getMatchedCSSRulesEric Guzman2012-06-29
| | | | | |
| * | | | | Null check on results from getMatchedCSSRulesEric Guzman2012-06-29
| | | | | |
| * | | | | Styles Controller - getMatchingRules - Add forgotten return statementEric Guzman2012-06-29
| | | | | |
| * | | | | Styles controller - adding check for attached element in getMatchedCSSRulesEric Guzman2012-06-29
| | | | | |
| * | | | | Styles Controller Patch to ignore unfound rules from getMatchedCSSRulesEric Guzman2012-06-29
| | | | | |
| | * | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-29
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #362 from mqg734/ColorGradientFixValerio Virgillito2012-06-29
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fixed not being able to draw linear and radial gradients and two other tools bugs.
| * | | | | Merge branch 'refs/heads/ninja-internal' into ColorGradientFixNivesh Rajbhandari2012-06-29
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Need to special case linear gradient, radial gradient and uber materials ↵Nivesh Rajbhandari2012-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when applying fill and stroke colors. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Fixed not being able to draw linear and radial gradients. Also fixed ↵Nivesh Rajbhandari2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1721 - File dirty marker does not show when modifying elements and IKNinja-1581 and IKNinja-1758 - Paint bucket fill bugs with lines and brush objects. Squashed commit of the following: commit 7cad082c89911d34a99feeef8e91d22b89cae8f1 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 17:52:07 2012 -0700 Fix for not being able to draw linear and radial gradient materials. I'm turning off pre-flight support of gradients for WebGL since it conflicts with the materials' color support. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit d0df8a2bff052d855bafb7885792b1dfff8eab7d Merge: 2c67d26 b4b54f6 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 17:50:11 2012 -0700 Merge branch 'refs/heads/ninja-internal' into ToolFixes commit 2c67d264851f0897fdca8ca887c1c82d0e434217 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 15:06:13 2012 -0700 IKNINJA-1721 - File dirty marker does not show when modifying elements. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit bb4b6a52eb75efb2f435cdb53f810ae3bc1f1fc3 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 11:15:34 2012 -0700 IKNinja-1581 and IKNinja-1758 - Paint bucket fill bugs with lines and brush objects. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Merge pull request #41 from mencio/video-fixJose Antonio Marquez Russo2012-06-29
| | | |\ \ \ | | | | | | | | | | | | | | Fixing the video bug
| | | | * | | fixing someValerio Virgillito2012-06-29
| | | |/ / / | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-29
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #350 from ericguzman/StylesController_6_27Valerio Virgillito2012-06-29
|\ \ \ \ \ \ | | | | | | | | | | | | | | Styles Controller - Fix specificity comparison in hasGreaterSpecificity
| * | | | | | Styles Controller - removing console logsEric Guzman2012-06-29
| | | | | | |
| * | | | | | Styles Controller - Fix specificity comparison in hasGreaterSpecificity()Eric Guzman2012-06-27
| | | | | |