aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | | | | | | | | | | | The forced redrawing of a text view caused by settings of text is a lengthy operation. When we do it for every image, we might end up with hundredths of operations waiting to do the same thing, with only the first few ones being actually useful because images won't change afterwards. We now use a queue to ensure that consecutive redraw orders are done as one operation.
| * Share bitmaps in addition to sharing observablesSamuel Tardieu2015-01-131-1/+10
| | | | | | | | | | | | | | | | BitmapDrawable objects can be shared and reused. Sharing drawables ensures that we load the resources only once, but when drawing the result we can as well share the drawables. Part of work on #4481.
* | 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
|\ \ | |/
| * Merge pull request #4613 from rsudev/crowdin_translationsrsudev2015-01-126-55/+82
| |\ | | | | | | crowdin: New translations
| | * 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
| | | | | | | | | | | | | | | | | | | | The list of caches to refresh was partitioned into caches already having static maps and others, the later being prioritized in the refresh. This computation was done on the UI thread, which led to a pause for large lists. The list building in now done in the background, with emission of caches to refresh as soon as possible to reduce the user wait.
| * Update changelog_release.xmlLars2015-01-121-0/+1
| | | | | | Manual alignment of branches as first commit was made on wrong branch.
* | Update changelog_release.xmlLars2015-01-121-0/+1
| | | | | | #3078
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-120-0/+0
|\ \ | |/
| * Merge branch 'issue-3078' into releaseSamuel Tardieu2015-01-121-2/+2
| |\
* | | use more automatic cleanup actions on save in EclipseBananeweizen2015-01-114-39/+49
| | |
* | | pass ProcessUtils test on Genymotion lollipop emulatorBananeweizen2015-01-111-2/+2
| | |
* | | avoid locale dependency in GeocoderTestBananeweizen2015-01-111-1/+2
| | |
* | | replace stub classes by .gitkeep filesBananeweizen2015-01-114-15/+0
| | |
* | | 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
| | |
* | | Intellij IDEA: make unnecessary qualified full name a weak warningSamuel Tardieu2015-01-101-1/+1
| | |
* | | 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
| | | | | | | | | | The constant, introduced in API 19, will be resolved at compile time and does not need to be present at runtime.
* | use level21 for building and as targetBananeweizen2015-01-107-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | * Set targetSdk of main application to 21. This disables compatibility modes as described in http://developer.android.com/reference/android/os/Build.VERSION_CODES.html#LOLLIPOP and http://developer.android.com/reference/android/os/Build.VERSION_CODES.html#KITKAT_WATCH * Set compile target to 21 for main app and play services. * Suppress deprecation warnings, as there is no replacement for the deprecated API on lower API levels. Tested with Eclipse and Ant, on a 4.4 and 5.0.2 device. IDEA probably needs further changes.
* | update MapsWithMe integrationBananeweizen2015-01-105-46/+17
| | | | | | As they removed the light version, some wording changed.
* | fix some lint warnings and Findbugs in test projectBananeweizen2015-01-102-13/+29
| |
* | DEX sometimes complains about multiple class definitionsBananeweizen2015-01-102-2/+2
| | | | | | Just rename the stub classes to avoid this.
* | 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
| | |
* | | Merge branch 'release' into upstreamSamuel Tardieu2015-01-090-0/+0
|\ \ \ | |/ /
| * | Clear changelog_masterSamuel Tardieu2015-01-091-3/+0
|/ /
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-091-2/+7
|\ \ | |/
| * Remove doubled entry from changelogLars2015-01-091-1/+0
| |
| * Changlog update and resortingLars2015-01-091-2/+8
| |
generated by cgit v1.1 at 2025-11-18 06:29:13 +0000