aboutsummaryrefslogtreecommitdiffstats
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* reduce memory usage for cache listsBananeweizen2013-02-147-72/+107
| | | | | * lazily load some of the strings in caches * remove latlon, it was never used except in parsing itself * change some collection handling to avoid huge memory hogs
* Detail View: moved list box under offline boxkoem2013-02-141-41/+34
|
* new: filter by cache origin (website)Bananeweizen2013-02-134-0/+50
|
* Merge branch 'release'Bananeweizen2013-02-132-1/+39
|\ | | | | | | | | | | | | Conflicts: main/res/values/strings.xml main/src/cgeo/geocaching/CacheDetailActivity.java main/src/cgeo/geocaching/cgeotrackable.java
| * fix #2475: don't crash at link anchorsBananeweizen2013-02-133-3/+42
| |
| * Version Infomucek42013-02-071-2/+2
| |
| * Change log update release branchLars2013-02-061-0/+6
| |
* | new var instead of reassigning input parameterkoem2013-02-131-5/+5
| |
* | Merge branch 'master' into chooselistkoem2013-02-13175-1164/+4370
|\ \
| * \ Merge branch 'master' into oc_iconskoem2013-02-1266-8/+28
| |\ \ | | | | | | | | | | | | | | | | - changed icons - repaired test class
| * | | Unit-Tests ++koem2013-02-125-14/+19
| | | | | | | | | | | | | | | | - and Maintenance Icon Color changed to alert-red
| * | | merge conflictkoem2013-02-111-16/+16
| |\ \ \
| * | | | Icons for OCkoem2013-02-11174-1165/+4366
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - new icons for opencaching - changed some icons because of copyright - english strings for opencaching attributes - german strings for opencaching attributes - new script to show (missing) strings for attributes - new script to edit svg files from thenounproject.com - new script to generate enums - ocicons.html: list of all OC icons
* | | | | Merge branch 'master' into chooselistkoem2013-02-134-2/+22
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #2470 from marco-jacob/updateMapIconsMarco Jacob2013-02-111-1/+3
| |\ \ \ \ | | | | | | | | | | | | fixes #2436 - new colletion type needs remove on old cache instance
| | * | | | fixes #2436 - new colletion type needs remove on old cache instanceMarco Jacob2013-02-111-1/+3
| | | |/ / | | |/| |
| * | | | Fix #2348, Cache description is missing for OC0537rsudev2013-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | Added failing testcase and fixed modifiedsince in query-string
| * | | | Fix #2441, Owner information not shown for OC.de cachesrsudev2013-02-112-1/+11
| | | | | | | | | | | | | | | | | | | | Extended oc connector to return owner state as well
| * | | | #2441: cache owner information for OCBananeweizen2013-02-111-0/+8
| |/ / /
* | | | Merge branch 'master' into chooselistkoem2013-02-112-17/+17
|\ \ \ \ | |/ / /
| * | | #2347: fix bad attribute mappingBananeweizen2013-02-091-1/+1
| | | |
| * | | remove blanksSchorti2013-02-081-16/+16
| |/ / | | | | | | | | | removing blanks
* | | Merge branch 'master' into chooselistkoem2013-02-081-1/+1
|\ \ \ | |/ /
| * | Fix #2459, Attended is not detected as found for OCrsudev2013-02-071-1/+1
| | | | | | | | | | | | Extended parser to detect the additional logtype
* | | issue #275 - Move to other list from cache screenkoem2013-02-0814-92/+323
|/ / | | | | | | and: choose list when storing
* | Merge remote-tracking branch 'origin/release'Bananeweizen2013-02-061-1/+1
|\ \ | |/
| * fix #2451, bad pattern for cache count parsingBananeweizen2013-02-061-1/+1
| |
* | refactoring: minor rename of resourcesBananeweizen2013-02-054-2/+2
| |
* | Use a standard Callable interface for lazy initialized listsSamuel Tardieu2013-02-032-22/+27
| |
* | Restrict LazyInitializedList to the List interfaceSamuel Tardieu2013-02-036-23/+29
| | | | | | | | | | This way, we can use various types of list at various places without specifically needing a LazyInitializedList.
* | Make LazyInitializedList<E> a List<E>Samuel Tardieu2013-02-033-56/+20
| |
* | Refactoring: rename cgCache into GeocacheSamuel Tardieu2013-02-0399-492/+492
| |
* | Remove useless importSamuel Tardieu2013-02-031-1/+0
| |
* | Refactoring: use static initializationSamuel Tardieu2013-02-031-5/+5
| |
* | Remove obsolete javadocSamuel Tardieu2013-02-031-11/+0
| |
* | Use two methods to do two different thingsSamuel Tardieu2013-02-031-99/+93
| | | | | | | | | | Checking the parameters nullness to determine the function to perform is a bad practice.
* | Refactoring: simplify variable computationSamuel Tardieu2013-02-031-14/+3
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2013-02-031-1/+1
|\ \ | |/
| * fix #2444: wrong "light theme" French translationSamuel Tardieu2013-02-031-1/+1
| |
| * Revert "Keep the Waypoint Ids stable. Fixes #2341"Samuel Tardieu2013-01-291-6/+3
| | | | | | | | | | | | | | This reverts commit 6335693959709d1d1f6cd08379e70b726731809a. The fix caused problems that were partially fixed in the master branch, but the changes are too broad to integrate in the release branch.
* | Restore background color for light themeSamuel Tardieu2013-02-031-0/+1
| |
* | don't load image urls when getting OC cache listsBananeweizen2013-02-031-5/+5
| |
* | respect exclude options when searching OC cachesBananeweizen2013-02-031-7/+20
| |
* | Adding missing german translationLars2013-02-021-0/+2
| |
* | Remove background attributes on layoutsSamuel Tardieu2013-02-0229-44/+15
| | | | | | | | | | | | If a background attribute is set on both a layout and a theme, the background is drawn twice. Since our themes define a background color, there is no need to set it on individual layouts too.
* | #2347: map common cache attributes of opencachingBananeweizen2013-02-022-3/+388
| |
* | change wording from "GC code" to "geo code"Bananeweizen2013-02-0117-48/+30
| |
* | new: log images for opencaching.deBananeweizen2013-02-012-7/+33
| |
* | Merge pull request #2438 from RomNexus6/patch-37Bananeweizen2013-02-011-0/+4
|\ \ | | | | | | updated translation-it to jan-30
| * | updated translation-it to jan-30RomNexus62013-01-311-0/+4
| | | | | | | | | jan-30 included