aboutsummaryrefslogtreecommitdiffstats
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release' into upstreamSamuel Tardieu2014-03-021-0/+5
|\
| * fix failing testSamuel Tardieu2014-03-021-0/+5
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2014-03-021-0/+5
|\ \ | |/
| * Merge branch 'release' of github.com:cgeo/cgeo into releaseSamuel Tardieu2014-03-021-0/+5
| |\
| | * Update changelog_release.xmlLars2014-03-021-0/+5
| | |
* | | Merge branch 'release' into upstreamSamuel Tardieu2014-03-022-1/+3
|\ \ \ | |/ /
| * | fix #3634: special log types on unpublished cachesSamuel Tardieu2014-03-022-1/+3
| |/
* | Merge pull request #3633 from darekkay/#3266SammysHP2014-03-021-1/+2
|\ \ | | | | | | Fix #3266: Use long press on filter button to reset filter
| * | fix #3266Darek Kay2014-03-021-1/+2
| | |
* | | Update changelog_master.xmlLars2014-03-021-0/+3
|/ /
* | fix #3632: No Swipe on cache detailsBananeweizen2014-03-011-2/+1
| |
* | Query various connectors in parallelSamuel Tardieu2014-02-285-36/+57
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2014-02-284-54/+74
|\ \ | |/
| * fix #3594: personal note parsing is too looseSamuel Tardieu2014-02-283-4/+9
| |
| * refactoring: move waypoint parsing code in WaypointSamuel Tardieu2014-02-282-51/+66
| |
* | Merge branch 'release'rsudev2014-02-281-2/+9
|\ \ | |/
| * Fixes #3628, Array out of bounds in simple dir chooserrsudev2014-02-281-2/+9
| | | | | | | | - hide ok button when diving into a directory
* | refactoring: move GC specific code in GCParserSamuel Tardieu2014-02-282-18/+18
| |
* | refactoring: remove unused warningsSamuel Tardieu2014-02-281-1/+1
| |
* | refactoring: style fixSamuel Tardieu2014-02-271-1/+1
| |
* | refactoring: clean progress dialog handlingSamuel Tardieu2014-02-271-11/+6
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2014-02-271-2/+2
|\ \ | |/
| * fix #3550: dialog don't show up the second timeSamuel Tardieu2014-02-271-2/+2
| |
* | refactoring: remove warningSamuel Tardieu2014-02-271-1/+1
| |
* | refactoring: clean send2cgeo receiver codeSamuel Tardieu2014-02-271-54/+48
| |
* | refactoring: remove useless yield()Samuel Tardieu2014-02-272-8/+0
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2014-02-271-0/+4
|\ \ | |/
| * fix #3541: trackable geocode is nullSamuel Tardieu2014-02-271-0/+4
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2014-02-271-0/+1
|\ \ | |/
| * fix #3566: log password box missing when changing logtypeSamuel Tardieu2014-02-271-0/+1
| |
| * Fix #3580, Logging with oc not possible without entering user credentials for gcrsudev2014-02-251-1/+0
| | | | | | | | - removed no longer sensible check for gc credentials.
* | Use DecompressingHttpClient instead of our ownSamuel Tardieu2014-02-271-42/+2
| |
* | Use LaxRedirectStrategy instead of our ownSamuel Tardieu2014-02-271-22/+2
| |
* | Update to RxJava 0.17.0-RC6Samuel Tardieu2014-02-272-0/+0
| |
* | crowdin: New translationsrsudev2014-02-261-3/+4
| |
* | Fixes #3626, Can not authorize to oc.plrsudev2014-02-251-1/+2
| | | | | | | | - fixed my stupid bug sending the request twice :(
* | refactoring: do not duplicate codeSamuel Tardieu2014-02-243-45/+33
| |
* | refactoring: do not duplicate codeSamuel Tardieu2014-02-241-8/+2
| |
* | refactoring: do not duplicate codeSamuel Tardieu2014-02-243-39/+32
| |
* | Merge branch 'morecopy' of git://github.com/YraFyra/c-geo-opensource into ↵Samuel Tardieu2014-02-241-4/+83
|\ \ | | | | | | | | | upstream
| * | Long-press menus for trackablesYraFyra2014-02-231-4/+83
| | | | | | | | | | | | Enables copy&share and translate for all suitable fields for trackables.
* | | crowdin: New translationsrsudev2014-02-244-1/+10
| | |
* | | crowdin: New translationsrsudev2014-02-233-0/+188
|/ /
* | Fixes #3517, Search by finder should ignore "Hide found" when searching for ↵rsudev2014-02-223-9/+27
| | | | | | | | | | | | own username Added proper handling for searching after me to the oc connector.
* | Finally fixes #3267, Detect and report time-skew that prevents okapi accessrsudev2014-02-223-27/+92
| | | | | | | | Extended the OAuth process to allow specific additional error reporting
* | Fixes #3608, TB details emptyrsudev2014-02-221-4/+7
| | | | | | | | - moved url null check to beginning of image fetch.
* | Remove unused string resourceSamuel Tardieu2014-02-2215-15/+0
| |
* | Use explicit locale in upper case conversionSamuel Tardieu2014-02-221-1/+1
| | | | | | | | This silences lint, even though a geocode would work the same in any locale.
* | Merge branch 'release' into upstreamSamuel Tardieu2014-02-222-2/+3
|\ \ | |/
| * Update changelog for releaseSamuel Tardieu2014-02-221-1/+2
| |