aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* - eric gunman's fix for styles-controller - select the appropriate override r...Ananya Sen2012-06-13
* Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-13
|\
| * Merge pull request #291 from joseeight/TempPromptUIValerio Virgillito2012-06-13
| |\
| | * Merge branch 'refs/heads/Ninja-Internal' into TempPromptUIJose Antonio Marquez2012-06-12
| | |\
| | * | Adding temp prompt UI componentJose Antonio Marquez2012-06-11
| | * | Adding close Ninja promptJose Antonio Marquez2012-06-11
| * | | Merge pull request #290 from pushkarjoshi/brushtoolValerio Virgillito2012-06-12
| |\ \ \
| | * | | change the brush runtime to ignore hardness in case of strokewidth of 1Pushkar Joshi2012-06-12
| | * | | ignore hardness for calligraphic brushes if stroke width is 1Pushkar Joshi2012-06-12
| | * | | correct mouse cursor on mousemovePushkar Joshi2012-06-12
| | * | | allow the addition of anchor points to a closed path (the mouse move cursor s...Pushkar Joshi2012-06-12
| | * | | Merge branch 'master' into pentoolPushkar Joshi2012-06-12
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-11
| | |\ \ \ | | | | |/ | | | |/|
| | * | | fix the brush tool runtime: update the brush coordinates to account for chang...Pushkar Joshi2012-06-11
| * | | | Merge pull request #299 from mqg734/GIO_FixesValerio Virgillito2012-06-12
| |\ \ \ \
| | * | | | IKNINJA-1675 - Cannot resize SVG using free transform tool.Nivesh Rajbhandari2012-06-12
| | | |_|/ | | |/| |
| * | | | Merge pull request #289 from mqg734/PI_Global3dValerio Virgillito2012-06-12
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fixing typo.Nivesh Rajbhandari2012-06-11
| | * | | Removing unused requires from 3d PI section.Nivesh Rajbhandari2012-06-11
| | * | | IKNinja-1377 - Global rotation does not work if object is translated in z.Nivesh Rajbhandari2012-06-11
| | | |/ | | |/|
* | | | displace pasted object only if the position is absoluteAnanya Sen2012-06-13
* | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-12
|\| | |
| * | | Merge pull request #288 from mencio/dom-containerValerio Virgillito2012-06-11
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'refs/heads/master' into dom-containerValerio Virgillito2012-06-11
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #286 from mqg734/ScrollBarFixValerio Virgillito2012-06-11
| |\ \ \
| | * \ \ Merge branch 'refs/heads/ninja-internal' into ScrollBarFixNivesh Rajbhandari2012-06-08
| | |\ \ \
| | * | | | Removing iframeContainer scroll styles since the scrollbars are not drawn in ...Nivesh Rajbhandari2012-06-08
| | * | | | Overriding scrollbar styles on the template so the scroll track is not white....Nivesh Rajbhandari2012-06-08
| * | | | | Merge pull request #287 from joseeight/FileIOValerio Virgillito2012-06-11
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Re-adding temp doc typeJose Antonio Marquez2012-06-09
| |/ / / /
| | | * | removing console logValerio Virgillito2012-06-11
| | | * | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| | |/ /
* | | | patse raw image data to stageAnanya Sen2012-06-12
* | | | - removed extra selection change event,Ananya Sen2012-06-11
* | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-08
|\| | |
| * | | Merge pull request #285 from joseeight/FileIOValerio Virgillito2012-06-08
| |\ \ \
| | * | | Remove doc type from files and adding tag check for htmlJose Antonio Marquez2012-06-08
| | |/ /
| * | | Merge pull request #284 from mencio/timeline-resizer-fixValerio Virgillito2012-06-08
| |\ \ \
| | * | | IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2Valerio Virgillito2012-06-08
| | * | | Merge branch 'refs/heads/master' into timeline-resizer-fixValerio Virgillito2012-06-08
| | |\| |
| | * | | IKNINJA-1702: Fix the timeline resized throwing a debugger errorValerio Virgillito2012-06-07
| * | | | Merge pull request #280 from pushkarjoshi/brushtoolValerio Virgillito2012-06-08
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | fix compile error that was preventing non-gradient brush strokes from being r...Pushkar Joshi2012-06-07
| | * | change units for smoothing and calligraphic angle in PIPushkar Joshi2012-06-07
| | * | Merge branch 'master' into brushtoolPushkar Joshi2012-06-07
| | |\ \
| | * | | change the PI to make it look like the fill color affects the brush stroke colorPushkar Joshi2012-06-07
| | * | | enable gradients for brush stroke (in authoring as well as runtime)Pushkar Joshi2012-06-06
| | * | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-06-06
| | |\ \ \
| | * \ \ \ Merge branch 'pentool' into brushtoolPushkar Joshi2012-06-06
| | |\ \ \ \
| | * | | | | removed repeated declarations in brush stroke runtime classPushkar Joshi2012-06-04