williameriksson126
|
25977e6600
|
Merge branch 'main' into live
|
2020-12-11 10:20:54 +01:00 |
|
williameriksson126
|
8bf47b9292
|
Attempted merge to live branch
|
2020-12-11 10:20:21 +01:00 |
|
William Eriksson
|
b56e334d00
|
Merge pull request #14 from thefeli73/we-new-users
Add: new locations
|
2020-12-11 10:08:31 +01:00 |
|
William Eriksson
|
c1fe945a41
|
Merge branch 'main' into we-new-users
|
2020-12-11 10:08:22 +01:00 |
|
williameriksson126
|
919fd4b438
|
Add: new locations
|
2020-12-11 10:06:24 +01:00 |
|
André Wahlberg
|
be292c8aa3
|
Change of track and fix minor design flaws
|
2020-12-10 13:55:34 +01:00 |
|
williameriksson126
|
f7cbe39b0d
|
Merge conflicts and small fixes
|
2020-12-10 13:21:09 +01:00 |
|
williameriksson126
|
078393335a
|
Add: Update user disruption status when user is not selected
|
2020-12-10 13:19:07 +01:00 |
|
André Wahlberg
|
5cafe99946
|
Present correct information about track in traffic info
|
2020-12-10 12:48:36 +01:00 |
|
André Wahlberg
|
28d549de28
|
Minor design and typo fixes
|
2020-12-10 12:47:20 +01:00 |
|
williameriksson126
|
cd2a61947f
|
Add: DateTime handling when displaying delay
|
2020-12-10 12:32:40 +01:00 |
|
williameriksson126
|
cf977ccb1f
|
Almost done, final touches needed
|
2020-12-10 11:47:46 +01:00 |
|
André Wahlberg
|
1b3f5abd25
|
Fix nonexisting info being displayed oddly
|
2020-12-10 11:17:10 +01:00 |
|
André Wahlberg
|
9e185ef941
|
Fix wrong function name
|
2020-12-10 11:16:18 +01:00 |
|
williameriksson126
|
031829d4f9
|
Add: Traffic info now shows disruption data as well. Format of new time needs to be rewritten
|
2020-12-10 11:15:17 +01:00 |
|
williameriksson126
|
2b8c08e082
|
Change: departureuser4 to work correctly and updated UI for disruptions
|
2020-12-10 11:01:43 +01:00 |
|
William Eriksson
|
19282607ba
|
Merge pull request #13 from thefeli73/we-out-of-creativity-for-names
Add: Progress
|
2020-12-10 10:46:10 +01:00 |
|
William Eriksson
|
308bd7b99f
|
Merge branch 'main' into we-out-of-creativity-for-names
|
2020-12-10 10:45:54 +01:00 |
|
André Wahlberg
|
8e21856eb2
|
Update page when changing user
|
2020-12-10 10:43:43 +01:00 |
|
williameriksson126
|
df3e181e2e
|
Add: Progress
|
2020-12-10 10:43:43 +01:00 |
|
André Wahlberg
|
211257ac67
|
Fix traffic info crash
|
2020-12-10 10:24:02 +01:00 |
|
William Eriksson
|
3b6aed2e41
|
Merge pull request #12 from thefeli73/we-departureboard-example
Add: json files for departure board for all users
|
2020-12-10 10:15:45 +01:00 |
|
williameriksson126
|
2c5567cb62
|
Add: json files for departure board for all users
|
2020-12-10 10:15:00 +01:00 |
|
William Eriksson
|
6d6356d576
|
Merge pull request #11 from thefeli73/we-location-select
Add: More progress regarding findstops button
|
2020-12-10 09:57:02 +01:00 |
|
williameriksson126
|
5c59866dc4
|
Add: More progress regarding findstops button
|
2020-12-10 09:56:24 +01:00 |
|
William Eriksson
|
9ccd2f01c0
|
Merge pull request #10 from thefeli73/we-location-select
Add: Json files for nearby busstops and a component for accessing sai…
|
2020-12-09 17:55:12 +01:00 |
|
williameriksson126
|
d304b250a2
|
Add: Json files for nearby busstops and a component for accessing said json files
|
2020-12-09 17:54:28 +01:00 |
|
Thefeli73
|
acf35a85b7
|
.
|
2020-12-08 19:48:09 +01:00 |
|
Thefeli73
|
29abac7a46
|
test push
|
2020-12-08 19:36:52 +01:00 |
|
Thefeli73
|
ea2296f77f
|
move payload to sub folder
|
2020-12-08 19:36:02 +01:00 |
|
Thefeli73
|
4e2273f558
|
fix payload
|
2020-12-08 19:35:40 +01:00 |
|
André Wahlberg
|
68b6e4e836
|
Polish and button functionality for traffic info page
|
2020-12-08 12:28:33 +01:00 |
|
André Wahlberg
|
3accd7806a
|
Add help message for button errors
|
2020-12-08 12:28:32 +01:00 |
|
William Eriksson
|
b207b464bd
|
Merge pull request #9 from thefeli73/we-select-user
Add: Multiple disruptions
|
2020-12-08 12:10:51 +01:00 |
|
williameriksson126
|
2d2ec96533
|
Add: Multiple disruptions
|
2020-12-08 12:10:08 +01:00 |
|
William Eriksson
|
359c0a8192
|
Merge pull request #8 from thefeli73/we-select-user
Add: Select user buttons
|
2020-12-08 11:55:46 +01:00 |
|
williameriksson126
|
3c0fc6fe1f
|
Add: Select user buttons
|
2020-12-08 11:54:34 +01:00 |
|
William Eriksson
|
c7517f185c
|
Merge pull request #7 from thefeli73/we-fix-broken-git
We fix broken git
|
2020-12-08 10:43:20 +01:00 |
|
williameriksson126
|
d39f114d5c
|
Fix 2of2
|
2020-12-08 10:42:50 +01:00 |
|
williameriksson126
|
a0ff50ab23
|
Fix 1of2
|
2020-12-08 10:41:31 +01:00 |
|
William Eriksson
|
ca1ca3884d
|
Merge pull request #6 from thefeli73/we-demo-disruption-first
Add: code to fetch disruption data and see if it is relevant
|
2020-12-08 10:30:41 +01:00 |
|
williameriksson126
|
ea2a18f3ad
|
Add: code to fetch disruption data and see if it is relevant
|
2020-12-08 10:29:03 +01:00 |
|
William Eriksson
|
75b4ecc4ed
|
Merge pull request #5 from thefeli73/we-json-examples
Add: json files for scenarios
|
2020-12-08 09:38:22 +01:00 |
|
William Eriksson
|
3080359dcd
|
Merge branch 'main' into we-json-examples
|
2020-12-08 09:38:11 +01:00 |
|
williameriksson126
|
3d7e6cf52f
|
Add: json files for scenarios
|
2020-12-08 09:36:19 +01:00 |
|
William Eriksson
|
34f4b8af18
|
Merge pull request #4 from thefeli73/we-Disruption-base
We disruption base
|
2020-12-08 09:18:21 +01:00 |
|
William Eriksson
|
7c59fa2825
|
Merge branch 'main' into we-Disruption-base
|
2020-12-08 09:18:00 +01:00 |
|
williameriksson126
|
31263e919e
|
Minor modifications to Example API components and base classes
|
2020-12-08 09:13:38 +01:00 |
|
André Wahlberg
|
a56c68e60f
|
Remove irrelevant button errors in console
|
2020-12-04 12:04:55 +01:00 |
|
André Wahlberg
|
2ea7a8d701
|
Updated class changes in TrafficEntry
|
2020-12-04 12:04:54 +01:00 |
|