aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release' into upstreamSamuel Tardieu2013-05-201-2/+4
|\ | | | | | | | | Conflicts: main/res/values/strings_not_translatable.xml
| * Merge branch 'fix-2733' into releaseSamuel Tardieu2013-05-207-117/+77
| |\
| * | Version infoLars2013-05-181-1/+1
| | |
* | | refactoring: class path changed with ADT 22Bananeweizen2013-05-193-0/+3
| | | | | | | | | | | | * If you run into compile errors after this change, please upgrade to ADT 22 and Android SDK 22.
* | | Fixes #2748, Field-Notes export does no longer workrsudev2013-05-191-1/+1
| | | | | | | | | | | | Corrected close order for writer and buffer
* | | Merge branch 'fix-2741' into upstreamSamuel Tardieu2013-05-191-0/+10
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: main/src/cgeo/geocaching/CompassActivity.java
| * | | fix #2741: some devices do not have a magnetic field sensorSamuel Tardieu2013-05-191-0/+10
| |/ /
* | | Merge pull request #2719 from campbeb/fix2714Bananeweizen2013-05-192-9/+30
|\ \ \ | | | | | | | | Fix #2714 - Support imperial units in compass speech
| * | | Fix #2714 - Support imperial units in compass speechcampbeb2013-05-122-9/+30
| | | | | | | | | | | | | | | | Fixes #2714
* | | | Merge branch 'fix-2733' into upstreamSamuel Tardieu2013-05-192-0/+24
|\ \ \ \ | | |_|/ | |/| |
| * | | fix: parse basic member sizeSamuel Tardieu2013-05-192-0/+5
| | | | | | | | | | | | | | | | Part of work on #2733.
| * | | fix: parse basic member difficulty and terrainSamuel Tardieu2013-05-192-0/+19
| | | | | | | | | | | | | | | | Part of work on #2733.
* | | | Merge branch 'fix-2733' into upstreamSamuel Tardieu2013-05-198-117/+56
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: main/res/values/strings_not_translatable.xml
| * | | enhancement: make the distance comparator work with approximate distanceSamuel Tardieu2013-05-191-9/+5
| | | | | | | | | | | | | | | | Part of work on #2733.
| * | | enhancement: share direction images for basic membersSamuel Tardieu2013-05-193-49/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the regular images cache for basic members direction images in cache list. Part of work on #2733.
| * | | refactoring: share the name of the shared image directorySamuel Tardieu2013-05-191-1/+2
| | | | | | | | | | | | | | | | Part of work on #2733.
| * | | fix #2733: acquire distance and direction for basic membersSamuel Tardieu2013-05-185-57/+32
| | | | | | | | | | | | | | | | | | | | A recent change in geocaching.com way of presenting the distance and direction information for basic members requires a new parsing.
| * | | fix: do not reset the distance in the distance comparatorSamuel Tardieu2013-05-181-4/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | The distance comparator should not override a distance that can have been obtained from the website and that we are unable to recompute locally (because we don't know the cache coordinates for example). Part of work on #2733.
| * | Release note updateLars2013-05-171-0/+5
| | |
* | | Merge pull request #2732 from campbeb/fix2721SammysHP2013-05-1713-63/+75
|\ \ \ | | | | | | | | Fix #2721 - Correct link to manual
| * | | Fix #2721 - Correct link to manualcampbeb2013-05-1513-63/+75
| | | | | | | | | | | | | | | | | | | | Also, removed unused links from strings.xml files to make it clear where the link is coming from
* | | | Revert "Merge pull request #2739 from campbeb/fix_overdraw"SammysHP2013-05-1725-1/+29
| | | | | | | | | | | | | | | | | | | | This reverts commit eb360a18a1b9a2e560b00d4584cf79f52040acec, reversing changes made to 76a7404e536047dd74721ac9c89fd10a8a2dd16d.
* | | | Add logo SVG version (without text)SammysHP2013-05-173-0/+432
| | | |
* | | | Merge pull request #2739 from campbeb/fix_overdrawcampbeb2013-05-1725-29/+1
|\ \ \ \ | | | | | | | | | | Fix Overdraw
| * | | | Fix Overdrawcampbeb2013-05-1625-29/+1
|/ / / / | | | | | | | | | | | | | | | | The background was being redrawn several times over as each activity was drawing it rather than inheriting from the theme
* | | | Merge branch 'release' into upstreamSamuel Tardieu2013-05-162-0/+22
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: main/res/values/strings_not_translatable.xml
| * | | Work around installation issues on tablets by supporting xlargeScreensSamuel Tardieu2013-05-161-0/+1
| | | |
| * | | Version Infomucek42013-05-161-0/+5
| | | |
* | | | Merge remote-tracking branch 'upstream/release' into currdevrsudev2013-05-162-4/+7
|\ \ \ \ | |/ / /
| * | | Fixes #2731, Zero caches on live maprsudev2013-05-162-4/+7
| | | | | | | | | | | | | | | | -changed to new url for tile server, added app-info for counting our traffic
| * | | Version INFOmucek42013-05-131-1/+1
| | | |
* | | | Add missing newline in New Features listcampbeb2013-05-151-1/+1
| |/ / |/| |
* | | Merge pull request #2726 from RomNexus6/patch-42SammysHP2013-05-141-0/+9
|\ \ \ | | | | | | | | updated translation-it
| * | | updated translation-itRomNexus62013-05-141-0/+9
|/ / /
* | | Fixes #2715, NPE when activiating menu on maprsudev2013-05-132-0/+2
| |/ |/| | | | | Additionally fixed single select group in map sources menu
* | Merge pull request #2718 from Lineflyer/masterSammysHP2013-05-121-5/+4
|\ \ | | | | | | Change log update master branch
| * | Update strings_not_translatable.xmlLars2013-05-121-5/+4
|/ / | | | | | | | | | | #2712 #2709 #2710 #1781
* | translation: add French strings for talking compassSamuel Tardieu2013-05-111-1/+6
| |
* | new: link to market place in about activityBananeweizen2013-05-113-0/+28
| |
* | change: market launchesBananeweizen2013-05-111-7/+9
| | | | | | | | * return to c:geo more quickly independent of market app state * show app pages directly without a package search
* | fix #2712: Enable personal note editing for unstored cachesBananeweizen2013-05-112-23/+63
| |
* | #1348: use buffered ioBananeweizen2013-05-119-42/+55
| |
* | refactoring: use AnchorAwareLinkMovementMethod everywhereBananeweizen2013-05-113-11/+10
| | | | | | | | * bad HTML input might occur in all places * so better safe than sorry
* | refactoring: handle potential parsing exceptionBananeweizen2013-05-111-1/+5
| |
* | refactoring: explicit constructor not neededBananeweizen2013-05-111-4/+0
| |
* | #2709: use note log type, if attendedBananeweizen2013-05-111-3/+8
| |
* | Merge pull request #2711 from YraFyra/translationSammysHP2013-05-101-1/+17
|\ \ | | | | | | Update of Swedish translation
| * | Update of Swedish translationYraFyra2013-05-101-1/+17
|/ /
* | #2710: speech output in compassBananeweizen2013-05-1010-2/+251
| |
* | refactoring: avoid magic constantsBananeweizen2013-05-101-16/+13
| |