maze6343/pvt-project-google-maps
Template
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity
228 Commits 25 Branches 0 Tags
shas6395-----
Commit Graph

228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
maze6343 926fe34ae3 push changes 2022-05-20 13:34:45 +02:00
maze6343 3f4c0da263 do merge 2022-05-20 13:28:34 +02:00
nisa9769 a9718baeaa Merge pull request 'lade till snackbar' (#21) from newFeedbackBranch into master 
Reviewed-on: #21
 2022-05-20 12:13:06 +02:00
Nikolina Sandstedt 783e1913af lade till snackbar 2022-05-20 12:12:27 +02:00
nisa9769 f030047ea9 Merge pull request 'ändrade fonts' (#20) from newFeedbackBranch into master 
Reviewed-on: #20
 2022-05-20 10:34:30 +02:00
Nikolina Sandstedt ab8bb89d9e ändrade fonts 2022-05-20 10:33:22 +02:00
maze6343 4b8d37867f added merkers info window 2022-05-20 09:29:20 +02:00
nisa9769 e9dfc61d39 Merge pull request 'newFeedbackBranch' (#19) from newFeedbackBranch into master 
Reviewed-on: #19
 2022-05-20 07:56:15 +02:00
Nikolina Sandstedt 6ebfe8d7fd made som changes with user feedback 2022-05-20 07:53:23 +02:00
Nikolina Sandstedt 49ace48ce5 Merge branch 'master' into newFeedbackBranch 2022-05-20 05:13:35 +02:00
Shakir 210fa0f058 Merge remote-tracking branch 'origin/LoginPage' 
# Conflicts:
#	.dart_tool/package_config.json
#	.dart_tool/package_config_subset
#	.flutter-plugins
#	.flutter-plugins-dependencies
#	.packages
 2022-05-19 20:39:12 +02:00
maen0574 85695256fe reorganize and global colors introduced 2022-05-19 13:50:06 +02:00
nisa9769 b84e038328 Merge pull request 'checko' (#18) from newFeedbackBranch into master 
Reviewed-on: #18
 2022-05-19 13:27:29 +02:00
Nikolina Sandstedt 5ab4b66ae2 checkout 2022-05-19 13:22:20 +02:00
nisa9769 15b878a48b Merge pull request 'la till navigation för setting för att komma till feedback' (#17) from newFeedbackBranch into master 
Reviewed-on: #17
 2022-05-19 12:34:30 +02:00
Nikolina Sandstedt 278ed1c94d la till navigation för setting 2022-05-19 12:32:22 +02:00
maen0574 b794c29bfd Merge branch 'shas6395-ShadowMap' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage 
 Conflicts:
	lib/Map.dart
	lib/main.dart
 2022-05-19 12:32:14 +02:00
maen0574 fc28c983fd reorganize and global colors introduced 2022-05-19 12:28:09 +02:00
shas6395 ba4f133679 Merge pull request 'Added ShadowMap widget' (#11) from shas6395-ShadowMap into master 
Reviewed-on: #11
 2022-05-19 12:03:47 +02:00
shas6395 45a00b6db8 Merge remote-tracking branch 'origin/shas6395-ShadowMap' 
# Conflicts:
#	.dart_tool/package_config.json
#	.dart_tool/package_config_subset
#	.flutter-plugins
#	.flutter-plugins-dependencies
#	.packages
#	lib/HomePage.dart
 2022-05-19 11:55:25 +02:00
shas6395 07233db4cd Added ShadowDetector 2022-05-19 11:53:53 +02:00
shas6395 f772e0c8e5 Merge remote-tracking branch 'origin/shas6395-ShadowMap' 2022-05-19 11:50:55 +02:00
shas6395 d47021c361 Added ShadowDetector 2022-05-19 11:49:59 +02:00
maen0574 910e48dfba Merge branch 'shas6395-ShadowMap' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage 
 Conflicts:
	.dart_tool/package_config.json
	.packages
	lib/globals.dart
 2022-05-19 11:17:44 +02:00
maen0574 1eff7a91fa reorganize 2022-05-19 11:15:21 +02:00
maen0574 247b375f79 Merge branch 'LoginFix' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage 
 Conflicts:
	lib/HomePage.dart
	lib/globals.dart
	lib/main.dart
	lib/signInPage.dart
 2022-05-19 11:10:49 +02:00
maen0574 dd5d716275 added global colors to ease changes in colorschemes 2022-05-19 11:01:51 +02:00
maze6343 16c4c53539 added changes from master 2022-05-18 20:59:52 +02:00
maze6343 8e92c0621c pull master 2022-05-18 20:56:58 +02:00
maze6343 4e681bacb3 Merge pull request 'added information on bottom sheet' (#16) from google_markers into master 
Reviewed-on: #16
 2022-05-18 20:55:40 +02:00
maze6343 c0419bca8b added information on bottom sheet 2022-05-18 20:53:07 +02:00
maen0574 4c525eb9d5 renamed imports 2022-05-18 14:50:12 +02:00
adli7087 cde2f87473 Fixade snyggade till i loginpage 2022-05-18 14:40:02 +02:00
maen0574 50a3d59445 Added favoritepage - not yet fullt working, 
venue-class
 2022-05-18 14:33:39 +02:00
maze6343 7faf633b0c Merge pull request 'google_markers' (#14) from google_markers into master 
Reviewed-on: #14
 2022-05-18 13:48:59 +02:00
maze6343 1c0e250036 push google_markers 2022-05-18 13:46:18 +02:00
maze6343 3ec8f99248 added some changes 2022-05-18 13:43:21 +02:00
adsu7578 9a8e4a1a94 Merge pull request 'venue-page-update FA-icons and weather status text' (#13) from venue-page into master 
Reviewed-on: #13
 2022-05-18 13:40:56 +02:00
Adam Sundberg 5d07a72d45 minor change 2022-05-18 13:37:21 +02:00
maze6343 7dfa42134d kommentera bort firebase 2022-05-18 13:35:38 +02:00
Adam Sundberg 1dbf5befed Fixed conflict 'pubspec.yaml' 2022-05-18 12:56:17 +02:00
Adam Sundberg 555e509a2b Design with dedicated FA-icons and text status 2022-05-18 12:41:38 +02:00
Shakir 48a1fbc766 Added ShadowMap widget 2022-05-17 18:07:41 +02:00
maze6343 59861dcb05 pull from master 2022-05-17 12:19:23 +02:00
maze6343 a3d96281b8 add plugin 2022-05-17 12:17:21 +02:00
maze6343 96f31fa1df fix some problem 2022-05-17 12:11:50 +02:00
maze6343 2c4c201b3d pull from master 2022-05-17 11:07:39 +02:00
maze6343 8044ca4ca5 added som plugins and get user location function 2022-05-17 11:02:21 +02:00
maen0574 0e1814d371 Merge pull request 'Merge Loginpage to master' (#9) from LoginPage into master 
Reviewed-on: #9
 2022-05-17 10:19:57 +02:00
maen0574 d272d8a32b connected feedback to database 2022-05-17 10:15:35 +02:00