aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-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
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Fixing properties panel to support px and % for body and other elements.Nivesh Rajbhandari2012-06-12
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Cleaning up color wheel componentJose Antonio Marquez2012-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
| * | | | | | 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
| | |/ / / | |/| | |
* | | | | Merge branch 'refs/heads/master' into dom-containerValerio Virgillito2012-06-11
|\| | | |
| * | | | Merge pull request #286 from mqg734/ScrollBarFixValerio Virgillito2012-06-11
| |\ \ \ \