cgeo.git - cgeo without proprietary dependencies

	Commit message (Collapse)	Author	Age	Files	Lines
*	fix conflict from manual merge in strings.xml	Bananeweizen	2013-07-19	1	-1/+2
\|
*	Proofread strings.xml for American English	JavaDog	2013-07-19	1	-79/+78
\| \| \| \| \| \| \| \|	Updated main/res/values/strings.xml, fixed errors in English spelling/grammar/phrasing. This commit should contain no other code. I'm bad at git, sorry about that :p
*	Merge pull request #3014 from koem/i2978SettingsNavMenu	Bananeweizen	2013-07-19	4	-2/+7
\|\ \| \| \| \|	Fixes #2978 - Settings: "System" instead of "More Options"
\| *	Fixex #2978 - Settings: "System" instead of "More Options"	koem	2013-07-19	4	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \|	- moved basic member settings to subscreen in gc-services - new settings screen "Navigation" - renamed "More Option" to "System"
* \|	Prepare addition of OKAPI for oc.pl	rsudev	2013-07-17	1	-0/+1
\|/
*	Merge pull request #3006 from Lineflyer/master	Lars	2013-07-15	1	-0/+9
\|\ \| \| \| \|	Updating changelog_master.xml
\| *	Update changelog_master.xml	Lars	2013-07-15	1	-0/+9
\| \| \| \| \| \|	Still catching up old changes to the changelog
* \|	Fix lint warning	Lars	2013-07-15	1	-1/+1
\| \| \| \| \| \|	:)
* \|	Removing some limitations	Lars	2013-07-15	1	-4/+0
\| \| \| \| \| \|	Those limitations/known bugs have been fixed
* \|	Merge branch 'release' into upstream	Samuel Tardieu	2013-07-14	1	-0/+6
\|\ \ \| \|/ \|/\|
\| *	Update changelog_release.xml	Lars	2013-07-14	1	-0/+6
\| \| \| \| \| \|	#2915
* \|	Update changelog_master.xml	Lars	2013-07-14	1	-2/+39
\| \| \| \| \| \| \| \|	Catching up the last months. Feel free to comment/correct if I did something wrong.
* \|	Merge branch 'release' into upstream	Samuel Tardieu	2013-07-14	1	-1/+1
\|\ \ \| \|/
\| *	cleanup: fix typo in release notes	Samuel Tardieu	2013-07-14	1	-1/+1
\| \|
* \|	Test master changelog information	Samuel Tardieu	2013-07-14	1	-0/+3
\| \|
* \|	Merge branch 'release' into upstream	Samuel Tardieu	2013-07-14	3	-80/+102
\|\ \ \| \|/ \| \| \| \| \| \| \| \|	Conflicts: main/res/values/strings_not_translatable.xml main/src/cgeo/geocaching/AboutActivity.java
\| *	fix #2956: management of release notes	Samuel Tardieu	2013-07-14	3	-182/+190
\| \|
* \|	cleanup: remove DOS line terminators	Samuel Tardieu	2013-07-14	1	-177/+177
\| \|
* \|	cleanup: remove unused button strings	Samuel Tardieu	2013-07-14	1	-3/+0
\| \|
* \|	cleanup: remove unused number picker and string resources	Samuel Tardieu	2013-07-14	1	-2/+0
\| \|
* \|	Remove latitude/elevation related settings	Samuel Tardieu	2013-07-14	2	-7/+2
\| \|
* \|	Even more string-resources cleanup	rsudev	2013-07-09	2	-6/+0
\| \|
* \|	Cleaning up string resources	rsudev	2013-07-09	1	-17/+0
\| \|
* \|	Move preference keys to resource	rsudev	2013-07-09	1	-0/+87
\| \|
* \|	Implements #750, use preference activity	koem	2013-07-09	4	-49/+132
\| \|
* \|	Revert "fix #2899: Recommended app "Bluetooth GPS" not found"	Bananeweizen	2013-07-05	1	-0/+2
\| \| \| \| \| \| \| \|	This reverts commit ec9e21f8f510bfcaf6645ab09bb6c7d358f529cb.
* \|	fix #2899: Recommended app "Bluetooth GPS" not found	Bananeweizen	2013-07-04	1	-2/+0
\| \|
* \|	Merge pull request #2893 from marco-jacob/fixPersonalNoteFinal	Marco Jacob	2013-06-27	1	-0/+4
\|\ \ \| \| \| \| \| \|	make personalNote multiline, upload on OK and merge on refresh
\| * \|	make personalNote multiline again, upload button, merge on refresh	Marco Jacob	2013-06-26	1	-0/+4
\| \| \|
* \| \|	Implements #2900, Support logging with password (oc)	rsudev	2013-06-27	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extends db, geocache and OKAPI to retrieve and store the property Extends logging UI and OKAPI to allow entering and sending it
* \| \|	Streamlined implementation of connector status info	rsudev	2013-06-25	1	-0/+1
\| \| \|
* \| \|	Refactor main activity layout, remove duplicates	rsudev	2013-06-23	1	-0/+15
\| \| \|
* \| \|	Merge branch 'release' into upstream	Samuel Tardieu	2013-06-22	1	-1/+2
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: main/res/values-fr/strings.xml main/res/values/strings.xml send2cgeo/send2cgeo.user.js
\| * \|	close #2915: add a closeout status message for sdk < 7	Samuel Tardieu	2013-06-22	1	-0/+1
\| \| \|
* \| \|	fix #2914: bike navigation	Bananeweizen	2013-06-22	1	-0/+1
\| \| \|
* \| \|	refactoring: remove unused string	Bananeweizen	2013-06-22	1	-1/+0
\| \| \|
* \| \|	fix #2908: Ask for list on attachment import	Bananeweizen	2013-06-22	1	-2/+2
\| \| \|
* \| \|	quantity zero in plurals for en deleted	koem	2013-06-21	1	-1/+0
\| \| \|
* \| \|	plurals for direction, singulars for distances	koem	2013-06-20	1	-0/+5
\| \| \|
* \| \|	#2747 TTS distances should use Android plurals	koem	2013-06-19	1	-4/+16
\| \| \|
* \| \|	new: show basic geokrety information	Bananeweizen	2013-06-16	1	-1/+7
\| \| \|
* \| \|	fix #2886: trackable quick search not working	Bananeweizen	2013-06-16	1	-1/+2
\| \|/ \|/\| \| \| \| \| \| \|	* introduce separate trackable connectors * new detection of not activated trackables * fix geokrety urls
* \|	Merge remote-tracking branch 'origin/release'	mucek4	2013-06-06	1	-3/+10
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: main/res/values/strings_not_translatable.xml
\| *	Release note update & Version info	Lars	2013-06-05	1	-0/+5
\| \|
* \|	#2697: enlarge meta data column in logs view	Bananeweizen	2013-06-02	1	-0/+40
\| \| \| \| \| \| \| \|	* this unifies the trackable and cache logs by re-using the exact same layout
* \|	refactoring: apply android formatter to all XML files	Bananeweizen	2013-06-02	12	-1189/+1208
\| \| \| \| \| \|	* makes it easier to compare and find duplicate code
* \|	fix #2817: OSM:Offline map name won't fit the box	Bananeweizen	2013-06-01	1	-1/+1
\| \|
* \|	Merge branch 'release' into upstream	Samuel Tardieu	2013-05-31	1	-1/+1
\|\ \ \| \|/
\| *	Release note update	Lars	2013-05-31	1	-1/+1
\| \|
* \|	Merge remote-tracking branch 'origin/release'	Bananeweizen	2013-05-31	1	-1/+3
\|\ \ \| \|/