aboutsummaryrefslogtreecommitdiffstats
path: root/main/src
Commit message (Collapse)AuthorAgeFilesLines
* Database updatekoem2013-05-031-2/+2
| | | | | * changed from O% to OC% - at least in OC caches the attributes seem to be the same (across sites) * changed english text
* Merge branch 'master' into issue2662-leichtes-kletternkoem2013-05-0124-207/+161
|\ | | | | | | | | Conflicts: .gitignore
| * #2684: use view injection libraryBananeweizen2013-05-0124-207/+161
| | | | | | | | * If you have compile errors after pulling, please consult the issue on github.
* | issue2662 OC: leichtes Kletternkoem2013-05-012-19/+20
|/
* Merge pull request #2678 from marco-jacob/scaleUploadImagesBananeweizen2013-04-283-1/+102
|\ | | | | fixes #2533 - added image scaling
| * fixes #2533 - added image scalingMarco Jacob2013-04-283-1/+102
| | | | | | | | | | | | | | | | modifications suggested by Bananeweizen next recommended changes and scaling now on leaving ImageSelectActivity fixed wrong spelling
* | refactoring: rename cgeo activity to MainActivityBananeweizen2013-04-285-15/+15
| | | | | | | | * this avoids compiler errors when using fully qualified class names as they all start with cgeo.subpackage
* | #2537 reduce memory usage of downloaded imagesBananeweizen2013-04-261-0/+1
|/
* Merge remote-tracking branch 'origin/release'Bananeweizen2013-04-241-2/+6
|\
| * #2675: remove superfluous separatorBananeweizen2013-04-241-2/+6
| | | | | | * non offline caches had a trailing separator
* | Merge remote-tracking branch 'origin/release'Bananeweizen2013-04-241-0/+1
|\ \ | |/
| * fix #2674: Disable trail on map does not refreshBananeweizen2013-04-241-0/+1
| |
* | Merge pull request #2673 from donEgro/releaseMarco Jacob2013-04-222-0/+11
|\ \ | | | | | | Fixed Issue #708 - Refresh caches + no internet = normal progress.
| * | Fixed Issue #708 - Refresh caches + no internet = normal progress.donEgro2013-04-222-0/+11
| | | | | | | | | Checking refresh in CacheDetailActivity, CachePopup and cgeocaches.
* | | code cleanup: remove JDT warningsBananeweizen2013-04-221-2/+2
| | |
* | | refactoring: move third party code into new source pathBananeweizen2013-04-227-2285/+0
| | | | | | | | | * makes it more easy to ignore warnings in third party code
* | | fix #2671: Don't show short description, if same as long descriptionBananeweizen2013-04-221-27/+51
| | |
* | | Merge pull request #2668 from donEgro/releaseSammysHP2013-04-202-0/+23
|\ \ \ | |/ / | | | Handle no network when refreshing caches, fixes #708
| * | Fixed Issue #708 - Refresh caches + no internet = normal progress.donEgro2013-04-202-0/+23
| | |
* | | fix #2664: List sorting does not respect localeBananeweizen2013-04-201-1/+26
| | |
* | | fixes #2651 - exclude inaccessable dirs from choiceMarco Jacob2013-04-101-1/+1
| | |
* | | Merge remote-tracking branch 'origin/release'Bananeweizen2013-04-081-17/+49
|\ \ \ | | |/ | |/|
| * | fix #2634: NPEs in ImageSelectActivityBananeweizen2013-04-081-17/+49
| | | | | | | | | * avoids 4 different NPEs
* | | Merge branch 'release' into upstreamSamuel Tardieu2013-04-072-8/+8
|\ \ \ | |/ /
| * | fix #2646: search input should be trimmedSamuel Tardieu2013-04-071-7/+7
| | |
| * | close #1106: ignore settings when searching for own cachesSamuel Tardieu2013-04-071-1/+1
| | | | | | | | | | | | | | | The infrastructure was there already, but one of the parameters was set incorrectly.
* | | fix #2640: Filter out stored caches Bananeweizen2013-04-071-0/+24
| | |
* | | Replace progress dialog by individual progress bars when loading imagesSamuel Tardieu2013-04-073-30/+8
| | |
* | | Merge branch 'release' into upstreamSamuel Tardieu2013-04-072-3/+608
|\ \ \ | |/ / | | | | | | | | | Conflicts: main/src/cgeo/geocaching/export/GpxExport.java
| * | Fixes #2635, crash during gpx exportrsudev2013-04-072-5/+15
| | | | | | | | | | | | Added utf-16 codepoint surrogate handling to xml serializer
| * | Failing test for #2635rsudev2013-04-071-1/+1
| | |
| * | Moved class to avoid ambiguity, compilable under api 4+rsudev2013-04-071-15/+16
| | |
| * | Added XML serializer from andorid sourcesrsudev2013-04-071-0/+594
| | |
* | | Put EXTRA parameters into the Intent classSamuel Tardieu2013-04-072-10/+8
| | |
* | | Rename EXTRAS_COORDS into the more correct EXTRA_COORDSSamuel Tardieu2013-04-072-5/+5
| | |
* | | Merge branch 'release' into upstreamSamuel Tardieu2013-04-071-1/+1
|\ \ \ | |/ /
| * | issue #2636: fix was incorrect, check for equality, not identitySamuel Tardieu2013-04-071-1/+1
| | |
* | | Merge branch 'release' into upstreamSamuel Tardieu2013-04-071-2/+14
|\ \ \ | |/ / | | | | | | | | | Conflicts: main/src/cgeo/geocaching/Geocache.java
| * | fix #2686: waypoint from notes are duplicated upon refreshSamuel Tardieu2013-04-071-2/+14
| | |
* | | Add method documentationSamuel Tardieu2013-04-071-1/+6
| | |
* | | Merge remote-tracking branch 'triakcz/wpt_distance' into upstreamSamuel Tardieu2013-04-073-0/+39
|\ \ \
| * | | Displaying note of waypoint on wpt popupTriakCZ2013-03-311-0/+1
| | | |
| * | | Displaying distance to waypoint on map popupTriakCZ2013-03-313-0/+38
| | | |
* | | | Merge remote-tracking branch 'origin/release'Bananeweizen2013-04-071-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | fix #2639: NPE in GPX parserBananeweizen2013-04-071-0/+3
| | | |
* | | | fix #2542: NPE when deleting list with all caches in itBananeweizen2013-04-071-34/+28
| | | |
* | | | refactoring: remove unused warnings on mandatory parametersSamuel Tardieu2013-04-071-2/+2
| | | |
* | | | refactoring: remove redundant type castsSamuel Tardieu2013-04-073-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | getParcelable() does not return a Parcelable, it returns a T where T is a generic type deriving from Parcelable. Those type casts will be done automatically and do not need to be spelled out explicitely.
* | | | refactoring: remove empty statementsSamuel Tardieu2013-04-072-5/+2
| | | |
* | | | refactoring: make API of AsyncTaskWithProgress more explicitBananeweizen2013-04-074-62/+119
| | | |