aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release' into upstreamSamuel Tardieu2014-09-101-1/+1
|\
| * Revert "Use the same properties in showcaseview"Samuel Tardieu2014-09-101-1/+1
| | | | | | | | This reverts commit 89b5653b322534449d64006c4861bc85be086cd5.
* | refactoring: remove double negationBananeweizen2014-09-101-2/+2
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2014-09-095-4/+5
|\ \ | |/
| * Use the same properties in showcaseviewSamuel Tardieu2014-09-091-1/+1
| |
| * Inherit JDK in Intellij IDEA filesSamuel Tardieu2014-09-093-3/+3
| |
| * Update changelog_release.xmlLars2014-09-091-0/+1
| |
* | fix #4337: remove ldpi action bar iconsBananeweizen2014-09-095-0/+0
| |
* | typoBananeweizen2014-09-091-1/+1
| |
* | fix #4336: better auto increase of waypoint nameBananeweizen2014-09-091-5/+7
| |
* | Name ignored catch parameter as suchSamuel Tardieu2014-09-0938-54/+54
| |
* | Include exception stack trace in error messageSamuel Tardieu2014-09-097-8/+8
| |
* | Make static field finalSamuel Tardieu2014-09-091-1/+1
| |
* | Do not reextract userToken for every kind of log we want to extractSamuel Tardieu2014-09-091-13/+15
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2014-09-081-0/+4
|\ \ | |/
| * Merge branch 'issue-4246' into releaseSamuel Tardieu2014-09-089-5/+5
| |\
| * | Update changelog_release.xmlLars2014-09-081-0/+4
| | |
* | | Typo in changelog_master.xmlLars2014-09-081-1/+1
| | |
* | | Update changelog_master.xmlLars2014-09-081-0/+5
| | |
* | | remove wrong settings from eclipse projectBananeweizen2014-09-081-1/+1
| | | | | | | | | | | | Static import favorites must be configured in the workspace settings unfortunately.
* | | findbugs: use explicit encodingBananeweizen2014-09-073-26/+30
| | |
* | | Merge branch 'issue-4246' into upstreamSamuel Tardieu2014-09-079-5/+5
|\ \ \ | | |/ | |/|
| * | Use goto icon rather than mapSamuel Tardieu2014-09-079-5/+5
| |/ | | | | | | Work on #4246.
* | fix some findbugs issuesBananeweizen2014-09-079-30/+40
| |
* | fix #4312: OOM in Jenkins findbugsBananeweizen2014-09-072-4/+5
| |
* | verify waypoint name change on type changeBananeweizen2014-09-071-2/+30
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2014-09-071-0/+1
|\ \ | |/
| * Disable HW acceleration for Samsung Galaxy SII Plus (#4265)Samuel Tardieu2014-09-071-0/+1
| |
* | fix #4076: first UI tests with espressoBananeweizen2014-09-078-10/+232
| |
* | static imports for Espresso tests in EclipseBananeweizen2014-09-072-2/+19
| |
* | refactoring: use interface types instead of implementationBananeweizen2014-09-071-2/+2
| |
* | fix compiler warningBananeweizen2014-09-071-1/+1
| |
* | use new instrumentation test runnerBananeweizen2014-09-075-5/+123
| | | | | | | | | | | | | | | | | | | | For Espresso UI tests it is required to use a newer Google instrumentation test runner, but that one doesn't support junit reports. Therefore let's have our own derived test runner, which supports junit reports. This change will break existing Eclipse launch configurations for unit tests. You have to select the new junit runner in the launch config afterwards.
* | Remove benchmark from earlier versionSamuel Tardieu2014-09-061-151/+2
| | | | | | | | | | There is no need to keep comparaison with the earlier version now that we know that this one works well.
* | Upgrade to RxJava 0.20.4Samuel Tardieu2014-09-0620-8/+8
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2014-09-061-17/+17
|\ \ | |/ | | | | | | Conflicts: main/AndroidManifest.xml
| * fix #4322: do not react on screen size changeSamuel Tardieu2014-09-061-18/+18
| | | | | | | | | | Since we now target Android >= 3.2, it is necessary to specify that screen size configuration changes are also handled by the activity.
* | import lab caches as virtualBananeweizen2014-09-064-11/+266
| |
* | fix #4244: different zoom for normal map and map of single cacheBananeweizen2014-09-063-4/+43
| |
* | fix #4323: use cache icon and name as activity titleBananeweizen2014-09-054-20/+28
| | | | | | | | | | * cache details activity * compass activity * static maps activity
* | avoid repeated cache loadingBananeweizen2014-09-051-2/+2
| |
* | remove private intent extra constantsBananeweizen2014-09-052-7/+5
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2014-09-052-1/+2
|\ \ | |/
| * fix #4284: Upload coordinates has bad titleMathieu Alorent2014-09-052-1/+2
| | | | | | | | add a new waypoint_ string
* | fix #4252: allow logging from compass of waypointBananeweizen2014-09-045-76/+87
| |
* | Merge branch 'issue-4260' into upstreamSamuel Tardieu2014-09-044-2/+16
|\ \ | | | | | | | | | | | | Conflicts: main/src/cgeo/geocaching/sorting/DistanceComparator.java
| * | fix #4260 & #3194: sort and resort problemsMathieu Alorent2014-09-044-3/+18
| |/ | | | | | | | | | | This fixes: - #4260: sort by distance doesn't work - #3914: resorting of event lists doesn't work
* | Merge branch 'release' into upstreamSamuel Tardieu2014-09-041-1/+1
|\ \ | |/
| * Fix #4300 Updated Locus decriptionLars2014-09-031-1/+1
| | | | | | Copied from the first line of the Locus PlayStore description.
* | Merge branch 'waypoint-fixes' of git://github.com/chkr-private/cgeo into ↵Samuel Tardieu2014-09-041-6/+4
|\ \ | | | | | | | | | upstream
generated by cgit v1.1 at 2025-11-18 06:30:17 +0000