aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1814 from YraFyra/newSammysHP2012-06-221-4/+18
|\ | | | | Updated swedish translation
| * Updated swedish translationYraFyra2012-06-221-4/+18
|/ | | | Updated swedish translation with labels from the last weeks.
* Merge pull request #1803 from RomNexus6/patch-30SammysHP2012-06-191-1/+1
|\ | | | | updated localization-it after #1751
| * updated localization-it after #1751RomNexus62012-06-191-1/+1
|/
* Merge pull request #1799 from Lineflyer/masterLars2012-06-182-2/+5
|\ | | | | Strings for #1751
| * Correction of english prompts for #1751 and grammar correctionLars2012-06-181-2/+2
| |
| * German strings for #1751Lars2012-06-181-0/+3
|/
* Merge pull request #1797 from RomNexus6/patch-29Lars2012-06-181-0/+3
|\ | | | | Updated localization-it after merge pull #1571
| * Updated localization-it after merge pull #1571RomNexus62012-06-181-0/+3
|/
* Merge branch 'release' into upstreamSamuel Tardieu2012-06-181-1/+1
|\ | | | | | | | | Conflicts: main/res/values/strings.xml
| * Merge remote-tracking branch 'upstream/issue-1709' into releaseSamuel Tardieu2012-06-188-65/+172
| |\
| * \ Merge remote-tracking branch 'upstream/fix1757and1758' into releaseSamuel Tardieu2012-06-181-19/+26
| |\ \
| * | | Version Info for Playmucek42012-06-182-2/+2
| | | |
* | | | Merge branch 'issue-1709' into masterrsudev2012-06-173-31/+89
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | Conflicts: main/src/cgeo/geocaching/DirectionProvider.java main/src/cgeo/geocaching/ui/CacheListAdapter.java
| * | | fix #1709: reduce update frequency of position overlay for mapStephan Merker2012-06-172-30/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - update only if location changed > 1% of map width or heading >15° - update at most every half second - reduces battery consumption and makes mapsforge 0.3.0 maps usable at all on certain phones like Nexus S - fixed redraw issue for followMyLocation
| * | | Put angle-related utilities into their own packageSamuel Tardieu2012-06-176-35/+84
| |/ / | | | | | | | | | | | | | | | | | | Also, use float instead of double for every angle computation. Conflicts: main/src/cgeo/geocaching/ui/CacheListAdapter.java
* | | Merge branch 'release' into upstreamSamuel Tardieu2012-06-171-1/+18
|\ \ \ | |/ / | | | | | | | | | Conflicts: main/res/values/strings.xml
| * | Fix #1790: use correct freshness information for picturesSamuel Tardieu2012-06-171-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some filesystems and Android versions, the "last modified" data on files cannot be modified after the file has been initially created. Since we use this information to indicate that a cached image has been refreshed, this could fail on some devices. Now, we use a degraded version of File#setLastModified if it returns false. This goes through an intermediate copy, but is always much more faster than getting the file from the network connection and saving it on the local storage.
| * | Change log update release branchLars2012-06-171-0/+1
| | |
* | | Clear overlays cache to help with bitmap memory pressureSamuel Tardieu2012-06-171-3/+5
| | | | | | | | | | | | | | | The overlays cache can be rebuilt once per activity view. We can free the bitmap memory when we are not displaying overlays.
* | | Merge pull request #1571 from triakcz/bluetooth_gpx_sharingBananeweizen2012-06-175-6/+103
|\ \ \ | | | | | | | | GPX export sharing menu after successful export
| * | | Removed GPX export setting from settingsOndřej Kunc2012-06-113-32/+1
| | | | | | | | | | | | | | | | (It's in export settings dialog)
| * | | GPX export sharing via bluetooth, gmail ...Ondřej Kunc2012-06-116-6/+134
| | | |
* | | | Refactoring: remove redundant initializersSamuel Tardieu2012-06-171-2/+2
| | | | | | | | | | | | | | | | The initial null value is always overriden later.
* | | | Do not create an intermediate SearchResultSamuel Tardieu2012-06-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Building the SearchResult through the Parcelable deconstructor makes a unique entity already, which doesn't share data with others. We have no need to go through the copy constructor.
* | | | Factor out method to replace content of cache list by search resultSamuel Tardieu2012-06-171-22/+17
| | | | | | | | | | | | | | | | This is an aftermath of pull request #1777.
* | | | Merge pull request #1785 from triakcz/live_map_from_search_resultBananeweizen2012-06-171-3/+0
|\ \ \ \ | | | | | | | | | | Permit to enable live map in every map
| * | | | Permit to enable live map in every mapOndřej Kunc2012-06-141-3/+0
| | | | |
* | | | | Merge pull request #1777 from Portree-Kid/better-list-loadingBananeweizen2012-06-161-2/+16
|\ \ \ \ \ | | | | | | | | | | | | Better async loading of caches
| * | | | | Better async loading of cachesPortree-Kid2012-06-121-2/+16
| | | | | |
* | | | | | Merge branch 'release' into upstreamSamuel Tardieu2012-06-173-7/+23
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: main/res/values-cs/strings.xml main/res/values/strings.xml
| * | | | | Fix #1751: set language to EnglishSamuel Tardieu2012-06-172-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using a simpler page and putting a referer seems to make the process more reliable.
| * | | | | Translation change #1784 also for release branchLars2012-06-151-3/+3
| | | | | |
| * | | | | Merge pull request #1769 from Lineflyer/releaseLars2012-06-101-0/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | Change log update for release branch
| | * | | | | Change log update for release branchLars2012-06-101-0/+4
| |/ / / / /
* | | | | | fix #1788: 2 Links in settings are unclickableBananeweizen2012-06-162-7/+3
| | | | | |
* | | | | | Merge pull request #1784 from triakcz/fix_translation_live_mapLars2012-06-141-3/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Minor czech translation fixes
| * | | | | Minor czech translation fixesOndřej Kunc2012-06-141-3/+3
|/ / / / /
* | | | | Change log update for #374Lars2012-06-121-0/+1
| |/ / / |/| | |
* | | | Merge pull request #1776 from Lineflyer/masterLars2012-06-121-2/+5
|\ \ \ \ | |_|/ / |/| | | Update change log for master
| * | | Update change logLars2012-06-121-2/+5
|/ / /
* | | Merge remote-tracking branch 'campbeb/fix315' into upstreamSamuel Tardieu2012-06-117-85/+148
|\ \ \
| * | | Display cache and waypoint information on compasscampbeb2012-06-087-85/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For caches: displays difficulty, terrain, and size. For waypoints: displays waypoint type. For direct navigation: displays nothing. Also includes some refactoring in the code used do display information about caches and waypoints.
* | | | Merge remote-tracking branch 'campbeb/fix1757and1758' into upstreamSamuel Tardieu2012-06-101-19/+26
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: main/src/cgeo/geocaching/maps/CGeoMap.java
| * | | Perform live map operations on caches in viewport not last searchcampbeb2012-06-091-19/+26
| | |/ | |/| | | | | | | | | | | | | | | | Live map operations (store offline and show as list) were being performed on last search results obtained instead of on caches shown on screen. Fixes #1757 and #1758.
* | | Merge pull request #1753 from marco-jacob/issue#1725Bananeweizen2012-06-105-1/+29
|\ \ \ | | | | | | | | fixes #1725: no static maps apps as default nav app
| * | | fixes #1725: no static maps apps as default nav appMarco Jacob2012-06-085-1/+29
| | | |
* | | | refactoring: minor reformattingBananeweizen2012-06-091-12/+8
| | | |
* | | | Merge remote-tracking branch 'Portree-Kid/master-9'Bananeweizen2012-06-091-10/+20
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into master-9Portree-Kid2012-06-084-1/+13
| |\ \ \ \ | | |/ / /