aboutsummaryrefslogtreecommitdiffstats
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* fix #3020: document request headers for cachingBananeweizen2013-07-191-1/+2
|
* fix conflict from manual merge in strings.xmlBananeweizen2013-07-191-1/+2
|
* Proofread strings.xml for American EnglishJavaDog2013-07-191-79/+78
| | | | | | | | Updated main/res/values/strings.xml, fixed errors in English spelling/grammar/phrasing. This commit should contain no other code. I'm bad at git, sorry about that :p
* Merge pull request #3014 from koem/i2978SettingsNavMenuBananeweizen2013-07-1911-38/+67
|\ | | | | Fixes #2978 - Settings: "System" instead of "More Options"
| * Fixex #2978 - Settings: "System" instead of "More Options"koem2013-07-1911-38/+67
| | | | | | | | | | | | - moved basic member settings to subscreen in gc-services - new settings screen "Navigation" - renamed "More Option" to "System"
* | fixes #2999: no prefix merged for merged stringsMarco Jacob2013-07-191-10/+4
| |
* | Merge pull request #3017 from marco-jacob/fixHandlerToStaticNewMarco Jacob2013-07-185-134/+296
|\ \ | | | | | | Fixes #2931 - make Handler static to solve lint
| * | Fixes #2931 - make Handler static to solve lintMarco Jacob2013-07-185-134/+296
| | |
* | | refactoring: extract constantBananeweizen2013-07-182-8/+12
| | |
* | | Prepare addition of OKAPI for oc.plrsudev2013-07-174-1/+20
|/ /
* | fix #2994: have [NUMBER] template respect cache sourceBananeweizen2013-07-171-23/+18
| |
* | refactoring: cleanupBananeweizen2013-07-171-26/+37
| |
* | Fixes #2717 - Compass Speech stops on Rotationkoem2013-07-166-97/+131
|/
* Merge pull request #3006 from Lineflyer/masterLars2013-07-151-0/+9
|\ | | | | Updating changelog_master.xml
| * Update changelog_master.xmlLars2013-07-151-0/+9
| | | | | | Still catching up old changes to the changelog
* | Fix some build issuesrsudev2013-07-153-22/+0
| |
* | Fix test compile issuersudev2013-07-151-2/+2
| |
* | Fixes #3002 - Tweet not tweetedkoem2013-07-151-37/+35
| | | | | | | | Twitter api v1.0 seems to be deprecated for tweeting (Auth worked fine). Now using v1.1.
* | Fix lint warning Lars2013-07-151-1/+1
| | | | | | :)
* | Removing some limitations Lars2013-07-151-4/+0
| | | | | | Those limitations/known bugs have been fixed
* | Merge branch 'release' into upstreamSamuel Tardieu2013-07-141-0/+6
|\ \ | |/ |/|
| * Update changelog_release.xmlLars2013-07-141-0/+6
| | | | | | #2915
* | Update changelog_master.xmlLars2013-07-141-2/+39
| | | | | | | | Catching up the last months. Feel free to comment/correct if I did something wrong.
* | cleanup: remove unused method Clear()Samuel Tardieu2013-07-141-4/+0
| |
* | cleanup: remove unused getTokens()Samuel Tardieu2013-07-142-12/+0
| |
* | Restore backup request of settingsSamuel Tardieu2013-07-141-0/+7
| |
* | refactoring: remove unused getDisplayHeight()Samuel Tardieu2013-07-144-16/+0
| |
* | refactoring: move comment to where it belongsBananeweizen2013-07-141-11/+8
| |
* | refactoring: remove IBasicCache interfaceSamuel Tardieu2013-07-142-48/+34
| |
* | cleanup: remove isWatchlist() since isOnWatchlist() exists alreadySamuel Tardieu2013-07-143-6/+4
| |
* | cleanup: remove redundant type castsSamuel Tardieu2013-07-143-4/+4
| |
* | cleanup: do not try to outsmart the garbage collectorSamuel Tardieu2013-07-141-1/+0
| |
* | cleanup: use faster StringBuilder instead of StringBufferSamuel Tardieu2013-07-141-4/+4
| |
* | cleanup: remove unnecessary importsSamuel Tardieu2013-07-141-6/+0
| |
* | cleanup: remove unnecessary return in void methodSamuel Tardieu2013-07-141-1/+0
| |
* | cleanup: remove unnecessary else statementSamuel Tardieu2013-07-141-2/+2
| |
* | cleanup: remove unnecessary private modifier for enum constructorSamuel Tardieu2013-07-141-1/+1
| |
* | cleanup: downgrade unnecessary fieldsSamuel Tardieu2013-07-143-7/+3
| |
* | cleanup: fix ListView predefined idSamuel Tardieu2013-07-141-1/+1
| |
* | #2975: move up map category due to expected importanceBananeweizen2013-07-141-56/+56
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2013-07-141-1/+1
|\ \ | |/
| * cleanup: fix typo in release notesSamuel Tardieu2013-07-141-1/+1
| |
* | cleanup: use sp instead of dipSamuel Tardieu2013-07-141-1/+1
| |
* | Test master changelog informationSamuel Tardieu2013-07-141-0/+3
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2013-07-145-85/+130
|\ \ | |/ | | | | | | | | Conflicts: main/res/values/strings_not_translatable.xml main/src/cgeo/geocaching/AboutActivity.java
| * fix #2956: management of release notesSamuel Tardieu2013-07-145-186/+217
| |
* | #2991: use event cache icon for gps exhibitBananeweizen2013-07-141-1/+1
| |
* | cleanup: remove DOS line terminatorsSamuel Tardieu2013-07-141-177/+177
| |
* | cleanup: remove unused button stringsSamuel Tardieu2013-07-141-3/+0
| |
* | refactoring: simplify logicBananeweizen2013-07-141-35/+32
| | | | | | | | * avoid chained if-else with one variable * convert dateformat to constant