cgeo.git - cgeo without proprietary dependencies

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'release'	rsudev	2014-08-14	56	-309/+337
\|\
\| *	Merge pull request #4171 from rsudev/crowdin_translations	rsudev	2014-08-14	54	-302/+325
\| \|\ \| \| \| \| \| \|	crowdin: New translations
\| \| *	crowdin: New translations	rsudev	2014-08-14	54	-302/+325
\| \|/
\| *	#4157: show toast starting/stopping speech	Bananeweizen	2014-08-13	2	-7/+12
\| \|
* \|	Merge branch 'release'	Bananeweizen	2014-08-13	1	-15/+25
\|\ \ \| \|/
\| *	Merge pull request #4168 from schwabe/fix_1745	Bananeweizen	2014-08-13	1	-14/+25
\| \|\ \| \| \| \| \| \|	Fix #1745: Fix Waypoint description overlapping navigation icon
\| \| *	Fix #1745: Fix Waypoint description overlapping navigation icon	Arne Schwabe	2014-08-13	1	-14/+25
\| \|/
* \|	new: invoke keyboard on log text field	Bananeweizen	2014-08-13	3	-0/+19
\| \|
* \|	fix #4169: update trackable log after logging	Bananeweizen	2014-08-13	3	-6/+40
\| \|
* \|	#3034 Additional correction	Lars	2014-08-13	1	-1/+1
\| \|
* \|	Use more idiomatic constructs from Jackson library	Samuel Tardieu	2014-08-13	1	-6/+4
\| \|
* \|	refactoring: remove unused import	Bananeweizen	2014-08-12	1	-1/+0
\| \|
* \|	fix #4151: proguard use for Gradle debug builds	Samuel Tardieu	2014-08-12	1	-1/+1
\| \|
* \|	Fix #3034 Sync wording with Playstore	Lars	2014-08-12	1	-3/+3
\| \| \| \| \| \|	https://github.com/cgeo/cgeo/wiki/Calendar-Plugin-description-for-PlayStore
* \|	Merge branch 'release' into upstream	Samuel Tardieu	2014-08-12	2	-15/+9
\|\ \ \| \|/
\| *	Never block when building a cache/waypoint details creator	Samuel Tardieu	2014-08-12	2	-15/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Blocking on the UI thread may prevent other looper threads from executing, including the ones in charge of receiving the location updates. This may lead to deadlocks when, for example, starting cgeo from a cache URL if cgeo has not been started before.
* \|	Merge branch 'release' into upstream	Samuel Tardieu	2014-08-12	1	-1/+1
\|\ \ \| \|/
\| *	fix #4166: inconsistent labels for non-event cache	Samuel Tardieu	2014-08-12	1	-1/+1
\| \|
* \|	Merge branch 'release' into upstream	Samuel Tardieu	2014-08-12	3	-11/+5
\|\ \ \| \|/
\| *	fix #4165: avatar no longer recognized	Samuel Tardieu	2014-08-12	2	-11/+4
\| \|
\| *	Update changelog_release.xml	Lars	2014-08-12	1	-0/+1
\| \|
* \|	Do not make firstRun variable static	Samuel Tardieu	2014-08-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	It looks like the emulator may reuse the same program instance after a deinitialization. Part of fix for #4150.
* \|	Revert "#4140 disable play services due to blocking geodata call"	Samuel Tardieu	2014-08-12	1	-1/+3
\| \| \| \| \| \| \| \| \| \|	This reverts commit 1f7d1118248a51e18bbb18144511d843a53ff151 as #4140 has been fixed.
* \|	fix #4140: blocking geodata call in emulator	Samuel Tardieu	2014-08-12	3	-4/+16
\| \|
* \|	Merge branch 'release' into upstream	Samuel Tardieu	2014-08-12	1	-4/+2
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: main/src/cgeo/geocaching/connector/oc/OkapiClient.java
\| *	fix #4164: error when no log present for an Okapi cache	Samuel Tardieu	2014-08-12	1	-4/+2
\| \|
* \|	Use more idiomatic constructs from Jackson library	Samuel Tardieu	2014-08-12	1	-9/+6
\| \|
* \|	Fix JSON node construction	Samuel Tardieu	2014-08-12	1	-1/+2
\| \| \| \| \| \| \| \|	This fix for an infrequent code path is similar to the one for #4161.
* \|	Merge branch 'release' into upstream	Samuel Tardieu	2014-08-12	0	-0/+0
\|\ \ \| \|/
\| *	Allow erasing of personal note on server	Samuel Tardieu	2014-08-12	1	-1/+1
\| \| \| \| \| \| \| \|	This is the "release" part of fix for #4163.
* \|	Dummy sources for Intellij IDEA / Play services	Samuel Tardieu	2014-08-12	1	-0/+2
\| \|
* \|	Allow erasing of personal note on server	Samuel Tardieu	2014-08-12	1	-1/+1
\| \| \| \| \| \| \| \|	This is the "master" part of fix for #4163.
* \|	Fixes #4158, No caches returned from OC.de	rsudev	2014-08-12	1	-2/+1
\| \|
* \|	fix #4161: upload of personal note not working	Samuel Tardieu	2014-08-12	1	-3/+2
\| \|
* \|	refactoring: move suppressWarnings from class level to method level	Bananeweizen	2014-08-11	2	-12/+12
\| \|
* \|	explicitly set context for layout editor	Bananeweizen	2014-08-11	64	-82/+192
\| \|
* \|	typo	Bananeweizen	2014-08-10	1	-1/+1
\| \|
* \|	more strict checking of Maps API key	Bananeweizen	2014-08-10	1	-6/+7
\| \|
* \|	have shared moreunit settings for eclipse	Bananeweizen	2014-08-10	2	-3/+4
\| \|
* \|	Merge branch 'release'	rsudev	2014-08-10	1	-64/+64
\|\ \ \| \|/
\| *	Merge pull request #4152 from rsudev/crowdin_translations	rsudev	2014-08-10	1	-64/+64
\| \|\ \| \| \| \| \| \|	crowdin: New translations
\| \| *	crowdin: New translations	rsudev	2014-08-10	1	-64/+64
\| \|/
* \|	#4140: completely ignore EMMA in proguard	Bananeweizen	2014-08-09	1	-1/+2
\| \|
* \|	Merge branch 'release'	Bananeweizen	2014-08-09	1	-1/+1
\|\ \ \| \|/
\| *	fix #4132: backport GPX test fix	Bananeweizen	2014-08-09	1	-4/+9
\| \|
\| *	#4143: maybe avoid bad HTML parsing using HTML color codes	Bananeweizen	2014-08-09	1	-1/+1
\| \|
* \|	enable proguard in gradle build	Bananeweizen	2014-08-09	1	-2/+2
\| \| \| \| \| \|	Someone using IDEA or AS please verify this change.
* \|	#4140: keep some test only classes in proguard	Bananeweizen	2014-08-09	1	-0/+5
\| \| \| \| \| \| \| \| \| \|	These classes should not be whitelisted in our general ProGuard configuration. But for the time being lets include them to have a running test again.
* \|	#4140 disable play services due to blocking geodata call	Bananeweizen	2014-08-09	1	-3/+1
\| \|
* \|	#4140 keep all cgeo code in proguard	Bananeweizen	2014-08-09	1	-1/+1
\| \|