aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'release' of github.com:cgeo/cgeo into releaseSamuel Tardieu2015-01-091-0/+1
|\
| * Update changelog_release.xmlLars2015-01-091-0/+1
* | Clear changelog_masterSamuel Tardieu2015-01-091-3/+0
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-091-2/+7
|\ \ | |/
| * Remove doubled entry from changelogLars2015-01-091-1/+0
| * Changlog update and resortingLars2015-01-091-2/+8
* | Add plurals for caches_remove_{all,selected}_confirmMadanKumarB2015-01-092-4/+10
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-081-0/+1
|\ \ | |/
| * Merge changelogsSamuel Tardieu2015-01-082-3/+1
* | Free memory as soon as cgeo gets to the middle of the background LRU listSamuel Tardieu2015-01-081-2/+9
|/
* Revert "Use bindView instead of bindActivity/bindFragment where appropriate"Samuel Tardieu2015-01-086-12/+14
* Use new setting for low-power instead the of the current oneSamuel Tardieu2015-01-081-1/+1
* Favor the orientation sensor over the rotation oneSamuel Tardieu2015-01-081-9/+7
* Merge branch 'release' into upstreamSamuel Tardieu2015-01-084-2/+10
|\
| * crowdin: New translationsSamuel Tardieu2015-01-084-2/+10
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-081-0/+1
|\ \ | |/
| * Update changelogSamuel Tardieu2015-01-081-0/+1
* | fix #4603: do not query the magnetic field sensorSamuel Tardieu2015-01-083-11/+9
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-086-1/+107
|\ \ | |/
| * fix #4602: add system information in "about" and mailsSamuel Tardieu2015-01-085-1/+106
| * Update changelog_release.xmlLars2015-01-071-0/+1
* | Update README.mdLars2015-01-071-0/+1
* | fix #4595: read trackable URI from NFCSamuel Tardieu2015-01-072-3/+18
* | Use MapQuest reverse geocoder if the Android one failsSamuel Tardieu2015-01-074-46/+89
* | Bring tests SDK versions on par with the application onesSamuel Tardieu2015-01-071-3/+3
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-0713-64/+220
|\ \ | |/
| * crowdin: New translationsSamuel Tardieu2015-01-0713-64/+220
* | Make the fetching of pocket query an observableSamuel Tardieu2015-01-072-47/+44
* | Use bindView instead of bindActivity/bindFragment where appropriateSamuel Tardieu2015-01-077-13/+12
* | Upgrade to RxAndroid 0.24.0Samuel Tardieu2015-01-0722-33/+33
* | Do not lazy load fields if the cache doesn't come from the databaseSamuel Tardieu2015-01-074-20/+104
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-072-3/+4
|\ \ | |/
| * Update ChangeLog for releaseSamuel Tardieu2015-01-071-0/+1
| * fix #4576: clearing of the only attribute on cache is not registeredSamuel Tardieu2015-01-071-3/+3
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-071-1/+1
|\ \ | |/
| * fix #4593: socket timeout is too longSamuel Tardieu2015-01-071-1/+1
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-061-0/+1
|\ \ | |/
| * Update changelog_release.xmlLars2015-01-061-0/+1
* | Use a non-volatile variable to avoid warningSamuel Tardieu2015-01-061-2/+3
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-066-94/+83
|\ \ | |/
| * fix #4591: refreshing without progress leads to ANRSamuel Tardieu2015-01-066-94/+83
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-061-1/+1
|\ \ | |/
| * Cherry-picked and merged test fixesSamuel Tardieu2015-01-063-10/+26
* | Merge branch 'issue-4590' into upstreamSamuel Tardieu2015-01-061-1/+8
|\ \
| * | Favor cgeo over other applications when transmitting a cache using NFCSamuel Tardieu2015-01-061-1/+8
* | | Merge branch 'release' into upstreamSamuel Tardieu2015-01-062-2/+19
|\ \ \ | | |/ | |/|
| * | Merge branch 'issue-4590' (early part) into releaseSamuel Tardieu2015-01-062-2/+19
| |\ \ | | |/
| | * Accept NFC explicitely and not only by URISamuel Tardieu2015-01-062-2/+19
| |/
* | disable Android Lint for play servicesBananeweizen2015-01-062-0/+380
* | Mark overriding test methods as NonNullSamuel Tardieu2015-01-064-0/+4