aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Change log reset (master only)Lars2013-04-011-27/+6
| | | | | |
* | | | | | Merge remote-tracking branch 'upstream/release' into currdevrsudev2013-04-021-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fixes #2621, Light scheme in single log picture view not ok (Android 2.xrsudev2013-04-021-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | specific) Added background attribute to spoilers view
* | | | | Merge branch 'issue-2624' into upstreamSamuel Tardieu2013-04-023-15/+51
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | fix #2624: coordinates display is wrong near a confluence pointSamuel Tardieu2013-04-023-15/+51
| |/ / | | | | | | | | | | | | The coordinates need to be rounded differently depending on the precision which will be used for the output.
* | | improve display of log texts for OCBananeweizen2013-04-012-17/+25
| | | | | | | | | * remove even more unneeded whitespace
* | | fix #2619: Clicking link in log decrypts logBananeweizen2013-04-011-0/+6
| | |
* | | Merge branch 'release'Bananeweizen2013-03-312-11/+14
|\ \ \ | |/ /
| * | fix #2615: loader not working for next pageBananeweizen2013-03-312-11/+14
| | |
* | | fix #2532: attach log image to log entry locallyBananeweizen2013-03-303-9/+15
| |/ |/|
* | refactoring of cache logging codeBananeweizen2013-03-304-22/+28
| | | | | | | | * simplify control flow * move sanity checks into GCVote and twitter methods
* | #2613: log error if image cannot be decodedBananeweizen2013-03-301-1/+5
| |
* | refactoring: improve performance of GPX exportBananeweizen2013-03-291-58/+88
| | | | | | | | * load batches of caches instead of single caches * do not load all caches to avoid huge memory usage
* | Merge remote-tracking branch 'upstream/release' into currdevrsudev2013-03-2915-1/+17
|\ \ | |/
| * Fixes #2589, Light skin not workingrsudev2013-03-2915-1/+17
| | | | | | | | | | | | Re-added background attribute to select view definitions where 2.x doesn't correctly apply the theme background. Additionally disabled light theme for dialogs on 2.x, as it doesn't work there
* | Merge remote-tracking branch 'origin/release'Bananeweizen2013-03-291-2/+4
|\ \ | |/
| * fix #2489: remove wrong error log entry on gpx exportBananeweizen2013-03-291-2/+4
| |
* | #1798: refactoring, extract common asynctask with progressBananeweizen2013-03-294-37/+98
| |
* | fix #2583: coordinates format switching for waypointsBananeweizen2013-03-282-17/+41
| |
* | Merge remote-tracking branch 'origin/release'Bananeweizen2013-03-281-3/+1
|\ \ | |/
| * fix #2607: avoid error in log during list loadingBananeweizen2013-03-281-3/+1
| |
* | Merge remote-tracking branch 'origin/release'Bananeweizen2013-03-281-2/+11
|\ \ | |/
| * fix #2591: crash in logging activityBananeweizen2013-03-281-2/+11
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2013-03-271-8/+8
|\ \ | |/
| * fix #2602: crash on "show on list" from live mapSamuel Tardieu2013-03-271-8/+8
| | | | | | | | | | | | | | | | The pseudo loader created by onCreate() when coming from the live map uses the adapter before it is created. Here we invert the order of creation while checking for onCreateLoader() returning null which is the case when coming from a map.
* | Merge pull request #2604 from marco-jacob/resetStaticMapTestChangesMarco Jacob2013-03-272-16/+9
|\ \ | | | | | | remove StaticMapsProvider changes
| * | remove StaticMapsProvider changesMarco Jacob2013-03-272-16/+9
| | |
* | | Merge pull request #2603 from marco-jacob/checkStaticMapsTestMarco Jacob2013-03-272-9/+18
|\ \ \ | |/ / | | | more checks in static maps test
| * | more checks in static maps testMarco Jacob2013-03-272-9/+18
|/ /
* | Merge pull request #2600 from marco-jacob/updateMock2013-03-27Marco Jacob2013-03-275-77/+177
|\ \ | | | | | | update mock data 2013-03-27
| * | update mock data 2013-03-27Marco Jacob2013-03-275-77/+177
|/ /
* | Merge branch 'release' into upstreamSamuel Tardieu2013-03-271-19/+159
|\ \ | |/
| * Add missing French translationsSamuel Tardieu2013-03-271-19/+159
| |
* | Merge remote-tracking branch 'origin/release'Bananeweizen2013-03-272-9/+18
|\ \ | |/
| * #2593: wrong inverse sorting in history and other listsBananeweizen2013-03-272-9/+18
| |
* | Remove unused translationsSammysHP2013-03-251-2/+0
|/
* Merge pull request #2584 from Lineflyer/masterkoem2013-03-231-2/+4
|\ | | | | Change log and limitation update
| * Better wording for UTF8 changeLars2013-03-201-1/+1
| |
| * Change log and limitation updateLars2013-03-191-2/+4
| |
* | Fix #2578, Sorting not OK after opening/changing listrsudev2013-03-231-0/+1
| | | | | | Added a forced sort after loader finishing
* | Set TargetSdk back to 8, testing menukeyrsudev2013-03-211-1/+1
|/
* Merge pull request #2580 from koem/issue2538-utf8SammysHP2013-03-184-49/+17
|\ | | | | Fixes #2538 - German Umlauts in image caption and description
| * Fixes #2538 - German Umlauts in image caption and descriptionkoem2013-03-184-49/+17
|/ | | | | | | changes: * post requests are done with UTF-8 now * deleted conversion of non latin characters * deleted corresponding test method and class
* Merge pull request #2569 from R3gi/patch-5SammysHP2013-03-171-384/+390
|\ | | | | Update Czech srings #4.xml
| * Update strings.xmlR3gi2013-03-141-11/+11
| | | | | | | | | | Fixed some mistakes and bugs from Original translation + some small changes. I hope this is the final version...
| * Update strings.xmlR3gi2013-03-131-382/+388
| | | | | | | | | | | | | | | | Fixed formatting (spaces). Fixed string errors, deleted extra ", fixed some bugs. The first info was: "Bug fixes, improved intelligibility of some strings, the translation is more friendly now (better inflection and in czech "Tykání"). All strings should be translated now. The program was already tested with this new translation. If any problem or question, please contact me. It is the first time I am using this kind of develop/translate service :-)"
* | Merge pull request #2565 from triakcz/gpx_export_skip_invalid_wptsrsudev2013-03-161-12/+14
|\ \ | | | | | | GPX export ommiting waypoints without coords
| * | GPX export ommiting waypoints without coordstriakcz2013-03-121-12/+14
| | |
* | | Fixes #2531 - Auto-save now works as expected.rsudev2013-03-161-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copied saveLog(false) from onStop() also into finish(). List of caches now gets refreshed, because saveLog() runs while VisitCacheActivity is still running. saveLog(false) was also left in onStop(), because in case the activity gets interrupted and finish() is not called, the log will still be auto-saved. Conflicts: main/src/cgeo/geocaching/VisitCacheActivity.java
* | | Fixes #2413 - In English it is better to use "Login failed: Message frommartin.stajner2013-03-161-1/+1
| | | | | | | | | server" since the message from server can be a whole new sentence.