aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge pull request #302 from joseeight/ColorValerio Virgillito2012-06-14
|\
| * Fix: IKNINJA-1608Jose Antonio Marquez2012-06-13
| * Clean upJose Antonio Marquez2012-06-13
| * Fix: IKNINJA-1187Jose Antonio Marquez2012-06-13
| * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-13
| |\
| * | Cleaning up color wheel componentJose Antonio Marquez2012-06-13
* | | Merge pull request #301 from pushkarjoshi/brushtoolValerio Virgillito2012-06-14
|\ \ \
| * \ \ Merge branch 'master' into brushtoolPushkar Joshi2012-06-13
| |\ \ \ | | | |/ | | |/|
| * | | fix bug #1718 (trying to delete a non-existent canvas)Pushkar Joshi2012-06-13
| * | | fix bug #1704 where small paths/strokes with large stroke width caused a flip...Pushkar Joshi2012-06-13
| * | | correct path resizing in case of stroke width other than 1Pushkar Joshi2012-06-13
| * | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-13
| |\ \ \ | | | |/ | | |/|
| * | | fixes bug #1623: middle transform handle causes the brush stroke to have a ze...Pushkar Joshi2012-06-13
* | | | Merge pull request #300 from mqg734/IKNinja_1715Valerio Virgillito2012-06-13
|\ \ \ \ | |_|_|/ |/| | |
| * | | IKNinja-1715 - GIO: canvas tag is not saved after switching WebGL option On/O...Nivesh Rajbhandari2012-06-13
| | |/ | |/|
* | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
|\ \ \
| * | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-13
| |\| |
| * | | fixed document switching issuesValerio Virgillito2012-06-12
| * | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
| |\ \ \ \ \
| * | | | | | hack fix for the PI section throwing errors when dom is not ready to drawValerio Virgillito2012-06-12
| * | | | | | remove serializable from custom sectionValerio Virgillito2012-06-12
| * | | | | | fix for the the components not rendering and not selectingValerio Virgillito2012-06-12
| * | | | | | adding more missing properties to the serializationValerio Virgillito2012-06-12
| * | | | | | Merge branch 'montage-v10-integration' of github.com:Motorola-Mobility/ninja-...Valerio Virgillito2012-06-12
| |\ \ \ \ \ \
| | * | | | | | montage v10 serialization updates for timelineJonathan Duran2012-06-12
| * | | | | | | adding more nonexistent propertiesValerio Virgillito2012-06-12
| * | | | | | | fixing a default propertyValerio Virgillito2012-06-12
| |/ / / / / /
| * | | | | | fix a typoValerio Virgillito2012-06-12
| * | | | | | Timeline: Fix document switching under Montage v.10Jon Reid2012-06-12
| * | | | | | fixing a timeline issueValerio Virgillito2012-06-12
| * | | | | | adding more missing properties to the timelineValerio Virgillito2012-06-12
| * | | | | | removing the serializable from the timeline repetition and fixing the panels ...Valerio Virgillito2012-06-12
| * | | | | | adding more missing propertiesValerio Virgillito2012-06-11
| * | | | | | adding more missing propertiesValerio Virgillito2012-06-11
| * | | | | | removing serializable to the tree and adding a few more missing propertiesValerio Virgillito2012-06-11
| * | | | | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-06
| |\ \ \ \ \ \ \
| * | | | | | | | first iteration of adding serializable to ninja plus other changes to run the...Valerio Virgillito2012-06-06
| * | | | | | | | adding the latest v0.10 montageValerio Virgillito2012-06-05
* | | | | | | | | We need to guard against cases where some PI controls are using HottextUnit b...Nivesh Rajbhandari2012-06-13
* | | | | | | | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-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
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | ignore hardness for calligraphic brushes if stroke width is 1Pushkar Joshi2012-06-12
| | * | | | | | correct mouse cursor on mousemovePushkar Joshi2012-06-12