aboutsummaryrefslogtreecommitdiffstats
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* fix #2841: *.loc from waymarking not importedBananeweizen2013-06-082-18/+20
|
* refactoring: extract constantBananeweizen2013-06-081-13/+15
| | | * also optimize append for character only
* refactoring: remove new lint warningBananeweizen2013-06-071-1/+0
|
* updated translation-itRomNexus62013-06-071-2/+35
| | | | fixed external editor plugins and tab options. hope it's now ok...
* Merge pull request #2842 from campbeb/fixErrorMessagesSamuel Tardieu2013-06-0726-41/+41
|\ | | | | Correct log messages to account for refactoring
| * Correct log messages to account for refactoringcampbeb2013-06-0526-41/+41
| |
* | Merge remote-tracking branch 'origin/release'mucek42013-06-061-3/+10
|\ \ | |/ |/| | | | | Conflicts: main/res/values/strings_not_translatable.xml
| * Release note update & Version infoLars2013-06-051-0/+5
| |
* | Merge pull request #2838 from campbeb/fix2837rsudev2013-06-041-1/+3
|\ \ | | | | | | Fix #2837 - Check for null waypoint coords in hasIdenticalWaypoint
| * | Fix #2837 - Check for null waypoint coords in hasIdenticalWaypointcampbeb2013-06-041-1/+3
| | | | | | | | | | | | Fixes #2837
* | | Fixes #2829, OC caches do not refreshrsudev2013-06-051-1/+1
|/ / | | | | | | | | The request fields were checking for level3 OAuth, but the request was using level1.
* | Merge remote-tracking branch 'upstream/release' into currdevrsudev2013-06-042-2/+12
|\ \ | |/
| * Fixes #2833, website changes 2013-06-02rsudev2013-06-042-2/+12
| | | | | | | | | | Get custom dateformat from login Use it for posting logs
| * Revert "#2833: fix log date format"Bananeweizen2013-06-041-4/+2
| | | | | | | | This reverts commit acc402b3876d7022d19ff409caaa545ddb6e0f32.
| * #2833: fix log date formatBananeweizen2013-06-041-2/+4
| |
* | fix #2825: hide empty sections in trackable viewBananeweizen2013-06-021-2/+3
| |
* | refactoring: extract some common code out of log viewersBananeweizen2013-06-023-68/+56
| |
* | #2697: enlarge meta data column in logs viewBananeweizen2013-06-026-248/+125
| | | | | | | | * this unifies the trackable and cache logs by re-using the exact same layout
* | refactoring: apply android formatter to all XML filesBananeweizen2013-06-02111-14323/+14443
| | | | | | * makes it easier to compare and find duplicate code
* | refactoring: remove common proguard settingsBananeweizen2013-06-021-30/+10
| |
* | refactoring: reuse default proguard settingsBananeweizen2013-06-023-3/+4
| | | | | | * see http://tools.android.com/recent/proguardimprovements
* | Merge pull request #2822 from marco-jacob/fixPersonalNotePart1Marco Jacob2013-06-014-3/+62
|\ \ | | | | | | add upload personal note to Connectors
| * | add upload personal note to ConnectorsMarco Jacob2013-06-014-3/+62
| | |
* | | fix #2057: Reliable crash when opening a certain cacheBananeweizen2013-06-011-1/+8
| | |
* | | new: use "today" and "yesterday" in log viewsBananeweizen2013-06-012-3/+3
| | |
* | | fix #2817: OSM:Offline map name won't fit the boxBananeweizen2013-06-0114-14/+14
| | |
* | | fix #2820: OC search no longer working without authorizationBananeweizen2013-06-013-19/+39
|/ /
* | refactoring: remove the cache realmBananeweizen2013-06-018-54/+39
| | | | | | | | * the cache realm enumeration ties different connectors together * everything in the realm can also be stored at the connector instead
* | refactoring: extract method to simplify control flowBananeweizen2013-06-011-7/+8
| |
* | update eclipse installation meta dataBananeweizen2013-06-012-124/+131
| |
* | test github triggerBananeweizen2013-06-011-1/+1
| |
* | test Jenkins commit status notificationBananeweizen2013-06-011-1/+1
| |
* | #2809: don't load elevation by defaultBananeweizen2013-06-011-2/+2
| |
* | #2725: Feature-Request: Circles on the map only around physical stagesBananeweizen2013-06-012-9/+7
| |
* | update to recent android http libraryBananeweizen2013-06-011-0/+0
| |
* | proguard: keep the whole injector classesSamuel Tardieu2013-05-311-2/+1
| | | | | | | | | | | | | | It is necessary to keep the whole injector classes, even though they appear to be dynamically referenced. Using "keep" instead of "keepclassmembers" will ensure that those classes are considered as being additional entry points for reference analysis purpose.
* | Fixes #2800, Reactivate OCTestrsudev2013-05-316-30/+138
| | | | | | | | | | Expanded OkapiClient to accomodate for different OAuth levels and Api capabilities Reenabled test
* | Fixes #2813, NPE when trying to open stored listrsudev2013-05-311-0/+1
| | | | | | | | Explicit keep for missing ViewInjector in proguard.cfg
* | Merge branch 'release'Bananeweizen2013-05-311-1/+13
|\ \ | |/
| * #2810 #2815 make parser work with old and new web pageBananeweizen2013-05-311-1/+13
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2013-05-311-1/+1
|\ \ | |/
| * Release note updateLars2013-05-311-1/+1
| |
* | Merge remote-tracking branch 'origin/release'Bananeweizen2013-05-311-7/+7
|\ \ | |/
| * fix #2815 trackable loggingBananeweizen2013-05-311-7/+7
| |
* | refactoring: fix compiler warningsBananeweizen2013-05-311-3/+3
| |
* | Merge remote-tracking branch 'origin/release'Bananeweizen2013-05-313-8/+11
|\ \ | |/
| * Version info, release note updateLars2013-05-311-2/+2
| |
| * fix #2812: attributes parsingBananeweizen2013-05-311-2/+2
| |
| * Release note updateLars2013-05-311-0/+2
| |
| * fix #2810 log page changesBananeweizen2013-05-311-5/+6
| |