aboutsummaryrefslogtreecommitdiffstats
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* fix some findbugs issuesBananeweizen2014-09-078-29/+39
* fix #4312: OOM in Jenkins findbugsBananeweizen2014-09-072-4/+5
* Merge branch 'release' into upstreamSamuel Tardieu2014-09-071-0/+1
|\
| * Disable HW acceleration for Samsung Galaxy SII Plus (#4265)Samuel Tardieu2014-09-071-0/+1
* | fix #4076: first UI tests with espressoBananeweizen2014-09-071-10/+10
* | refactoring: use interface types instead of implementationBananeweizen2014-09-071-2/+2
* | use new instrumentation test runnerBananeweizen2014-09-071-3/+1
* | Upgrade to RxJava 0.20.4Samuel Tardieu2014-09-0620-8/+8
* | Merge branch 'release' into upstreamSamuel Tardieu2014-09-061-17/+17
|\ \ | |/
| * fix #4322: do not react on screen size changeSamuel Tardieu2014-09-061-18/+18
* | import lab caches as virtualBananeweizen2014-09-062-5/+12
* | fix #4244: different zoom for normal map and map of single cacheBananeweizen2014-09-063-4/+43
* | fix #4323: use cache icon and name as activity titleBananeweizen2014-09-054-20/+28
* | avoid repeated cache loadingBananeweizen2014-09-051-2/+2
* | remove private intent extra constantsBananeweizen2014-09-052-7/+5
* | Merge branch 'release' into upstreamSamuel Tardieu2014-09-052-1/+2
|\ \ | |/
| * fix #4284: Upload coordinates has bad titleMathieu Alorent2014-09-052-1/+2
* | fix #4252: allow logging from compass of waypointBananeweizen2014-09-045-76/+87
* | Merge branch 'issue-4260' into upstreamSamuel Tardieu2014-09-044-2/+16
|\ \
| * | fix #4260 & #3194: sort and resort problemsMathieu Alorent2014-09-044-3/+18
| |/
* | Merge branch 'release' into upstreamSamuel Tardieu2014-09-041-1/+1
|\ \ | |/
| * Fix #4300 Updated Locus decriptionLars2014-09-031-1/+1
* | Merge branch 'waypoint-fixes' of git://github.com/chkr-private/cgeo into upst...Samuel Tardieu2014-09-041-6/+4
|\ \
| * | Don't update overlayCaches if just one point is displayedChristian Krause2014-08-191-2/+4
| * | Minor refactoringChristian Krause2014-08-191-7/+3
* | | disable RTL related lint checksBananeweizen2014-09-031-0/+2
* | | list all waypoints as navigation target in compassBananeweizen2014-09-034-47/+44
* | | visual editor layout previewBananeweizen2014-09-031-1/+2
* | | upgrade to butterknife 5.1.2Bananeweizen2014-09-034-3/+3
* | | Close input stream after useSamuel Tardieu2014-09-031-1/+6
* | | Parse GCVote as a streamSamuel Tardieu2014-09-031-6/+7
* | | Update Intellij IDEA filesSamuel Tardieu2014-09-031-0/+1
* | | fix #1437: auto fill waypoint name after type selectionBananeweizen2014-09-032-35/+70
* | | replace wrongly used escape sequence in stringsBananeweizen2014-09-0219-23/+6
* | | Merge branch 'release'Bananeweizen2014-09-021-1/+1
|\ \ \ | | |/ | |/|
| * | fix #4302: unpublished caches not recognizedBananeweizen2014-09-021-1/+1
* | | fix #4251: confirmation on clear offline logsBananeweizen2014-09-022-8/+15
* | | Merge branch 'release' into upstreamSamuel Tardieu2014-09-024-13/+464
|\ \ \ | |/ /
| * | crowdin: New translationsSamuel Tardieu2014-09-024-13/+464
* | | Better fix for #4294Samuel Tardieu2014-09-021-65/+74
* | | Merge branch 'release' into upstreamSamuel Tardieu2014-09-021-1/+1
|\ \ \ | |/ /
| * | Version code for change logLars2014-09-021-1/+1
* | | avoid superfluous empty space in trackable goalBananeweizen2014-09-012-11/+22
* | | fix #4294: do not migrate nonexistent settingsSamuel Tardieu2014-09-011-0/+6
* | | Merge branch 'release' into upstreamSamuel Tardieu2014-09-012-1/+3
|\ \ \ | |/ /
| * | Merge branch 'issue-4015' into releaseSamuel Tardieu2014-09-012-1/+3
| |\ \
| | * | fix #4015: recognize new date formats on gc.comSamuel Tardieu2014-09-012-1/+3
* | | | Merge branch 'release' into upstreamSamuel Tardieu2014-09-011-0/+1
|\ \ \ \ | |/ / /
| * | | Update changelogSamuel Tardieu2014-09-011-0/+1
| |/ /
* | | fix #4271: use today and yesterday in trackable last seenBananeweizen2014-09-012-17/+28