aboutsummaryrefslogtreecommitdiffstats
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release' into upstreamSamuel Tardieu2015-01-091-2/+2
|\
| * Use %d instead of %s for cache countSamuel Tardieu2015-01-091-2/+2
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-091-0/+1
|\ \ | |/
| * 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
| | | | | | | This reverts commit d3dc2be5040ea3f4846d9b948c3a0f95b9359f71 and fixes #4604. Conflicts: main/src/cgeo/geocaching/MainActivity.java
* 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
| | | | | | | | | | | | On some devices, it looks like the orientation sensor may be bogus. This confirms what the author of GPS Status wrote in private mail. This commits favors the rotation sensor over the orientation one, unless low-power mode is used, in which case the orientation sensor (which may benefit from low-power mode if it has a gyroscope-less mode) will be preferred. Part of work on #4599.
* 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
| |
* | fix #4595: read trackable URI from NFCSamuel Tardieu2015-01-072-3/+18
| |
* | Use MapQuest reverse geocoder if the Android one failsSamuel Tardieu2015-01-073-36/+67
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-0712-63/+219
|\ \ | |/
| * crowdin: New translationsSamuel Tardieu2015-01-0712-63/+219
| |
* | 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-072-17/+31
| | | | | | | | | | | | | | | | | | | | When a cache is stored in the database, some fields are lazily loaded from the database. This should only happen when the cache itself has been loaded from the database, otherwise we might fill fields of a cache acquired from the network with older version of the fields as stored in the database. Noticed during the work on #4576.
* | 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
| | | | | | | | | | | | If the attributes section in the GC HTML page is absent, attributes will not be initialized at all on the newly parsed cache and may be mistakenly autoloaded from the database.
* | 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
| | | | | | | | | | Testing the value of a volatile entity for nullness doesn't give any clue on its *continued* nullness. The tooling knows that and complains.
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-065-93/+82
|\ \ | |/
| * fix #4591: refreshing without progress leads to ANRSamuel Tardieu2015-01-065-93/+82
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-061-1/+1
|\ \ | |/
* | 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
|\ \ | |/
| * Accept NFC explicitely and not only by URISamuel Tardieu2015-01-062-2/+19
| |
* | Alternate workaround for missing method in testsSamuel Tardieu2015-01-061-3/+0
| | | | | | | | | | This one has the advantage of not requiring any extra code in the application itself.
* | Tentative fix for missing method at test timeSamuel Tardieu2015-01-061-1/+4
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-061-38/+3
|\ \ | |/