aboutsummaryrefslogtreecommitdiffstats
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* Do not use a N² algorithm when merging waypoints setsSamuel Tardieu2013-01-261-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 dataSamuel Tardieu2013-01-261-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 websiteSamuel Tardieu2013-01-261-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 holeSamuel Tardieu2013-01-231-75/+41
|
* Remove the now unused "own" column in caches tableSamuel Tardieu2013-01-231-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.
* Refactoring: simplify codeSamuel Tardieu2013-01-231-22/+8
|
* Merge branch 'master' of github.com:cgeo/c-geo-opensource into upstreamSamuel Tardieu2013-01-235-91/+83
|\
| * #1791: remove selfmade dialog buttonBananeweizen2013-01-234-85/+71
| |
| * New german strings and small changesLars2013-01-231-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 upstreamSamuel Tardieu2013-01-2316-34/+69
|\ \ | |/ |/| | | | | | | | | 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 ownedSamuel Tardieu2013-01-2315-33/+65
| | | | | | | | | | The "isOwner()" property (previously named "isOwn()") is now synthesized by comparing the username with the cache owner name.
* | Refactoring: do not use a mutable variableSamuel Tardieu2013-01-231-5/+2
| |
* | Refactoring: code simplification and naming styleSamuel Tardieu2013-01-231-19/+10
| |
* | Merge remote-tracking branch 'triakcz/fix_upload_dialog' into upstreamSamuel Tardieu2013-01-232-80/+97
|\ \
| * | Fixed TODO ... saving waypoint has common progress for alltriakcz2013-01-222-80/+97
| | |
* | | Merge branch 'release' into upstreamSamuel Tardieu2013-01-233-8/+26
|\ \ \ | | |/ | |/|
| * | fix #2317: NPE while backuping dataSamuel Tardieu2013-01-233-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 upstreamSamuel Tardieu2013-01-231-3/+6
|\ \ \ | |/ /
| * | Merge branch 'release-fix' of ↵Samuel Tardieu2013-01-231-3/+6
| |\ \ | | | | | | | | | | | | https://github.com/Portree-Kid/c-geo-opensource into release
| | * | Keep the Waypoint Ids stable. Fixes #2341Portree-Kid2013-01-221-3/+6
| | | |
| * | | backport #2186 to have unit tests green on release branchBananeweizen2013-01-221-0/+4
| |/ /
* | | fix #2421: crash when resuming c:geoSamuel Tardieu2013-01-221-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 upstreamSamuel Tardieu2013-01-201-24/+73
|\ \ \
| * | | Added clarifying comment regarding tile calculationrsudev2013-01-191-1/+3
| | | |
| * | | Extend zoom calculation to nxm tilesetsrsudev2013-01-171-25/+72
| | | | | | | | | | | | | | | | 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 detailSamuel Tardieu2013-01-202-82/+47
| | | |
* | | | Lint fixesBananeweizen2013-01-203-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 copyingSamuel Tardieu2013-01-191-2/+2
| | | |
* | | | Refactoring: remove unnecessary unboxingSamuel Tardieu2013-01-191-1/+1
| | | |
* | | | Refactoring: use contains() where appropriateSamuel Tardieu2013-01-191-1/+1
| | | |
* | | | Refactoring: remove redundant variablesSamuel Tardieu2013-01-192-4/+2
| | | |
* | | | Refactoring: simplify if statementSamuel Tardieu2013-01-191-5/+1
| | | |
* | | | Remove unnecessary qualifiers to thisSamuel Tardieu2013-01-191-3/+3
| | | |
* | | | Add missing @Override annotationsSamuel Tardieu2013-01-191-0/+2
| | | |
* | | | Do not hardcode "/sdcard/" to make lint happySamuel Tardieu2013-01-191-1/+3
| | | |
* | | | Fix typo in log stringSamuel Tardieu2013-01-191-1/+1
| | | |
* | | | New facility for logging large textual data while developingSamuel Tardieu2013-01-191-0/+32
| | | |
* | | | Merge branch 'release' into upstreamSamuel Tardieu2013-01-193-0/+7
|\ \ \ \ | | |/ / | |/| |
| * | | fix #2412: login fail with unhelpful message on unvalidated accountSamuel Tardieu2013-01-193-0/+7
| | | |
| * | | Limit TB log to 4000 characterscampbeb2013-01-191-0/+1
| | | |
* | | | Limit TB log to 4000 characterscampbeb2013-01-191-0/+1
| | | |
* | | | Merge pull request #2388 from YraFyra/copystuffcampbeb2013-01-191-4/+5
|\ \ \ \ | | | | | | | | | | Possibility to copy gc-code and cache name. Fix #1615
| * | | | Possibility to copy gc-code and cache nameYraFyra2013-01-111-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Added possibility to long-click on cache name or gc-code to copy (or share) those strings.
* | | | | Fix #2409 - Limit log text to 4000 characterscampbeb2013-01-191-0/+1
| | | | |
* | | | | Send message to cacheowner and cachers in logsYraFyra2013-01-174-1/+11
| | | | | | | | | | | | | | | | | | | | Added option to send message to another cacher using the form at gc.com.
* | | | | fix #2404: Remove spaces when editing coordinatesBananeweizen2013-01-171-17/+17
| |_|/ / |/| | |
* | | | Czech plurals for remaining timeIng. Jan Kaláb2013-01-171-1/+4
| | | |
* | | | Fix XML schema locationSamuel Tardieu2013-01-161-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | One extra element had been introduced during the previous code conversion to the XML serializer. That could theoritically affect verifiers.
* | | | Use XML serializer to generate proper XMLSamuel Tardieu2013-01-162-189/+159
| | | | | | | | | | | | | | | | Do not cook up XML by hand when proper methods exist.
* | | | Missing german translationLars2013-01-151-0/+1
| |_|/ |/| |