Commit Graph

  • e790e6ede0 Merge branch 'main' into live live André Wahlberg 2020-12-15 10:53:44 +0100
  • 0d26321055 Update style for snackbar notification main André Wahlberg 2020-12-15 10:53:19 +0100
  • 0296baaaf2 Merge branch 'main' into live André Wahlberg 2020-12-11 19:16:06 +0100
  • c294b60b5a Minor layout adjustments André Wahlberg 2020-12-11 19:05:47 +0100
  • 13bf20c2ea Hide snackbar option to view traffic info if already on that page André Wahlberg 2020-12-11 19:05:30 +0100
  • 30bcbd0286 Add 'Show less' in detailed traffic info paragraph André Wahlberg 2020-12-11 18:23:51 +0100
  • 6fc5fd8ea4 Add snackbar notification for disruptions André Wahlberg 2020-12-11 18:19:55 +0100
  • b07708f3e9 Add border to button for alternative routes André Wahlberg 2020-12-11 17:00:36 +0100
  • 84fa5e0597 Change usernames to stop names André Wahlberg 2020-12-11 17:00:02 +0100
  • c0a64784ac Change: Disruption json file values williameriksson126 2020-12-11 11:38:42 +0100
  • 98db97627b Layout fixes André Wahlberg 2020-12-11 11:01:18 +0100
  • 25977e6600 Merge branch 'main' into live williameriksson126 2020-12-11 10:20:54 +0100
  • 8bf47b9292 Attempted merge to live branch williameriksson126 2020-12-11 10:20:21 +0100
  • b56e334d00
    Merge pull request #14 from thefeli73/we-new-users William Eriksson 2020-12-11 10:08:31 +0100
  • c1fe945a41
    Merge branch 'main' into we-new-users we-new-users William Eriksson 2020-12-11 10:08:22 +0100
  • 919fd4b438 Add: new locations williameriksson126 2020-12-11 10:06:24 +0100
  • be292c8aa3 Change of track and fix minor design flaws André Wahlberg 2020-12-10 13:52:58 +0100
  • f7cbe39b0d Merge conflicts and small fixes williameriksson126 2020-12-10 13:21:09 +0100
  • 078393335a Add: Update user disruption status when user is not selected williameriksson126 2020-12-10 13:19:07 +0100
  • 5cafe99946 Present correct information about track in traffic info André Wahlberg 2020-12-10 12:48:36 +0100
  • 28d549de28 Minor design and typo fixes André Wahlberg 2020-12-10 12:47:20 +0100
  • cd2a61947f Add: DateTime handling when displaying delay williameriksson126 2020-12-10 12:32:40 +0100
  • cf977ccb1f Almost done, final touches needed williameriksson126 2020-12-10 11:47:46 +0100
  • 1b3f5abd25 Fix nonexisting info being displayed oddly André Wahlberg 2020-12-10 11:15:06 +0100
  • 9e185ef941 Fix wrong function name André Wahlberg 2020-12-10 10:49:27 +0100
  • 031829d4f9 Add: Traffic info now shows disruption data as well. Format of new time needs to be rewritten williameriksson126 2020-12-10 11:15:17 +0100
  • 2b8c08e082 Change: departureuser4 to work correctly and updated UI for disruptions williameriksson126 2020-12-10 11:01:43 +0100
  • 19282607ba
    Merge pull request #13 from thefeli73/we-out-of-creativity-for-names William Eriksson 2020-12-10 10:46:10 +0100
  • 308bd7b99f
    Merge branch 'main' into we-out-of-creativity-for-names we-out-of-creativity-for-names William Eriksson 2020-12-10 10:45:54 +0100
  • df3e181e2e Add: Progress williameriksson126 2020-12-10 10:43:43 +0100
  • 8e21856eb2 Update page when changing user André Wahlberg 2020-12-10 10:43:43 +0100
  • 211257ac67 Fix traffic info crash André Wahlberg 2020-12-10 10:23:52 +0100
  • 3b6aed2e41
    Merge pull request #12 from thefeli73/we-departureboard-example William Eriksson 2020-12-10 10:15:45 +0100
  • 2c5567cb62 Add: json files for departure board for all users we-departureboard-example williameriksson126 2020-12-10 10:15:00 +0100
  • 6d6356d576
    Merge pull request #11 from thefeli73/we-location-select William Eriksson 2020-12-10 09:57:02 +0100
  • 5c59866dc4 Add: More progress regarding findstops button we-location-select williameriksson126 2020-12-10 09:56:24 +0100
  • 9ccd2f01c0
    Merge pull request #10 from thefeli73/we-location-select William Eriksson 2020-12-09 17:55:12 +0100
  • d304b250a2 Add: Json files for nearby busstops and a component for accessing said json files williameriksson126 2020-12-09 17:54:28 +0100
  • acf35a85b7 . Thefeli73 2020-12-08 19:48:09 +0100
  • 29abac7a46 test push Thefeli73 2020-12-08 19:36:52 +0100
  • ea2296f77f move payload to sub folder Thefeli73 2020-12-08 19:36:02 +0100
  • 4e2273f558 fix payload Thefeli73 2020-12-08 19:35:40 +0100
  • 68b6e4e836 Polish and button functionality for traffic info page André Wahlberg 2020-12-08 12:28:19 +0100
  • 3accd7806a Add help message for button errors André Wahlberg 2020-12-08 11:44:37 +0100
  • b207b464bd
    Merge pull request #9 from thefeli73/we-select-user William Eriksson 2020-12-08 12:10:51 +0100
  • 2d2ec96533 Add: Multiple disruptions we-select-user williameriksson126 2020-12-08 12:10:08 +0100
  • 359c0a8192
    Merge pull request #8 from thefeli73/we-select-user William Eriksson 2020-12-08 11:55:46 +0100
  • 3c0fc6fe1f Add: Select user buttons williameriksson126 2020-12-08 11:54:34 +0100
  • c7517f185c
    Merge pull request #7 from thefeli73/we-fix-broken-git William Eriksson 2020-12-08 10:43:20 +0100
  • d39f114d5c Fix 2of2 we-fix-broken-git williameriksson126 2020-12-08 10:42:50 +0100
  • a0ff50ab23 Fix 1of2 williameriksson126 2020-12-08 10:41:31 +0100
  • ca1ca3884d
    Merge pull request #6 from thefeli73/we-demo-disruption-first William Eriksson 2020-12-08 10:30:41 +0100
  • ea2a18f3ad Add: code to fetch disruption data and see if it is relevant we-demo-disruption-first williameriksson126 2020-12-08 10:29:03 +0100
  • 75b4ecc4ed
    Merge pull request #5 from thefeli73/we-json-examples William Eriksson 2020-12-08 09:38:22 +0100
  • 3080359dcd
    Merge branch 'main' into we-json-examples we-json-examples William Eriksson 2020-12-08 09:38:11 +0100
  • 3d7e6cf52f Add: json files for scenarios williameriksson126 2020-12-08 09:36:19 +0100
  • 34f4b8af18
    Merge pull request #4 from thefeli73/we-Disruption-base William Eriksson 2020-12-08 09:18:21 +0100
  • 7c59fa2825
    Merge branch 'main' into we-Disruption-base we-Disruption-base William Eriksson 2020-12-08 09:18:00 +0100
  • 31263e919e Minor modifications to Example API components and base classes williameriksson126 2020-12-08 09:13:38 +0100
  • a56c68e60f Remove irrelevant button errors in console André Wahlberg 2020-12-04 12:02:45 +0100
  • 2ea7a8d701 Updated class changes in TrafficEntry André Wahlberg 2020-12-04 11:47:42 +0100
  • 1c80983caf Format TrafficInfo.js André Wahlberg 2020-12-04 11:13:46 +0100
  • 00208f9f86 Add and update classes for client-side data management André Wahlberg 2020-11-27 14:00:58 +0100
  • ca4a6bd011 Add possibility of closing popups André Wahlberg 2020-11-27 17:25:29 +0100
  • 09b16e52a7 Add misc CSS André Wahlberg 2020-11-27 17:23:11 +0100
  • c59f331965 Add generalized button class André Wahlberg 2020-11-27 17:05:55 +0100
  • 7e841cfaeb Add popup class André Wahlberg 2020-11-27 17:04:19 +0100
  • 6eaa79493e Add user name to navigation drawer André Wahlberg 2020-12-04 11:52:41 +0100
  • 69a1ea55ff Add global data variable André Wahlberg 2020-12-04 11:48:56 +0100
  • d40420ad2b Remove irrelevant button errors in console André Wahlberg 2020-12-04 12:02:45 +0100
  • 4ce76dbe90 Merge branch 'aw-disruption-control' into main André Wahlberg 2020-12-04 11:53:37 +0100
  • 051afedcc5 Add user name to navigation drawer André Wahlberg 2020-12-04 11:52:41 +0100
  • bff5a73c8c Merge branch 'main' into aw-disruption-control André Wahlberg 2020-12-04 11:49:28 +0100
  • 093199d0e0 Add global data variable André Wahlberg 2020-12-04 11:48:56 +0100
  • 25d66f9195 Updated class changes in TrafficEntry André Wahlberg 2020-12-04 11:47:42 +0100
  • 7108727ed9 TEST CI Thefeli73 2020-12-04 11:38:02 +0100
  • c7aae0766d update content header Thefeli73 2020-12-04 11:37:00 +0100
  • 4e37c80a36 payload done Server (Felix) 2020-12-04 11:30:31 +0100
  • 4e36270130 Format TrafficInfo.js André Wahlberg 2020-12-04 11:13:46 +0100
  • df8e4ad01c payload php Server (Felix) 2020-12-04 10:54:05 +0100
  • c36d6afea7 Merge to work on aw branch williameriksson126 2020-12-04 10:51:09 +0100
  • ff8a87c961 Hack: Nothing is done just commiting to swap branch williameriksson126 2020-12-04 10:45:22 +0100
  • c3edd2d74f Add basic component for calls to traffic disruption API williameriksson126 2020-12-04 10:08:11 +0100
  • b324250c79 Merge remote-tracking branch 'origin/aw-client-side-classes' into aw-disruption-control André Wahlberg 2020-12-04 09:59:51 +0100
  • e35524fa19
    Merge pull request #3 from williameriksson126/we-AccessToken-class William Eriksson 2020-11-30 10:21:10 +0100
  • 521d3b2e63 Add: AccessToken now updated to seperate class we-AccessToken-class williameriksson126 2020-11-30 10:18:18 +0100
  • 3bc1ff9a1a Add and update classes for client-side data management aw-client-side-classes André Wahlberg 2020-11-27 14:00:58 +0100
  • 177bbdf89d Add possibility of closing popups aw-disruption-control André Wahlberg 2020-11-27 17:25:29 +0100
  • a1b078f418 Add misc CSS André Wahlberg 2020-11-27 17:23:11 +0100
  • 66dbc66ec4 Add generalized button class André Wahlberg 2020-11-27 17:05:55 +0100
  • f86b9ee220 Add popup class André Wahlberg 2020-11-27 17:04:19 +0100
  • daaa9a62f4 Add navigation drawer content and make it expandable André Wahlberg 2020-11-27 16:17:16 +0100
  • 38a6f7c786 Add new color André Wahlberg 2020-11-27 16:16:28 +0100
  • 24dd1361f6 Fix traffic info entries overlapping stop title André Wahlberg 2020-11-27 16:16:01 +0100
  • e8cfc33991 Add word-break to bottom menu button labels André Wahlberg 2020-11-27 16:15:27 +0100
  • a1158d4525 Move and rename Disruption André Wahlberg 2020-11-27 13:58:35 +0100
  • 1067277cb8 Allow scroll for entries on traffic info page André Wahlberg 2020-11-27 13:58:01 +0100
  • a3810491e9 Remove default logo André Wahlberg 2020-11-27 13:45:27 +0100
  • b8322417a0 Fix some React errors and warnings André Wahlberg 2020-11-27 13:36:48 +0100
  • fc29d7d327 Non-existing button Daniel Nguyen 2020-11-27 11:41:20 +0100