aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release' into upstreamSamuel Tardieu2014-10-281-0/+5
|\
| * Merge branch 'issue-4416' into releaseSamuel Tardieu2014-10-2810-79/+26
| |\
| * \ Merge branch 'issue-4434' into releaseSamuel Tardieu2014-10-281-3/+3
| |\ \
| * | | Update changelog_release.xmlLars2014-10-281-0/+5
| | | |
* | | | Update README regarding Google Maps v1 keysSamuel Tardieu2014-10-271-1/+1
| | | |
* | | | Merge branch 'issue-4416' into upstreamSamuel Tardieu2014-10-271-1/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | fix javadoc warningMichael Keppler2014-10-271-2/+0
| | | |
| * | | Use English when parsing dateSamuel Tardieu2014-10-271-1/+2
| | | | | | | | | | | | | | | | Part of fix for #4416.
* | | | Merge branch 'issue-4434' into upstreamSamuel Tardieu2014-10-271-3/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | fix #4434: crash when storing filtered listSamuel Tardieu2014-10-271-3/+3
| | |/ | |/|
* | | Use shorter form for cloned subscriberSamuel Tardieu2014-10-271-17/+2
| | |
* | | fix javadoc warningMichael Keppler2014-10-261-2/+0
| | |
* | | Merge pull request #4432 from rsudev/crowdin_translationsrsudev2014-10-251-0/+6
|\ \ \ | | | | | | | | crowdin: New translations
| * | | crowdin: New translationsrsudev2014-10-251-0/+6
|/ / /
* | | Remove a potential race conditionSamuel Tardieu2014-10-245-10/+27
| | |
* | | Remove extra debug informationSamuel Tardieu2014-10-221-2/+0
| | |
* | | Merge branch 'asyn-refactoring' of git://github.com/yulin2/cgeo into upstreamSamuel Tardieu2014-10-226-66/+172
|\ \ \
| * | | put db access at 1 place into async taskYu Lin2014-10-201-8/+12
| | | |
| * | | put bitmap decoding at 2 places into async taskYu Lin2014-10-201-19/+38
| | | |
| * | | put db access at 2 places into async taskYu Lin2014-10-201-6/+25
| | | |
| * | | put db access at 1 place into async taskYu Lin2014-10-201-11/+22
| | | |
| * | | put db query at 1 place into async taskYu Lin2014-10-201-9/+19
| | | |
| * | | put db access at 4 places into async taskYu Lin2014-10-201-13/+56
| | | |
* | | | Merge branch 'issue-4416' into upstreamSamuel Tardieu2014-10-229-78/+26
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: main/src/cgeo/geocaching/connector/gc/GCLogin.java
| * | | fix #4416: new preferences page on geocaching.comSamuel Tardieu2014-10-222-61/+7
| | | |
| * | | Get GC custom date on every succesful loginSamuel Tardieu2014-10-223-6/+3
| | | | | | | | | | | | | | | | Part of work on #4416.
| * | | Reset default date format on login errorSamuel Tardieu2014-10-221-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | When unlogged, the default format is MM/dd/yyyy. Part of work on #4416.
| * | | Use uniform date format in testsSamuel Tardieu2014-10-225-7/+7
| | |/ | |/| | | | | | | Part of work on #4416.
* | | Do not accept log entries without valid dateSamuel Tardieu2014-10-221-0/+1
| | |
* | | Merge pull request #4421 from marco-dev/keepListPositionMarco Jacob2014-10-221-3/+7
|\ \ \ | | | | | | | | fixes #4384 - keep last visible list position
| * | | fixes #4384 - keep last visible list positionMarco Jacob2014-10-171-3/+7
| | | |
* | | | Fixes #4423, Last zoom not rememberedrsudev2014-10-221-2/+2
| | | | | | | | | | | | | | | | - corrected check condition
* | | | Merge pull request #4429 from rsudev/crowdin_translationsrsudev2014-10-222-0/+11
|\ \ \ \ | |_|_|/ |/| | | crowdin: New translations
| * | | crowdin: New translationsrsudev2014-10-222-0/+11
|/ / /
* | | fix #4426: Disable optional action bar actions by defaultBananeweizen2014-10-206-14/+29
| | |
* | | Upgrade to RxJava 0.20.6Samuel Tardieu2014-10-2020-8/+8
| | |
* | | Merge pull request #4425 from rsudev/crowdin_translationsrsudev2014-10-1918-26/+9
|\ \ \ | | | | | | | | crowdin: New translations
| * | | crowdin: New translationsrsudev2014-10-1918-26/+9
|/ / /
* | | Merge branch 'release' into upstreamSamuel Tardieu2014-10-182-26/+27
|\ \ \ | | |/ | |/|
| * | Put actual and expected at the right places in testSamuel Tardieu2014-10-181-25/+26
| | |
| * | Use correct date format in testSamuel Tardieu2014-10-181-1/+1
| | |
* | | Merge pull request #4417 from culmor30/masterSamuel Tardieu2014-10-167-2/+62
|\ \ \ | |_|/ |/| | Implemented support for external Android Wear apps
| * | Implemented support for external Android Wear appsCollie2014-10-157-2/+62
|/ / | | | | | | | | | | | | | | | | | | Android Wear apps can listen for the 'cgeo.geocaching.wear.NAVIGATE_TO' intent to get cache info from c:geo, passed as Intent extras. Altered ProcessUtils#isIntentAvailable(final String action, final Uri uri) to scan for Services (instead of just activities) which can handle a given action; my Wear app (as I imagine others will) mainly runs as a Service and requires no activity to be launched.
* | Merge branch 'release'rsudev2014-10-133-0/+337
|\ \ | |/
| * Merge pull request #4415 from rsudev/crowdin_translationsrsudev2014-10-133-0/+337
| |\ | | | | | | crowdin: New translations
| | * crowdin: New translationsrsudev2014-10-133-0/+337
| |/
| * Merge branch 'issue-4369' into releaseSamuel Tardieu2014-10-024-17/+21
| |\
* | | fix #4414: Enable total number of caches in live map only with debugBananeweizen2014-10-121-1/+1
| | | | | | | | | setting
* | | fix #659: limit initial zoom level of live mapBananeweizen2014-10-111-2/+6
| | |
* | | refactoring: avoid repeated stringbuilder for queriesBananeweizen2014-10-101-124/+82
| | | | | | | | | | | | | | | Our prepared SQL statements actually created a Stringbuilder for concatenation of the query string on each invocation, even with the statements already being prepared.
generated by cgit v1.1 at 2025-11-18 06:29:08 +0000