aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #297 from mqg734/PI_HotTextFixesValerio Virgillito2012-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
* | | | | | | | | | | | | | | | | | | | | | | | disabling the warningsValerio 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
* | | | | | | | | | | | | | | | | | | | | | | | | | | fixing the feed readerValerio 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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 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
| | | | | | |\ \ \ \ \