aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
|\
| * Merge pull request #154 from mqg734/ToolFixesValerio Virgillito2012-04-04
| |\
| | * Need to set elementModel.isIn2DSnapCache flag to false when removing element ...Nivesh Rajbhandari2012-04-04
| * | Merge pull request #149 from dhg637/BugFixesValerio Virgillito2012-04-04
| |\ \
| | * | Merge branch 'refs/heads/master' into BugFixesArmen Kesablyan2012-04-04
| | |\|
| | * | Bug #1060: Fixed CSS Lint issueArmen Kesablyan2012-03-30
| | * | Bug Fix: Height and width of panels not be keptArmen Kesablyan2012-03-29
| | * | Resizing BugsArmen Kesablyan2012-03-29
| | * | Bug #1073: Panels interact with hottest drag dropArmen Kesablyan2012-03-28
| * | | Merge pull request #150 from ericguzman/PresetsPIValerio Virgillito2012-04-04
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| | |\ \ | | |/ / | |/| |
| * | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| * | | Merge pull request #148 from ananyasen/integration-candidateValerio Virgillito2012-04-01
| |\ \ \
| | * | | - using clipboard data directly to avoid using setTimeoutAnanya Sen2012-03-30
| | * | | detect paste from context menu for new file and save as dialogAnanya Sen2012-03-28
| | * | | IKNINJA-719 - removed Zoom In/Zoom Out under View menu in the Main menuAnanya Sen2012-03-28
| | | |/ | | |/|
| * | | Merge pull request #151 from ericguzman/CSSPanel_AnimationDurationFixValerio Virgillito2012-03-30
| |\ \ \
| | * | | CSS Panel - Fix animation duration value updates from "infinite" to integer.Eric Guzman2012-03-29
| |/ / /
| | | * Animation Presets - Only combine animations if pre-existing animations existEric Guzman2012-04-02
| | | * Presets Controller - Remove unused method callEric Guzman2012-03-30
| | | * Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-29
| | | |\ | | |_|/ | |/| |
| | | * Presets - Remove style transition when transition doesn't start. Also added t...Eric Guzman2012-03-29
* | | | removing some of the button propertiesValerio Virgillito2012-03-30
* | | | Merge branch 'components' of github.com:mencio/ninja-internal into componentsValerio Virgillito2012-03-30
|\ \ \ \
| * | | | completing the component simple piValerio Virgillito2012-03-30
* | | | | 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 pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
| | |\ \
| | * | | turn off changing the left and top of the brush stroke canvasPushkar Joshi2012-03-28
| | * | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| | |\ \ \
| | * | | | File IO for the brush stroke AND changing the data type of brush stroke from ...Pushkar Joshi2012-03-27
| | * | | | add a setfillcolor to brush stroke so the default fillcolor handler does not ...Pushkar Joshi2012-03-27
| | * | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| | |\ \ \ \
| | * | | | | correctly update the brush stroke canvas size and position when the stroke pa...Pushkar Joshi2012-03-26
| | * | | | | correctly update the brush stroke canvas size and position when the stroke si...Pushkar Joshi2012-03-23
| | * | | | | Almost working version of brush tool that uses only local coordinates to stor...Pushkar Joshi2012-03-23
| | * | | | | revert to using the angle without flipping its sign...fixing some minor bugs ...Pushkar Joshi2012-03-20
| | * | | | | draw the brush stroke in realtimePushkar Joshi2012-03-19
| | * | | | | first pass for file IO of brush strokesPushkar Joshi2012-03-19
| | * | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-16
| | |\ \ \ \ \
| | * | | | | | update values in the PI from values of the selected brush stroke or pen tool ...Pushkar Joshi2012-03-15
| | * | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-03-14
| | |\ \ \ \ \ \
| | * | | | | | | PI for pen and brush strokesPushkar Joshi2012-03-14
| | * | | | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-03-13
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add a smoothing amount parameter, and hide options based on checkboxesPushkar Joshi2012-03-13
* | | | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-28
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | fixed logical error in triggering menu itemAnanya Sen2012-03-26