aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'montage-v10-integration' of github.com:Motorola-Mobility/ninja-...Valerio Virgillito2012-06-12
|\
| * Merge pull request #296 from imix23ways/jd-pullreqValerio 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
* Merge pull request #295 from jreid01/pullrequest-v10Valerio 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 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
| |/ / /
| * | | 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
| | * | | | | | runtime version of the brush stroke (similar to the pen paths, this seems to ...Pushkar Joshi2012-05-31
| | * | | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-05-31
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'pentool' into brushtoolPushkar Joshi2012-05-22
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into brushtoolPushkar Joshi2012-05-22
| | |\ \ \ \ \ \ \ \
| | | | | | | | | | * removing console logValerio Virgillito2012-06-11
| | | | | | | | | | * rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge pull request #283 from mqg734/BodyPIValerio Virgillito2012-06-07
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into BodyPINivesh Rajbhandari2012-06-07
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Body PI fixes.Nivesh Rajbhandari2012-06-07
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #281 from joseeight/FileIOValerio Virgillito2012-06-07
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fixing empty property bug with montage class on HTML tagJose Antonio Marquez2012-06-07
| | * | | | | | | | | Minor fixesJose Antonio Marquez2012-06-07