| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Do not use a N² algorithm when merging waypoints sets | Samuel Tardieu | 2013-01-26 | 1 | -23/+16 |
| | | | | | | | | | The prefix of a waypoint must be unique for a given cache, so use that instead of the name for merging (the name needs not be unique). Also, it won't break if we have duplicate prefixes in the old waypoints list, those will be kept as well in the new list. | ||||
| * | The waypoint id must be kept when merging data | Samuel Tardieu | 2013-01-26 | 1 | -0/+3 |
| | | | | | | If we want to keep the id stable, then it must be copied over. Part of fix for #2430. | ||||
| * | fix #2430: waypoints not loaded from website | Samuel Tardieu | 2013-01-26 | 1 | -2/+2 |
| | | | | | | | A recent fix for #2341 broke the fresh store of waypoints. Comparing with "< 0" to check if a waypoint id is invalid implies setting the uninitialized value to a negative number. | ||||
| * | Renumber columns cache to remove hole | Samuel Tardieu | 2013-01-23 | 1 | -75/+41 |
| | | |||||
| * | Remove the now unused "own" column in caches table | Samuel Tardieu | 2013-01-23 | 1 | -1/+0 |
| | | | | | | | | sqlite does not support the "alter table … drop column" construct, so this column will stay and be unused for existing installations. See issue #2322 for discussion. | ||||
| * | Caches need to have a geocode for tests | mucek4 | 2013-01-23 | 1 | -0/+1 |
| | | |||||
| * | Refactoring: simplify code | Samuel Tardieu | 2013-01-23 | 1 | -22/+8 |
| | | |||||
| * | Merge branch 'release' into upstream | Samuel Tardieu | 2013-01-23 | 1 | -0/+0 |
| |\ | |||||
| | * | Fix PNG file for tests to reflect GC.com changes | mucek4 | 2013-01-23 | 1 | -0/+0 |
| | | | |||||
| * | | Merge branch 'master' of github.com:cgeo/c-geo-opensource into upstream | Samuel Tardieu | 2013-01-23 | 5 | -91/+83 |
| |\ \ | |||||
| | * | | #1791: remove selfmade dialog button | Bananeweizen | 2013-01-23 | 4 | -85/+71 |
| | | | | |||||
| | * | | Merge pull request #2426 from Lineflyer/master | SammysHP | 2013-01-23 | 1 | -6/+12 |
| | |\ \ | | | | | | | | | New german strings and small changes | ||||
| | | * | | New german strings and small changes | Lars | 2013-01-23 | 1 | -6/+12 |
| | |/ / | | | | | | | | | | + Missing strings + unified capitalization of the website name throughout the stings. Standard: lower case, only uppercase if start of sentence. | ||||
| * | | | Merge branch 'issue-2322' into upstream | Samuel Tardieu | 2013-01-23 | 21 | -54/+89 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | Conflicts: main/src/cgeo/geocaching/connector/IConnector.java main/src/cgeo/geocaching/connector/gc/GCParser.java main/src/cgeo/geocaching/maps/CGeoMap.java | ||||
| | * | | fix #2322: GPX imported caches not marked as owned | Samuel Tardieu | 2013-01-23 | 19 | -38/+70 |
| | |/ | | | | | | | | | The "isOwner()" property (previously named "isOwn()") is now synthesized by comparing the username with the cache owner name. | ||||
| * | | Refactoring: do not use a mutable variable | Samuel Tardieu | 2013-01-23 | 1 | -5/+2 |
| | | | |||||
| * | | Refactoring: code simplification and naming style | Samuel Tardieu | 2013-01-23 | 1 | -19/+10 |
| | | | |||||
| * | | Merge remote-tracking branch 'triakcz/fix_upload_dialog' into upstream | Samuel Tardieu | 2013-01-23 | 2 | -80/+97 |
| |\ \ | |||||
| | * | | Fixed TODO ... saving waypoint has common progress for all | triakcz | 2013-01-22 | 2 | -80/+97 |
| | | | | |||||
| * | | | Merge branch 'release' into upstream | Samuel Tardieu | 2013-01-23 | 1 | -2/+2 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: tests/src/cgeo/geocaching/files/GPXParserTest.java | ||||
| | * | | Fix test due to the new waypoint id stability | Samuel Tardieu | 2013-01-23 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'release' into upstream | Samuel Tardieu | 2013-01-23 | 3 | -8/+26 |
| |\ \ \ | |/ / | |||||
| | * | | fix #2317: NPE while backuping data | Samuel Tardieu | 2013-01-23 | 3 | -8/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous fix for #2317 was incomplete, as the dependency of the CentralBackupAgent onto Settings caused a NPE because Settings static initializations require that an application has been created, which is apparently not the case when a backup is launched by the OS. The preference name has been isolated into a no-dependency package so that the CentralBackupAgent does not depend on an application existing anymore. | ||||
| * | | | Merge branch 'release' into upstream | Samuel Tardieu | 2013-01-23 | 1 | -3/+6 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'release-fix' of ↵ | Samuel Tardieu | 2013-01-23 | 1 | -3/+6 |
| | |\ \ | | | | | | | | | | | | | https://github.com/Portree-Kid/c-geo-opensource into release | ||||
| | | * | | Keep the Waypoint Ids stable. Fixes #2341 | Portree-Kid | 2013-01-22 | 1 | -3/+6 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/release' | Bananeweizen | 2013-01-22 | 0 | -0/+0 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | backport #2186 to have unit tests green on release branch | Bananeweizen | 2013-01-22 | 2 | -1/+5 |
| | |/ / | |||||
| * | | | Update LICENSE date | mucek4 | 2013-01-22 | 1 | -2/+2 |
| | | | | |||||
| * | | | fix #2421: crash when resuming c:geo | Samuel Tardieu | 2013-01-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | For some reason, the database seems to have been closed and not reopened after some inactivity. This should take care of it. | ||||
| * | | | Merge remote-tracking branch 'rsudev/flexible_tiles' into upstream | Samuel Tardieu | 2013-01-20 | 2 | -26/+120 |
| |\ \ \ | |||||
| | * | | | Added clarifying comment regarding tile calculation | rsudev | 2013-01-19 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | Extend zoom calculation to nxm tilesets | rsudev | 2013-01-17 | 2 | -27/+119 |
| | | | | | | | | | | | | | | | | | Previously tile sets generated for the live map where fixed to max 2x2 tiles. In order to enhance the flexibility of the live-map algorithms, now the generation of more fine-grained tile sets or even a lower bound for the zoom level to use is supported. | ||||
| * | | | | Reuse code to fill a cache detail | Samuel Tardieu | 2013-01-20 | 2 | -82/+47 |
| | | | | | |||||
| * | | | | Update README.md with complex patches dev information | Samuel Tardieu | 2013-01-20 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Add reference to status.cgeo.org | Samuel Tardieu | 2013-01-20 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Update README.md | Bananeweizen | 2013-01-20 | 1 | -8/+13 |
| | | | | | | | | | | | | | | | | | added branch information updated contacts | ||||
| * | | | | Lint fixes | Bananeweizen | 2013-01-20 | 3 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * ignore exported content provider * ignore unregistered activity (for copy of FragmentListActivity) * fix invalid layout attribute * fix Locale stuff | ||||
| * | | | | Do not create an intermediate empty array when copying | Samuel Tardieu | 2013-01-19 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Refactoring: remove unnecessary unboxing | Samuel Tardieu | 2013-01-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Refactoring: use contains() where appropriate | Samuel Tardieu | 2013-01-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Refactoring: remove redundant variables | Samuel Tardieu | 2013-01-19 | 2 | -4/+2 |
| | | | | | |||||
| * | | | | Refactoring: simplify if statement | Samuel Tardieu | 2013-01-19 | 1 | -5/+1 |
| | | | | | |||||
| * | | | | Remove unnecessary qualifiers to this | Samuel Tardieu | 2013-01-19 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Add missing @Override annotations | Samuel Tardieu | 2013-01-19 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Do not hardcode "/sdcard/" to make lint happy | Samuel Tardieu | 2013-01-19 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Fix typo in log string | Samuel Tardieu | 2013-01-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | New facility for logging large textual data while developing | Samuel Tardieu | 2013-01-19 | 1 | -0/+32 |
| | | | | | |||||
| * | | | | Merge branch 'release' into upstream | Samuel Tardieu | 2013-01-19 | 3 | -0/+7 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | fix #2412: login fail with unhelpful message on unvalidated account | Samuel Tardieu | 2013-01-19 | 3 | -0/+7 |
| | | | | | |||||
