aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Czech OC attributes translation by Zazulienkatriakcz2013-02-141-5/+65
| | | | and fixed wrong translation of disabled cache
* Merge pull request #2480 from koem/movelistboxrsudev2013-02-131-41/+34
|\ | | | | Detail View: moved list box under offline box
| * 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
| |
| * Merge pull request #2454 from Lineflyer/releaseLars2013-02-061-0/+6
| |\ | | | | | | Change log update release branch
| | * Change log update release branchLars2013-02-061-0/+6
| |/
* | Merge pull request #2460 from koem/chooselistrsudev2013-02-1214-92/+323
|\ \ | | | | | | Changes for issue #275
| * | new var instead of reassigning input parameterkoem2013-02-131-5/+5
| | |
| * | Merge branch 'master' into chooselistkoem2013-02-13176-1165/+4400
| |\ \ | |/ / |/| |
* | | Merge pull request #2465 from koem/oc_iconskoem2013-02-12176-1165/+4400
|\ \ \ | | | | | | | | Icons for OC
| * \ \ merge conflictskoem2013-02-130-0/+0
| |\ \ \
| | * | | Maintenance Icon Color changed to alert-redkoem2013-02-112-3/+3
| | | | |
| * | | | Merge branch 'master' into oc_iconskoem2013-02-1267-8/+50
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | - changed icons - repaired test class
| * | | | Unit-Tests ++koem2013-02-126-15/+49
| |/ / / | | | | | | | | | | | | - 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-135-2/+44
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | 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-112-1/+9
| | | | | | | | | | | | | | | | | | | | Added failing testcase and fixed modifiedsince in query-string
* | | | | Fix #2441, Owner information not shown for OC.de cachesrsudev2013-02-113-1/+25
| | | | | | | | | | | | | | | | | | | | 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
| | | |
* | | | Merge pull request #2461 from Schorti/masterBananeweizen2013-02-081-16/+16
|\ \ \ \ | |/ / / |/| | | Remove blanks in Czech language
| * | | remove blanksSchorti2013-02-081-16/+16
|/ / / | | | | | | | | | removing blanks
| * | Merge branch 'master' into chooselistkoem2013-02-082-1/+38
| |\ \ | |/ / |/| |
* | | Fix #2459, Attended is not detected as found for OCrsudev2013-02-071-1/+1
| | | | | | | | | | | | Extended parser to detect the additional logtype
* | | New tests for OCrsudev2013-02-071-0/+37
| | | | | | | | | | | | | | | - base cache load test - test for #2459
| * | 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-062-1/+15
|\ \ | |/
| * fix #2451, bad pattern for cache count parsingBananeweizen2013-02-062-1/+15
| |
* | refactoring: minor rename of resourcesBananeweizen2013-02-054-2/+2
| |
* | Use a standard Callable interface for lazy initialized listsSamuel Tardieu2013-02-034-28/+30
| |
* | Restrict LazyInitializedList to the List interfaceSamuel Tardieu2013-02-0312-40/+43
| | | | | | | | | | 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-034-66/+20
| |
* | Refactoring: rename cgCache into GeocacheSamuel Tardieu2013-02-03126-645/+645
| |
* | 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
| |
* | 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
| |