aboutsummaryrefslogtreecommitdiffstats
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* cleaned up resource strings for importing gpxStephan Merker2011-11-0513-20/+14
| | | | | - gpx_import_loading -> gpx_import_loading_caches - removed gpx_import_loading_stored - cleaned up consistently through all translations
* Remove unused translationSammysHP2011-11-0510-10/+0
| | | "gpx_import_loading_stored"
* Update German translation.SammysHP2011-11-052-2/+11
| | | Also fix some mistakes in English translation.
* Switch order of D/T and size in cache-lists.SammysHP2011-11-051-10/+9
| | | | | D/T should be more important than the size and on small displays a lot of the info-line is clipped. Also some details are mostly never shown. Additional: Remove a double assignment.
* Coord-format-methods from cgBase deprecated.SammysHP2011-11-051-0/+4
| | | Use GeopointFormatter instead.
* Revert German size-translationsSammysHP2011-11-051-5/+5
| | | See d5f18c8b607edb54a338130cf8415a72e0558bb2 for reference.
* fix GPX import: state field can be emptyBananeweizen2011-11-051-4/+7
|
* Merge branch 'master' of ↵Bananeweizen2011-11-045-266/+329
|\ | | | | | | https://Bananeweizen@github.com/cgeo/c-geo-opensource.git
| * refactoring for #310bananeweizen2011-11-045-266/+329
| | | | | | | | | | | | * split import into 2 activies (files and mails) * move non activity stuff into new class * split tests accordingly * fix manifest
* | fix #751: wrong cache type in searchBananeweizen2011-11-041-1/+1
|/
* additional refactoring of #723Bananeweizen2011-11-031-50/+47
|
* Merge pull request #723 from MentalDisruptor/masterBananeweizen2011-11-021-25/+51
|\ | | | | A little refactoring on CGeoMap, fixes "//FIXME should be members of LoadTimer since started by it."
| * refs //FIXME should be members of LoadTimer since started by it.Kai Stempfle2011-10-291-25/+51
| | | | | | | | - moved class variables to LoadTimer - implemented setters and getters
* | Merge pull request #743 from samueltardieu/cache-imagesBananeweizen2011-11-023-31/+9
|\ \ | | | | | | Cache images systematically
| * | Cache images systematicallySamuel Tardieu2011-11-013-31/+9
| | | | | | | | | | | | See discussion in #742.
* | | Updated Slovak translationPavol Babincak2011-11-021-4/+15
| | |
* | | new: import caches from unknown source, fixes #720Bananeweizen2011-11-014-16/+60
| | |
* | | remove useless version comments from stringsBananeweizen2011-11-0111-140/+140
| | |
* | | Merge remote branch 'stephanme/importwpt'Bananeweizen2011-11-017-230/+300
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: main/src/cgeo/geocaching/files/GPXParser.java main/src/cgeo/geocaching/files/LocParser.java tests/src/cgeo/geocaching/files/LocParserTest.java
| * | | fix #714: Progress bar wrong when importing gpx with waypointsStephan Merker2011-10-307-228/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - moved file handling from GPXParser to cgeopgxes - streamlined LocParser with GPXParser - removed cache counting in favor of progress bar - added error dialog if import went wrong - fixed stream handling when importing attachement
| * | | Added tests for importing GPX and LOC filesStephan Merker2011-10-301-15/+39
| | | | | | | | | | | | | | | | - refactored import classes in cgeogpxes so that they can be tested
* | | | Update French translationSamuel Tardieu2011-11-011-0/+2
| |/ / |/| |
* | | Decode images that are not saved to diskSamuel Tardieu2011-11-011-0/+11
| | | | | | | | | | | | This fixes #742.
* | | Merge branch 'master' of ↵Bananeweizen2011-11-015-9/+12
|\ \ \ | | | | | | | | | | | | https://Bananeweizen@github.com/cgeo/c-geo-opensource.git
| * | | Update log messages to reflect the source class nameSamuel Tardieu2011-11-011-5/+5
| | | |
| * | | Merge branch 'release' into upstreamSamuel Tardieu2011-11-014-4/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: main/AndroidManifest.xml main/res/values/strings.xml main/src/cgeo/geocaching/cgBase.java main/src/cgeo/geocaching/maps/CGeoMap.java
| | * | | Decode direction image URL in order to be able to download itSamuel Tardieu2011-11-012-2/+2
| | | | | | | | | | | | | | | | | | | | This fixes #732.
| | * | | Versionmucek42011-10-312-2/+5
| | | | |
| | * | | Fixes #726, Save for offline not possible on live maprsudev2011-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | - corrected logic error introduced in d558334501d1ed9d1becc6be55058d4ded793bb7
| | * | | Version 30.10.2011mucek42011-10-292-3/+4
| | | | |
* | | | | fix #741: no more caches button still loads next pageBananeweizen2011-11-011-38/+4
|/ / / /
* | | | rename scan label in main menu, fixes #740Bananeweizen2011-11-018-8/+3
| | | | | | | | | | | | | | | | | | | | * Renamed label to force translators to change the value * Now explicitly says "geo code" instead of the more technically "QR code"
* | | | avoid NPE when accessing cache type, #737bananeweizen2011-10-312-5/+18
| | | |
* | | | new: cache count after "more caches" label, fixes #730bananeweizen2011-10-312-8/+8
| | | |
* | | | fix #728: replace image_not_loaded with better suited iconbananeweizen2011-10-311-0/+0
| | | | | | | | | | | | | | | | I'm not sure about the size. But we can easily replace this one with the same image at higher resolution, if needed.
* | | | remove identical files from hdpi folderbananeweizen2011-10-313-0/+0
| | | |
* | | | Merge remote branch 'remotes/blafoo692/issue692'rsudev2011-10-3166-1135/+1743
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: main/src/cgeo/geocaching/apps/cache/navi/InternalMap.java main/src/cgeo/geocaching/cgBase.java main/src/cgeo/geocaching/cgCache.java main/src/cgeo/geocaching/cgData.java main/src/cgeo/geocaching/cgeoapplication.java main/src/cgeo/geocaching/cgeodetail.java main/src/cgeo/geocaching/maps/CGeoMap.java
| * | | | deprecatedblafoo2011-10-302-1/+5
| | | | |
| * | | | No direct access to fieldsblafoo2011-10-2667-1145/+1751
| | | | |
* | | | | fix #731: OOM in images when downloadingbananeweizen2011-10-305-57/+62
| |_|/ / |/| | |
* | | | Fixes #726, Save for offline not possible on live maprsudev2011-10-301-1/+1
| | | | | | | | | | | | | | | | - corrected logic error introduced in d558334501d1ed9d1becc6be55058d4ded793bb7
* | | | fix #722: cache list updated after storing new cachesbananeweizen2011-10-301-2/+10
| | | |
* | | | strings.xml and Maniferst as resoult of new Marker versionmucek42011-10-302-3/+6
| | | |
* | | | Fixing #113 for Mapsforge as wellrsudev2011-10-293-13/+23
| |_|/ |/| | | | | - removing wrong method invalidate from MapViewImpl
* | | show waypoint name as map title when navigating to waypointbananeweizen2011-10-283-4/+7
| | |
* | | Merge branch 'release' into upstreamSamuel Tardieu2011-10-282-5/+16
|\ \ \ | | |/ | |/|
| * | fix #721: event dates not parsedbananeweizen2011-10-282-4/+9
| | |
| * | Mark statements as destroyed when they areSamuel Tardieu2011-10-281-0/+2
| | |
| * | Compile error.mucek42011-10-261-2/+1
| | |
| * | RC version, test team addedmucek42011-10-262-4/+16
| | |