|
|
f952e53581
|
Cleaning
|
2022-06-01 13:10:04 +02:00 |
|
|
|
ef90a8e76c
|
Merge pull request 'clean up, and a few tests' (#57) from connecter into master
Reviewed-on: #57
|
2022-06-01 12:50:16 +02:00 |
|
Adam Sundberg
|
664563df35
|
clean up, and a few tests
|
2022-06-01 12:49:49 +02:00 |
|
|
|
d3b3d5c4f6
|
Merge pull request 'shas6395-----' (#56) from shas6395----- into master
Reviewed-on: #56
|
2022-05-30 18:28:11 +02:00 |
|
|
|
739bb5fc6e
|
Final version?
|
2022-05-30 18:21:43 +02:00 |
|
|
|
defc482611
|
Final version?
|
2022-05-30 18:04:05 +02:00 |
|
|
|
6a8aa8c4e1
|
Merge remote-tracking branch 'origin/master'
|
2022-05-30 17:45:12 +02:00 |
|
|
|
3a47a28beb
|
Merge pull request 'polished classes' (#55) from LoginPage into master
Reviewed-on: #55
|
2022-05-30 17:37:41 +02:00 |
|
|
|
5d1039d28b
|
polished classes
|
2022-05-30 17:37:03 +02:00 |
|
|
|
c7e515ac3f
|
Merge pull request 'LoginPage' (#54) from LoginPage into master
Reviewed-on: #54
|
2022-05-30 17:09:43 +02:00 |
|
|
|
fcc0e0c7c8
|
Added outdoorseatingarea with raw data from DB
|
2022-05-30 17:05:08 +02:00 |
|
|
|
a9fe97cae6
|
Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage
Conflicts:
.dart_tool/package_config.json
.dart_tool/package_config_subset
.flutter-plugins
.flutter-plugins-dependencies
.packages
lib/ListViewPage.dart
lib/Map.dart
lib/login/signInPage.dart
lib/venuePage.dart
pubspec.lock
|
2022-05-30 16:10:30 +02:00 |
|
|
|
fefdd965b9
|
Added outdoorseatingarea with raw data from DB
|
2022-05-30 15:57:49 +02:00 |
|
|
|
c1c098ad66
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# lib/main.dart
|
2022-05-30 15:45:20 +02:00 |
|
|
|
575d914528
|
Merge pull request 'BottomModalSheet & Venue details' (#53) from connecter into master
Reviewed-on: #53
|
2022-05-30 15:30:42 +02:00 |
|
Adam Sundberg
|
cd5495d4b5
|
minor edit
|
2022-05-30 15:29:22 +02:00 |
|
Adam Sundberg
|
5270b3ee81
|
change to modalBottomSheet
|
2022-05-30 15:22:51 +02:00 |
|
Adam Sundberg
|
95ba70c7f3
|
merge
|
2022-05-30 14:17:30 +02:00 |
|
Adam Sundberg
|
1f659c8913
|
New bottomsheet and venue features
|
2022-05-30 14:06:35 +02:00 |
|
|
|
5c428f8453
|
HomePage and Globals updated
|
2022-05-30 14:05:48 +02:00 |
|
|
|
3bac5c5c5c
|
Merge remote-tracking branch 'origin/master'
|
2022-05-30 13:56:17 +02:00 |
|
|
|
2b6e2bb4ad
|
HomePage and Globals updated
|
2022-05-30 13:42:12 +02:00 |
|
|
|
495c757cb7
|
Merge pull request 'ManageAccountPage' (#50) from ManageAccountPage into master
Reviewed-on: #50
|
2022-05-30 13:41:54 +02:00 |
|
|
|
9f3b64c326
|
added test file
|
2022-05-30 13:40:53 +02:00 |
|
|
|
dce681c798
|
added ManageAccountPage_test.dart
|
2022-05-30 13:36:47 +02:00 |
|
|
|
cab9f25612
|
Merge pull request 'VenuInfo improved' (#49) from shas6395 into master
Reviewed-on: #49
|
2022-05-30 12:33:16 +02:00 |
|
|
|
fc045a6f87
|
VenuInfo improved
|
2022-05-30 12:29:25 +02:00 |
|
|
|
fec6bef35f
|
Markers showing depending on camera location, encrypting passwords
|
2022-05-30 11:00:30 +02:00 |
|
|
|
7f3cefdadd
|
Markers showing depending on camera location, encrypting passwords
|
2022-05-30 10:48:51 +02:00 |
|
|
|
4c8305474c
|
Merge pull request 'LastFeedbackBranch' (#48) from LastFeedbackBranch into master
Reviewed-on: #48
|
2022-05-28 05:33:08 +02:00 |
|
Nikolina Sandstedt
|
7ebb64a08f
|
hamburgarmenyn hade försvunnit, så lade till den igen
|
2022-05-28 05:29:15 +02:00 |
|
Nikolina Sandstedt
|
5adca7e419
|
ändrat
|
2022-05-28 05:00:34 +02:00 |
|
Nikolina Sandstedt
|
26beaa855c
|
fixade så att användare navigeras direkt till kartan
|
2022-05-28 04:49:56 +02:00 |
|
Nikolina Sandstedt
|
51fe8f7eb2
|
ändrade så att användaren tas direkt till kartan istället för hemskärmen
|
2022-05-28 04:41:58 +02:00 |
|
|
|
f6fc0d551d
|
Merge pull request 'VenuInfo blabla' (#46) from shas6395 into master
Reviewed-on: #46
|
2022-05-27 11:34:02 +02:00 |
|
|
|
475e036c7f
|
VenuInfo blabla
|
2022-05-27 11:30:28 +02:00 |
|
|
|
c1178a7994
|
Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage
Conflicts:
.flutter-plugins-dependencies
lib/Map.dart
lib/venuePage.dart
|
2022-05-27 10:48:16 +02:00 |
|
|
|
ff3a80a2b5
|
Merge pull request 'VenueInfo' (#45) from shas6395 into master
Reviewed-on: #45
|
2022-05-26 21:03:08 +02:00 |
|
Shakir
|
992b4be7d0
|
VenueInfo
|
2022-05-26 20:51:03 +02:00 |
|
|
|
38accf9553
|
Markers showing depending on camera location
|
2022-05-26 12:33:30 +02:00 |
|
|
|
57d77509c4
|
Merge pull request 'Venues from server' (#44) from venue-page into master
Reviewed-on: #44
|
2022-05-26 11:23:11 +02:00 |
|
Adam Sundberg
|
9f359b944e
|
Fixes for conflicts
|
2022-05-26 11:21:45 +02:00 |
|
Adam Sundberg
|
c5455eb2aa
|
Merge branch 'master' into venue-page
# Conflicts:
# lib/ListViewPage.dart
# lib/Map.dart
# lib/main.dart
|
2022-05-26 10:59:59 +02:00 |
|
Adam Sundberg
|
0c0600c493
|
Added list view
|
2022-05-26 10:39:45 +02:00 |
|
|
|
bfc653b71b
|
Merge pull request 'ManageAccountPage' (#42) from ManageAccountPage into master
Reviewed-on: #42
|
2022-05-25 22:16:44 +02:00 |
|
|
|
4aa63a77ae
|
complete ManageAccountPage
|
2022-05-25 22:15:41 +02:00 |
|
|
|
1bb05a3196
|
push to master
|
2022-05-25 22:14:23 +02:00 |
|
|
|
b5de86173e
|
update ManageAccountPage
|
2022-05-25 21:53:51 +02:00 |
|
|
|
58575914ec
|
Merge pull request 'AdamsBranch' (#41) from AdamsBranch into master
Reviewed-on: #41
|
2022-05-25 15:30:42 +02:00 |
|
adamlindroth
|
9260520cb8
|
Fixade konflikter
|
2022-05-25 15:27:42 +02:00 |
|
