aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release'rsudev2014-08-1456-309/+337
|\
| * Merge pull request #4171 from rsudev/crowdin_translationsrsudev2014-08-1454-302/+325
| |\
| | * crowdin: New translationsrsudev2014-08-1454-302/+325
| |/
| * #4157: show toast starting/stopping speechBananeweizen2014-08-132-7/+12
* | Merge branch 'release'Bananeweizen2014-08-131-15/+25
|\ \ | |/
| * Merge pull request #4168 from schwabe/fix_1745Bananeweizen2014-08-131-14/+25
| |\
| | * Fix #1745: Fix Waypoint description overlapping navigation iconArne Schwabe2014-08-131-14/+25
| |/
* | new: invoke keyboard on log text fieldBananeweizen2014-08-133-0/+19
* | fix #4169: update trackable log after loggingBananeweizen2014-08-133-6/+40
* | #3034 Additional correctionLars2014-08-131-1/+1
* | Use more idiomatic constructs from Jackson librarySamuel Tardieu2014-08-131-6/+4
* | refactoring: remove unused importBananeweizen2014-08-121-1/+0
* | fix #4151: proguard use for Gradle debug buildsSamuel Tardieu2014-08-121-1/+1
* | Fix #3034 Sync wording with PlaystoreLars2014-08-121-3/+3
* | Merge branch 'release' into upstreamSamuel Tardieu2014-08-122-15/+9
|\ \ | |/
| * Never block when building a cache/waypoint details creatorSamuel Tardieu2014-08-122-15/+9
* | Merge branch 'release' into upstreamSamuel Tardieu2014-08-121-1/+1
|\ \ | |/
| * fix #4166: inconsistent labels for non-event cacheSamuel Tardieu2014-08-121-1/+1
* | Merge branch 'release' into upstreamSamuel Tardieu2014-08-123-11/+5
|\ \ | |/
| * fix #4165: avatar no longer recognizedSamuel Tardieu2014-08-122-11/+4
| * Update changelog_release.xmlLars2014-08-121-0/+1
* | Do not make firstRun variable staticSamuel Tardieu2014-08-121-1/+1
* | Revert "#4140 disable play services due to blocking geodata call"Samuel Tardieu2014-08-121-1/+3
* | fix #4140: blocking geodata call in emulatorSamuel Tardieu2014-08-123-4/+16
* | Merge branch 'release' into upstreamSamuel Tardieu2014-08-121-4/+2
|\ \ | |/
| * fix #4164: error when no log present for an Okapi cacheSamuel Tardieu2014-08-121-4/+2
* | Use more idiomatic constructs from Jackson librarySamuel Tardieu2014-08-121-9/+6
* | Fix JSON node constructionSamuel Tardieu2014-08-121-1/+2
* | Merge branch 'release' into upstreamSamuel Tardieu2014-08-120-0/+0
|\ \ | |/
| * Allow erasing of personal note on serverSamuel Tardieu2014-08-121-1/+1
* | Dummy sources for Intellij IDEA / Play servicesSamuel Tardieu2014-08-121-0/+2
* | Allow erasing of personal note on serverSamuel Tardieu2014-08-121-1/+1
* | Fixes #4158, No caches returned from OC.dersudev2014-08-121-2/+1
* | fix #4161: upload of personal note not workingSamuel Tardieu2014-08-121-3/+2
* | refactoring: move suppressWarnings from class level to method levelBananeweizen2014-08-112-12/+12
* | explicitly set context for layout editorBananeweizen2014-08-1164-82/+192
* | typoBananeweizen2014-08-101-1/+1
* | more strict checking of Maps API keyBananeweizen2014-08-101-6/+7
* | have shared moreunit settings for eclipseBananeweizen2014-08-102-3/+4
* | Merge branch 'release'rsudev2014-08-101-64/+64
|\ \ | |/
| * Merge pull request #4152 from rsudev/crowdin_translationsrsudev2014-08-101-64/+64
| |\
| | * crowdin: New translationsrsudev2014-08-101-64/+64
| |/
* | #4140: completely ignore EMMA in proguardBananeweizen2014-08-091-1/+2
* | Merge branch 'release'Bananeweizen2014-08-091-1/+1
|\ \ | |/
| * fix #4132: backport GPX test fixBananeweizen2014-08-091-4/+9
| * #4143: maybe avoid bad HTML parsing using HTML color codesBananeweizen2014-08-091-1/+1
* | enable proguard in gradle buildBananeweizen2014-08-091-2/+2
* | #4140: keep some test only classes in proguardBananeweizen2014-08-091-0/+5
* | #4140 disable play services due to blocking geodata callBananeweizen2014-08-091-3/+1
* | #4140 keep all cgeo code in proguardBananeweizen2014-08-091-1/+1