aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release'rsudev2014-09-211-1/+10
|\
| * Fixes #4366, Contextual action bar item calendar does not workrsudev2014-09-211-1/+10
* | Merge branch 'release'rsudev2014-09-204-7/+10
|\ \ | |/
| * crowdin: New translationsrsudev2014-09-202-2/+2
| * Fixes #4370, OX caches should have blank before ratingrsudev2014-09-201-4/+4
| * Fix proguard for contacts pluginrsudev2014-09-201-1/+4
* | Merge branch 'release' into upstreamSamuel Tardieu2014-09-203-9/+8
|\ \ | |/
| * Fixes #4375, Map popup shows earth cache sizersudev2014-09-201-2/+1
| * New version and minsdk raise for calender pluginLars2014-09-201-4/+4
| * Raise minsdk for contacts pluginLars2014-09-201-1/+1
| * Update AndroidManifest.xmlLars2014-09-201-2/+2
* | Revert "Test for #3922 - disable multiwindow support"rsudev2014-09-202-0/+18
* | Merge branch 'release' into upstreamSamuel Tardieu2014-09-181-1/+2
|\ \ | |/
| * Version code and changelog completionLars2014-09-181-1/+2
* | Merge branch 'issue-4369' into upstreamSamuel Tardieu2014-09-184-17/+21
|\ \
| * | fix #4369: translation warning at wrong timeSamuel Tardieu2014-09-184-17/+21
| |/
* | Small update for READMErsudev2014-09-171-3/+10
* | Merge branch 'release' into upstreamSamuel Tardieu2014-09-176-30/+46
|\ \ | |/
| * crowdin: New translationsSamuel Tardieu2014-09-176-31/+46
* | Merge branch 'release' into upstreamSamuel Tardieu2014-09-161-0/+2
|\ \ | |/
| * Update changelog_release.xmlLars2014-09-161-0/+2
* | Add code documentation for local spoilers usageSamuel Tardieu2014-09-161-3/+8
* | Merge branch 'issue-4330' into upstreamSamuel Tardieu2014-09-162-2/+1
|\ \ | |/
| * fix #4330: uploading waypoint is shown although not uploadingSamuel Tardieu2014-09-162-2/+1
* | Minor cleanupSamuel Tardieu2014-09-161-2/+1
* | Merge branch 'release' into upstreamSamuel Tardieu2014-09-161-0/+12
|\ \ | |/
| * fix #4291: keyboard should stay hidden when showcase is visibleSamuel Tardieu2014-09-161-0/+12
* | Merge branch 'release' into upstreamSamuel Tardieu2014-09-150-0/+0
|\ \ | |/
| * Merge branch 'issue-4260' into releaseSamuel Tardieu2014-09-154-3/+18
| |\
* | \ Merge branch 'release' into upstreamSamuel Tardieu2014-09-151-4/+6
|\ \ \ | |/ /
| * | fix #4341: captcha doesn't refreshSamuel Tardieu2014-09-151-4/+6
* | | fix #4359: imperial units checkbox not always correctSamuel Tardieu2014-09-1512-22/+30
* | | refactor espresso test hierarchyBananeweizen2014-09-1110-33/+43
* | | fix 4340: remove "NUMBER" template from trackable log activityBananeweizen2014-09-104-3/+93
* | | gitignore some intellij defaultsBananeweizen2014-09-101-0/+4
* | | Merge branch 'release' into upstreamSamuel Tardieu2014-09-101-1/+1
|\ \ \ | |/ /
| * | Revert "Use the same properties in showcaseview"Samuel Tardieu2014-09-101-1/+1
* | | refactoring: remove double negationBananeweizen2014-09-101-2/+2
* | | Merge branch 'release' into upstreamSamuel Tardieu2014-09-095-4/+5
|\ \ \ | |/ /
| * | Use the same properties in showcaseviewSamuel Tardieu2014-09-091-1/+1
| * | Inherit JDK in Intellij IDEA filesSamuel Tardieu2014-09-093-3/+3
| * | Update changelog_release.xmlLars2014-09-091-0/+1
* | | fix #4337: remove ldpi action bar iconsBananeweizen2014-09-095-0/+0
* | | typoBananeweizen2014-09-091-1/+1
* | | fix #4336: better auto increase of waypoint nameBananeweizen2014-09-091-5/+7
* | | Name ignored catch parameter as suchSamuel Tardieu2014-09-0938-54/+54
* | | Include exception stack trace in error messageSamuel Tardieu2014-09-097-8/+8
* | | Make static field finalSamuel Tardieu2014-09-091-1/+1
* | | Do not reextract userToken for every kind of log we want to extractSamuel Tardieu2014-09-091-13/+15
* | | Merge branch 'release' into upstreamSamuel Tardieu2014-09-081-0/+4
|\ \ \ | |/ /