summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'trunk' into distance_set_last.returndistance_set_last.returnPierre GRANDIN2018-01-097-29/+93
|\
| * fix:android:Use date of commit as version code instead of system time (#376)jkoan2018-01-091-14/+52
| |
| * fix:gtk:Initialize Follow menu entry correctly. (#390)Charles Curley2018-01-081-0/+4
| | | | | | | | | | | | This should fix http://trac.navit-project.org/ticket/1357 I tested for follow_vehicle set to zero and one, and absent. modified: navit/gui/gtk/gui_gtk_action.c
| * Merge pull request #389 from mvglasow/doc20180104mvglasow2018-01-041-7/+8
| |\ | | | | | | Refactor:route:Improve documentation
| | * Refactor:route:Improve documentationmvglasow2018-01-041-7/+8
| |/ | | | | | | Signed-off-by: mvglasow <michael -at- vonglasow.com>
| * fix:wince:fixed the wince build (#386)Pierre GRANDIN2018-01-022-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Switching to a specific image * Fixed typo in circleci config file * Activated wince build * Store build artifacts * Build a samplemap for wince * Added correct shebang header * Switched to a navit org docker image for wince * Generate a cab file
| * Sailfish build on newer SDKs (#388)Stefan Wildemann2017-12-312-3/+8
| | | | | | | | | | | | | | | | * Allow building on new sailfish SDK which uses different tool paths * Add notice about exportig VERSION_ID * Add check for VERSION_ID variable.
* | Merge branch 'trunk' into distance_set_last.returnPierre GRANDIN2017-12-273-176/+180
|\ \ | |/
| * add:graphics-qt5:add missing watchEvent slot (#387)Pierre GRANDIN2017-12-262-0/+14
| | | | | | | | | | | | * Fix:add missing watchEvent slot implementation * Fix:add missing watchEvent slot implementation
| * Merge pull request #344 from youte62/icon_damStefan Wildemann2017-12-261-176/+166
| |\ | | | | | | Updated Icon for dam
| | * Merge branch 'trunk' into icon_damStefan Wildemann2017-12-266-147/+261
| | |\ | | |/ | |/|
| | * Merge branch 'trunk' into icon_damStefan Wildemann2017-12-0464-1596/+1952
| | |\
| | * | update:icon:updated dam.svgyoute622017-10-301-176/+166
| | | |
* | | | Added a comment on this method of calculating the number of elementsCharles Curley2017-12-061-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in an array (#define SIZE_OF_ARRAY_DISTANCES). comment:navit:navigation.c modified: navit/navigation.c
* | | | Merge branch 'trunk' into distance_set_last.returnStefan Wildemann2017-12-068-154/+272
|\ \ \ \ | |/ / /
| * | | Refactor:route:More documentation (#385)v0.5.1-rc1mvglasow2017-12-061-9/+21
| | | |
| * | | fix:ci:Install imagemagick for android build to convert images (#384)jkoan2017-12-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update setup_android.sh * Update setup_android.sh * Update setup_common_requirements.sh * Update setup_tomtom_requirements.sh
| * | | Merge pull request #333 from youte62/icon_goverment_buildingStefan Wildemann2017-12-041-0/+148
| |\ \ \ | | | | | | | | | | add:icon:governement_building
| | * \ \ Merge branch 'trunk' into icon_goverment_buildingStefan Wildemann2017-12-0471-1911/+3374
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #341 from youte62/icon_crossingStefan Wildemann2017-12-041-81/+64
| |\ \ \ \ | | | | | | | | | | | | Update icon for crossing
| | * \ \ \ Merge branch 'trunk' into icon_crossingStefan Wildemann2017-12-041-55/+26
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #346 from youte62/icon_drinking_waterStefan Wildemann2017-12-041-55/+26
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Update Icon drinking water
| | * | | | Merge branch 'trunk' into icon_drinking_waterStefan Wildemann2017-12-0464-1596/+1952
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | update:icon:update drinking_water iconyoute622017-10-291-18/+3
| | | | | |
| | * | | | Merge branch 'icon_drinking_water' of https://github.com/youte62/navit into ↵youte622017-10-2911-358/+1606
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | icon_drinking_water
| | | * | | | modify icons designed by me - free to useyoute622017-10-241-40/+26
| | | | |_|/ | | | |/| |
| | * | | | modify icons designed by me - free to useyoute622017-10-221-40/+26
| | | | | |
| | * | | | 200*200youte622017-10-141-40/+43
| | | | | |
| | * | | | add drinking_water.svg designed by me - free to useyoute622017-10-141-210/+112
| | | | | |
| | | | * | Merge branch 'trunk' into icon_crossingStefan Wildemann2017-12-0464-1596/+1952
| | | | |\ \ | | |_|_|/ / | |/| | | |
| * | | | | improve:ci:improved linux builds (#382)Pierre GRANDIN2017-12-042-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Standardize path wrt android build * Setup requirements in a seperate step, enhance readability of build output * Moved linux deps install to another step
| | | | * | modify icons designed by me - free to useyoute622017-10-241-81/+64
| | | |/ /
| | | | * update:icon:update goverment_building iconyoute622017-10-221-58/+38
| | | | |
| | | | * 200*200youte622017-10-141-52/+52
| | | | |
| | | | * add governement_building.svg designed by me - free to useyoute622017-10-141-0/+168
| | | |/ | | |/|
* | | | Once more with feeling. Get rid of the function distance_set_last ()Charles Curley2017-12-061-18/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entirely and use compile-time maths to do the work. fix:navit:navigation.c modified: navit/navigation.c
* | | | Merge branch 'trunk' into distance_set_last.returnPierre GRANDIN2017-12-0330-362/+749
|\ \ \ \ | |/ / /
| * | | fix:cmake:Make copy of files more reliable (#377)jkoan2017-12-031-2/+3
| | | |
| * | | fix:cmake:Rework of xslt convert process to fix the copy issue of the ↵jkoan2017-12-031-44/+53
| | | | | | | | | | | | | | | | | | | | navit.dtd file in android build (see process_xslt) (#381) Also forced tab with of 3 space
| * | | Merge pull request #379 from mvglasow/docmvglasow2017-12-022-2/+33
| |\ \ \ | | | | | | | | | | Add documentation
| | * \ \ Merge branch 'trunk' into docjkoan2017-12-024-15/+27
| | |\ \ \ | | |/ / / | |/| | |
| * | | | fix:gtk:Fix imperial factors. (#380)Charles Curley2017-12-024-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | Another go at fixing imperial measures. This is ready for testing on a different machine, but not for a pull request. Also, some improvements in some comments.
| | * | | Refactor:core:Documentation in trasform.cmvglasow2017-12-011-0/+31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: mvglasow <michael -at- vonglasow.com>
| | * | | Refactor:route:Improve struct route documentationmvglasow2017-11-301-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: mvglasow <michael -at- vonglasow.com>
| | * | | Merge branch 'trunk' into docmvglasow2017-11-3017-108/+196
| | |\ \ \ | | |/ / / | |/| | |
| * | | | add:icon:communication (#343)youte622017-11-261-28/+31
| | | | |
| * | | | Add some Documentation to Plugins (#375)jkoan2017-11-2615-32/+134
| | | | |
| * | | | add:icon:concert (#342)youte622017-11-261-48/+31
| | | | | | | | | | | | | | | add:icon:concert
| * | | | Refine documentation (#378)mvglasow2017-11-262-19/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Refactor:route:Improve documentation Signed-off-by: mvglasow <michael -at- vonglasow.com> * Refactor:core:Refine documentation Signed-off-by: mvglasow <michael -at- vonglasow.com> * Refactor:core:Improve documentation Signed-off-by: mvglasow <michael -at- vonglasow.com> * Refactor:core:Improve documentatio Signed-off-by: mvglasow <michael -at- vonglasow.com>
| | * | | Refactor:core:Improve documentatiomvglasow2017-11-261-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: mvglasow <michael -at- vonglasow.com>