aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| | | * | | | | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | completing the component simple piValerio Virgillito2012-03-30
| | | * | | | | | | | | | | IKNINJA-1191 - Fixed the order of the componentsValerio Virgillito2012-03-30
| | | * | | | | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-30
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-28
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | removed trace statementValerio Virgillito2012-03-27
| | | * | | | | | | | | | | | Cleanup of the components panelValerio Virgillito2012-03-26
| * | | | | | | | | | | | | | - using Montage TextField component to handle any edits like keyup, paste, cut.Ananya Sen2012-04-05
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | - disable ok when text box is cleared using backspace and cross, for file nam...Ananya Sen2012-04-04
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #157 from ananyasen/ninja-internal-master-patch1Valerio Virgillito2012-04-04
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | [CR] Keep Save related menu items always enabled, if there is an open documentAnanya Sen2012-04-04
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Single perspective fix.Nivesh Rajbhandari2012-04-09
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
* | | | | | | | | | | Grow/shrink Line, Oval and Rectangles when changing stroke size.Nivesh Rajbhandari2012-04-06
* | | | | | | | | | | -webkit-transform-style needs to be set to preserve-3d for shapes regardless ...Nivesh Rajbhandari2012-04-05
* | | | | | | | | | | Fix for line tool not working because PI requests fill color for line as well...Nivesh Rajbhandari2012-04-05
* | | | | | | | | | | Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel ca...Nivesh Rajbhandari2012-04-05
* | | | | | | | | | | Fixing 3d tool reset to redraw handles.Nivesh Rajbhandari2012-04-05
* | | | | | | | | | | Adding back fix in mediator to not set 3d styles unless necessary.Nivesh Rajbhandari2012-04-05
* | | | | | | | | | | Undoing bad auto-merge resize-composer.js.Nivesh Rajbhandari2012-04-05
* | | | | | | | | | | Fixing curly brackets from auto-merge.Nivesh Rajbhandari2012-04-05
* | | | | | | | | | | Undoing some minor spacing differences from auto-merge.Nivesh Rajbhandari2012-04-05
* | | | | | | | | | | Undoing mistakes from auto-merge.Nivesh Rajbhandari2012-04-05
* | | | | | | | | | | Removing unnecessary code element = element.Nivesh Rajbhandari2012-04-05
* | | | | | | | | | | Commenting out console logs.Nivesh Rajbhandari2012-04-05
* | | | | | | | | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | We should require VecUtils instead of referring to the global reference since...Nivesh Rajbhandari2012-04-04
| | * | | | | | | | | | | Merge branch 'refs/heads/EricSnapping' into WebGLFileIONivesh Rajbhandari2012-04-04
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Snapping fixes.hwc4872012-04-02
| | | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-03-29
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / | | | | |/| | | | | | | |
| | | * | | | | | | | | | merge from mainhwc4872012-03-29
| | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Adjusting line's width and height when changing stroke size.Nivesh Rajbhandari2012-04-04
| | * | | | | | | | | | IKNinja-635 - Can't see 3d handles if div is red, green or blue color.Nivesh Rajbhandari2012-04-03
| | * | | | | | | | | | Give user feedback about which element the Fill/InkBottle tools will act on.Nivesh Rajbhandari2012-04-03
| | * | | | | | | | | | IKNinja-1375 - After WebGL conversion from PI, Selection tool gets deactivate...Nivesh Rajbhandari2012-04-03
| | * | | | | | | | | | IKNinja-1376 - 3D values reverted when using Selection tool to move the objec...Nivesh Rajbhandari2012-04-02
| | * | | | | | | | | | IKNinja-1399 - [Eyedropper] Not sampling WebGL gradients after file open.Nivesh Rajbhandari2012-04-02
| | * | | | | | | | | | Switching to Linear/RadialGradient materials will set the corresponding color...Nivesh Rajbhandari2012-04-02
| | * | | | | | | | | | IKNinna-1409 - Should dirty document when changing shape properties. IKNinja-...Nivesh Rajbhandari2012-04-02
| | * | | | | | | | | | IKNinja-1410 - Inner Radius should be restricted to 99%.Nivesh Rajbhandari2012-04-02
| | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-04-02
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | * | | | | | | | | | Update PI and Color Panel to reflect default LinearGradient and RadialGradien...Nivesh Rajbhandari2012-03-30
| | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-03-30
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Updated shapes to always check for its stroke and fill colors and materials i...Nivesh Rajbhandari2012-03-29
| | * | | | | | | | | | We shouldn't set z to 0 for translate tool snapping because user may want to ...Nivesh Rajbhandari2012-03-29
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Styling PI's Materials edit button.Nivesh Rajbhandari2012-04-04
| * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-04-04
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-04-04
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | * | | | | | | | | removed unnecessary call to exportMaterials from init(). this call should not...John Mayhew2012-04-04