aboutsummaryrefslogtreecommitdiffstats
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release' into upstreamSamuel Tardieu2015-01-181-0/+2
|\
| * Update changelog_release.xmlLars2015-01-181-0/+2
| * Merge remote-tracking branch 'upstream/issue-2687' into releasersudev2015-01-181-3/+8
| |\
* | \ Merge branch 'issue-2687'rsudev2015-01-161-3/+8
|\ \ \ | | |/ | |/|
| * | Fixes #2687, OSM:Offline: After selecting new map it is opend at map center b...rsudev2015-01-161-3/+8
* | | Merge branch 'issue-4619' into upstreamSamuel Tardieu2015-01-163-18/+21
|\ \ \ | | |/ | |/|
| * | fix #4619: ANR when loading direction images for basic memberSamuel Tardieu2015-01-163-18/+21
| |/
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-161-0/+6
|\ \ | |/
| * Update changelog_release.xmlLars2015-01-151-0/+6
* | refactoring: move LocusDataStorageProvider to external source folderBananeweizen2015-01-153-2/+3
* | null annotations in apps, contacts, calendarBananeweizen2015-01-1511-53/+82
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-151-2/+11
|\ \ | |/
| * fix #4618: crash due to invalid Google Play serviceSamuel Tardieu2015-01-151-2/+11
* | refactoring: convert list app factory to actionproviderBananeweizen2015-01-157-112/+132
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-151-1/+1
|\ \ | |/
| * fix #4617: NPE in some cases when trackable cannot be foundSamuel Tardieu2015-01-151-1/+1
* | Merge branch 'issue-4481' into upstreamSamuel Tardieu2015-01-133-15/+80
|\ \ | |/
| * fix #4481: numerous images in description or log may lead to ANRSamuel Tardieu2015-01-132-14/+70
| * Share bitmaps in addition to sharing observablesSamuel Tardieu2015-01-131-1/+10
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-131-2/+2
|\ \ | |/
| * Changelog update and version brandingLars2015-01-121-2/+2
* | Merge branch 'release'rsudev2015-01-126-55/+82
|\ \ | |/
| * crowdin: New translationsrsudev2015-01-126-55/+82
* | Merge branch 'release'Bananeweizen2015-01-121-6/+6
|\ \ | |/
| * #4566: move voting menu item downBananeweizen2015-01-121-6/+6
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-1210-124/+211
|\ \ | |/
| * crowdin: New translationsSamuel Tardieu2015-01-1210-124/+211
* | Merge branch 'issue-4596' into upstreamSamuel Tardieu2015-01-122-15/+36
|\ \ | |/
| * fix #4596: UI delay when building the list of caches to refreshSamuel Tardieu2015-01-122-15/+36
| * Update changelog_release.xmlLars2015-01-121-0/+1
| * Merge branch 'issue-3078' into releaseSamuel Tardieu2015-01-121-2/+2
| |\
* | | Update changelog_release.xmlLars2015-01-121-0/+1
* | | use more automatic cleanup actions on save in EclipseBananeweizen2015-01-111-4/+4
* | | use static acccesBananeweizen2015-01-111-1/+1
* | | remove unnecessary nested elseBananeweizen2015-01-111-2/+1
* | | Merge branch 'issue-4608' into upstreamSamuel Tardieu2015-01-102-55/+41
|\ \ \ | |/ /
| * | fix #4608: own rating is saved even if vote could not be uploadedSamuel Tardieu2015-01-102-55/+41
* | | Merge branch 'issue-3078' into upstreamSamuel Tardieu2015-01-101-1/+1
|\ \ \ | | |/ | |/|
| * | Make the test the right waySamuel Tardieu2015-01-101-1/+1
* | | Merge branch 'issue-3078' into upstreamSamuel Tardieu2015-01-101-2/+2
|\ \ \ | |/ /
| * | fix #3078: live map should start at last position except in follow modeSamuel Tardieu2015-01-101-2/+2
| |/
* | Add TargetApi annotation to silence lint warningSamuel Tardieu2015-01-101-0/+1
* | use level21 for building and as targetBananeweizen2015-01-105-8/+12
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-0918-38/+22
|\ \ | |/
| * crowdin: New translationsSamuel Tardieu2015-01-0918-38/+22
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-091-2/+2
|\ \ | |/
| * Use %d instead of %s for cache countSamuel Tardieu2015-01-091-2/+2
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-091-0/+1
|\ \ | |/
| * Merge branch 'release' of github.com:cgeo/cgeo into releaseSamuel Tardieu2015-01-091-0/+1
| |\
| | * Update changelog_release.xmlLars2015-01-091-0/+1