Commit Graph

243 Commits

Author SHA1 Message Date
Adam Sundberg
f87dc614a7 Fix bug on map-click 2022-06-04 08:08:22 +02:00
40fe0fedad Merge pull request 'fixed globalkey-issue' (#61) from LoginPage into master
Reviewed-on: #61
2022-06-01 22:53:58 +02:00
35762a4229 fixed globalkey-issue 2022-06-01 22:53:15 +02:00
9401609153 Merge pull request 'LoginPage' (#60) from LoginPage into master
Reviewed-on: #60
2022-06-01 22:50:13 +02:00
8ce14be36e fixed globalkey-issue 2022-06-01 22:49:01 +02:00
53a2f5029a fixed globalkey-issue 2022-06-01 22:00:09 +02:00
4ba0c3341c fixed globalkey-issue 2022-06-01 14:09:30 +02:00
75ad9db170 Merge pull request 'Minor edits' (#59) from connecter into master
Reviewed-on: #59
2022-06-01 13:39:17 +02:00
Adam Sundberg
cec07c0a22 edits after name changes 2022-06-01 13:38:49 +02:00
Adam Sundberg
6b017899ce Merge branch 'master' into connecter
# Conflicts:
#	test/list_view_page_test.dart
#	test/venue_page_test.dart
2022-06-01 13:34:46 +02:00
Adam Sundberg
01bab2c13d minor edits 2022-06-01 13:34:16 +02:00
78d2a62583 Merge pull request 'Cleaning' (#58) from shas6395----- into master
Reviewed-on: #58
2022-06-01 13:12:41 +02:00
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
1e74a80ae1 implemented change password feature 2022-06-01 11:57:55 +02:00
049ca366e3 Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage 2022-05-31 09:21:38 +02:00
48176cfe8e polished classes 2022-05-31 09:21:09 +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