 Sem van der Hoeven
|
8169e8c680
|
added back diff line
|
2021-01-07 11:35:44 +01:00 |
|
|
SemvdH
|
6eeb0870fc
|
Merge pull request #3 from SemvdH/develop
Develop
v1.1
|
2021-01-07 11:21:59 +01:00 |
|
|
Sem van der Hoeven
|
20431d019b
|
Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop
|
2021-01-07 11:20:58 +01:00 |
|
|
Sem van der Hoeven
|
7e99070002
|
added ok button to help popup
|
2021-01-07 11:20:48 +01:00 |
|
|
SemvdH
|
452bc00848
|
Merge pull request #1 from SemvdH/develop
Merge develop into master
v1.0
|
2021-01-06 23:20:50 +01:00 |
|
|
SemvdH
|
056c679442
|
Merge pull request #2 from SemvdH/imperial-system
merge imperial into dev
|
2021-01-06 23:20:26 +01:00 |
|
|
SemvdH
|
01e7cb5fdf
|
Merge branch 'develop' into imperial-system
|
2021-01-06 23:20:13 +01:00 |
|
|
Bart
|
c98acaf7c0
|
Added support for imperial units
|
2021-01-06 22:27:59 +01:00 |
|
|
Sem van der Hoeven
|
c68bbd4062
|
ctrl alt L
|
2021-01-06 21:19:06 +01:00 |
|
|
Sem van der Hoeven
|
c778ab2de8
|
Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop
|
2021-01-06 21:04:28 +01:00 |
|
|
Sem van der Hoeven
|
7d833c8ec5
|
fix 2.0
|
2021-01-06 21:04:21 +01:00 |
|
|
RemoMeijer
|
b3f0497fba
|
Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop
|
2021-01-06 21:04:06 +01:00 |
|
|
RemoMeijer
|
9da1078998
|
updated distance calculations
|
2021-01-06 21:04:03 +01:00 |
|
|
Robin Koedood
|
f552afb49e
|
[ADD] ROUTE TEST NIEUWE METHODE
|
2021-01-06 21:01:20 +01:00 |
|
|
Sem van der Hoeven
|
2c7db11917
|
Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop
|
2021-01-06 20:59:57 +01:00 |
|
|
Sem van der Hoeven
|
f062b1915c
|
fix?
|
2021-01-06 20:59:48 +01:00 |
|
|
RemoMeijer
|
bbab7b2bb1
|
improved icons
|
2021-01-06 20:59:27 +01:00 |
|
|
RemoMeijer
|
bbdf9a7d29
|
Replaced images with icons
|
2021-01-06 20:51:16 +01:00 |
|
|
Sem van der Hoeven
|
23beac0cf0
|
Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop
|
2021-01-06 20:48:55 +01:00 |
|
|
Sem van der Hoeven
|
f3e636f586
|
added route calculating time
|
2021-01-06 20:48:45 +01:00 |
|
|
Bart
|
5f11d58300
|
Updated default language dropdown position (en -> nl)
|
2021-01-06 20:46:21 +01:00 |
|
|
sebas
|
12a4737567
|
Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop
# Conflicts:
# app/src/main/assets/routes.json
|
2021-01-06 20:43:34 +01:00 |
|
|
sebas
|
bd58927573
|
Finished the final translation
|
2021-01-06 20:42:03 +01:00 |
|
|
Sem van der Hoeven
|
023647d418
|
Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop
|
2021-01-06 20:37:43 +01:00 |
|
|
Bipin
|
5cc559d7ef
|
HelpPopup goed genoeg
|
2021-01-06 20:26:48 +01:00 |
|
|
Sem van der Hoeven
|
bf55bcef3d
|
Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop
|
2021-01-06 20:20:19 +01:00 |
|
|
Sem van der Hoeven
|
76832f5a54
|
centercrop
|
2021-01-06 20:20:07 +01:00 |
|
|
Bipin
|
7da259a179
|
Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop
|
2021-01-06 20:17:01 +01:00 |
|
|
Bipin
|
115c064f11
|
Scrollable help
|
2021-01-06 20:16:48 +01:00 |
|
|
RemoMeijer
|
9a05e486c1
|
Removed landscape mode, since it wont be used
|
2021-01-06 20:12:25 +01:00 |
|
|
Bart
|
22d760bbda
|
Updated language, removed chinese from language dropdown
|
2021-01-06 20:10:27 +01:00 |
|
|
RemoMeijer
|
7f9783aeb1
|
Text on 65+ mode not in total distance anymore
|
2021-01-06 20:09:11 +01:00 |
|
|
RemoMeijer
|
91db76c6d5
|
Start route button not in nav bar anymore
|
2021-01-06 20:06:46 +01:00 |
|
|
RemoMeijer
|
cb2800977e
|
fixed route
|
2021-01-06 20:00:18 +01:00 |
|
|
RemoMeijer
|
352e6ef5a7
|
fixed nl route
|
2021-01-06 19:55:30 +01:00 |
|
|
Bart
|
195377fada
|
Fixed coupons
Locating wrong json
|
2021-01-06 19:52:42 +01:00 |
|
|
RemoMeijer
|
da0a919ca1
|
Updated the routes coordinates
|
2021-01-06 19:52:06 +01:00 |
|
|
Robin Koedood
|
17c39ab63e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-01-06 19:51:49 +01:00 |
|
|
Robin Koedood
|
aa6114e257
|
[FIXED] tests things
|
2021-01-06 19:51:42 +01:00 |
|
|
Sem van der Hoeven
|
13cc7be1d2
|
Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop
|
2021-01-06 19:49:19 +01:00 |
|
|
Sem van der Hoeven
|
611427b0d2
|
more coupons
|
2021-01-06 19:49:12 +01:00 |
|
|
RemoMeijer
|
e3fc976f5f
|
Updated the nl locations coordinates
|
2021-01-06 19:46:05 +01:00 |
|
|
Robin Koedood
|
f01f4fbdfa
|
[FIXED] CouponFragment test with string resource
|
2021-01-06 19:43:21 +01:00 |
|
|
Sem van der Hoeven
|
16bb984deb
|
Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop
|
2021-01-06 19:42:07 +01:00 |
|
|
Sem van der Hoeven
|
9828595e8b
|
proper context
|
2021-01-06 19:42:04 +01:00 |
|
|
RemoMeijer
|
5062a9fa67
|
Updated coordinates again
|
2021-01-06 19:40:38 +01:00 |
|
|
Bart
|
033052f480
|
Merge branch 'languages' into develop
|
2021-01-06 19:35:04 +01:00 |
|
|
Sem van der Hoeven
|
564eb597c6
|
Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop
|
2021-01-06 19:34:29 +01:00 |
|
|
Sem van der Hoeven
|
6fed07ca41
|
update routes with locations and imageurls
|
2021-01-06 19:34:22 +01:00 |
|
|
Bart
|
8a453f298a
|
Fixed file locating problem
|
2021-01-06 19:34:03 +01:00 |
|