aboutsummaryrefslogtreecommitdiff
path: root/js/clipboard
Commit message (Collapse)AuthorAge
* Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Expand tabsKris Kowal2012-07-06
| |
* | 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 #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>
* / Update copyright boilerplateKris Kowal2012-07-06
|/
* fixed IKNINJA-1762 [Copy/Cut on canvas tag tool throws error on console] -> ↵Ananya Sen2012-06-27
| | | | | | don't generate data-RDGE-id for simple canvas element Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* - added io api to generate file from binaryAnanya Sen2012-06-21
- refactoring and cleanup Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 01:16:13 +0000