|
|
ecc446d44d
|
Completed signin with gmail
|
2022-05-24 13:13:25 +02:00 |
|
|
|
87159d7532
|
Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage
Conflicts:
.dart_tool/package_config.json
.flutter-plugins-dependencies
.packages
build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/App
lib/HomePage.dart
lib/Map.dart
|
2022-05-24 12:59:37 +02:00 |
|
|
|
04ef9f58f9
|
Completed signin with gmail
|
2022-05-24 12:50:45 +02:00 |
|
|
|
3d1884bbc5
|
Implemented FavoritePage, users can now see favorites and remove them
|
2022-05-24 12:04:40 +02:00 |
|
Shakir
|
866ee5398b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .flutter-plugins-dependencies
|
2022-05-23 19:39:41 +02:00 |
|
Shakir
|
6821e0520d
|
* Integrated ShadowDetector with markers.
|
2022-05-23 19:34:23 +02:00 |
|
Nikolina Sandstedt
|
eb54c855f1
|
fixade feedback
|
2022-05-23 15:03:56 +02:00 |
|
Nikolina Sandstedt
|
89ba4c746e
|
lade till filterknapp på karta
|
2022-05-23 13:15:45 +02:00 |
|
Nikolina Sandstedt
|
96fb318685
|
la till text
|
2022-05-23 11:44:32 +02:00 |
|
Nikolina Sandstedt
|
31faf12df7
|
ändrade home knappen
|
2022-05-23 11:38:23 +02:00 |
|
Shakir
|
e2bab36392
|
* Modified ShadowDetector to be able to take a list of venues, and return a list with the shade status for venues.
* Added WebScraper class.
|
2022-05-22 13:10:30 +02:00 |
|
Shakir
|
2d614cfdb7
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .dart_tool/package_config.json
# .dart_tool/package_config_subset
# .flutter-plugins
# .flutter-plugins-dependencies
# .packages
# lib/HomePage.dart
# lib/Map.dart
|
2022-05-20 16:58:17 +02:00 |
|
|
|
423ec364f2
|
merge to master
|
2022-05-20 13:40:17 +02:00 |
|
Nikolina Sandstedt
|
783e1913af
|
lade till snackbar
|
2022-05-20 12:12:27 +02:00 |
|
Nikolina Sandstedt
|
ab8bb89d9e
|
ändrade fonts
|
2022-05-20 10:33:22 +02:00 |
|
|
|
4b8d37867f
|
added merkers info window
|
2022-05-20 09:29:20 +02:00 |
|
Nikolina Sandstedt
|
6ebfe8d7fd
|
made som changes with user feedback
|
2022-05-20 07:53:23 +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 |
|
|
|
85695256fe
|
reorganize and global colors introduced
|
2022-05-19 13:50:06 +02:00 |
|
Nikolina Sandstedt
|
278ed1c94d
|
la till navigation för setting
|
2022-05-19 12:32:22 +02:00 |
|
|
|
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 |
|
|
|
fc28c983fd
|
reorganize and global colors introduced
|
2022-05-19 12:28:09 +02:00 |
|
|
|
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 |
|
|
|
f772e0c8e5
|
Merge remote-tracking branch 'origin/shas6395-ShadowMap'
|
2022-05-19 11:50:55 +02:00 |
|
|
|
d47021c361
|
Added ShadowDetector
|
2022-05-19 11:49:59 +02:00 |
|
|
|
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 |
|
|
|
1eff7a91fa
|
reorganize
|
2022-05-19 11:15:21 +02:00 |
|
|
|
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 |
|
|
|
dd5d716275
|
added global colors to ease changes in colorschemes
|
2022-05-19 11:01:51 +02:00 |
|
|
|
c0419bca8b
|
added information on bottom sheet
|
2022-05-18 20:53:07 +02:00 |
|
|
|
4c525eb9d5
|
renamed imports
|
2022-05-18 14:50:12 +02:00 |
|
|
|
cde2f87473
|
Fixade snyggade till i loginpage
|
2022-05-18 14:40:02 +02:00 |
|
|
|
50a3d59445
|
Added favoritepage - not yet fullt working,
venue-class
|
2022-05-18 14:33:39 +02:00 |
|
|
|
1c0e250036
|
push google_markers
|
2022-05-18 13:46:18 +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 |
|
|
|
8044ca4ca5
|
added som plugins and get user location function
|
2022-05-17 11:02:21 +02:00 |
|
|
|
8f6ac6273c
|
Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage
Conflicts:
.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/.filecache
.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/app.dill
.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/debug_ios_bundle_flutter_assets.stamp
.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/flutter_assets.d
.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/kernel_snapshot.d
.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/kernel_snapshot.stamp
.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/outputs.json
.dart_tool/package_config.json
.dart_tool/package_config_subset
.flutter-plugins
.flutter-plugins-dependencies
.packages
build/ios/Debug-iphonesimulator/App.framework/App
build/ios/Debug-iphonesimulator/App.framework/_CodeSignature/CodeResources
build/ios/Debug-iphonesimulator/App.framework/flutter_assets/AssetManifest.json
build/ios/Debug-iphonesimulator/App.framework/flutter_assets/NOTICES.Z
build/ios/Debug-iphonesimulator/App.framework/flutter_assets/kernel_blob.bin
build/ios/Debug-iphonesimulator/Pods_Runner.framework/Pods_Runner
build/ios/Debug-iphonesimulator/Pods_Runner.framework/_CodeSignature/CodeDirectory
build/ios/Debug-iphonesimulator/Pods_Runner.framework/_CodeSignature/CodeRequirements-1
build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/App
build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources
build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/AssetManifest.json
build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z
build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin
build/ios/Debug-iphonesimulator/Runner.app/Runner
build/ios/Debug-iphonesimulator/Runner.app/_CodeSignature/CodeResources
build/ios/Debug-iphonesimulator/Runner.swiftmodule/x86_64-apple-ios-simulator.swiftmodule
build/ios/Debug-iphonesimulator/google_maps_flutter/google_maps_flutter.framework/_CodeSignature/CodeDirectory
build/ios/Debug-iphonesimulator/google_maps_flutter/google_maps_flutter.framework/_CodeSignature/CodeRequirements-1
build/ios/Debug-iphonesimulator/google_maps_flutter/google_maps_flutter.framework/google_maps_flutter
build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/App
build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources
build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/AssetManifest.json
build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z
build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin
build/ios/iphonesimulator/Runner.app/Runner
build/ios/iphonesimulator/Runner.app/_CodeSignature/CodeResources
ios/Podfile.lock
pubspec.lock
|
2022-05-17 08:59:36 +02:00 |
|
|
|
3e0abe57b4
|
Merge branch 'master' into venue-page
|
2022-05-16 17:30:40 +02:00 |
|
Adam Sundberg
|
acb80a6d33
|
minor change for conflict
|
2022-05-16 17:28:01 +02:00 |
|
Adam Sundberg
|
bd41f97e13
|
Added support for fetching current weather
|
2022-05-16 17:14:37 +02:00 |
|
|
|
83e14e1d5b
|
google_markers (#6)
Reviewed-on: #6
|
2022-05-16 11:36:25 +02:00 |
|
|
|
fb4fa23ce6
|
do merge
|
2022-05-16 11:34:33 +02:00 |
|
|
|
f033c16bd7
|
Merge branch 'master' into map-page
|
2022-05-16 11:29:26 +02:00 |
|
|
|
d6b1c31a2e
|
added create account functionality, users will be added to database
|
2022-05-13 13:46:31 +02:00 |
|
|
|
3fb16f52ff
|
get data from json file
|
2022-05-12 20:09:08 +02:00 |
|
adamlindroth
|
19ab7e6c60
|
Lägger till CreateAccountPage
|
2022-05-12 13:43:28 +02:00 |
|
adamlindroth
|
15fc0bc7eb
|
Merge med mårtens branch
|
2022-05-12 13:30:20 +02:00 |
|
adamlindroth
|
f04b853eed
|
Untracked files
|
2022-05-12 11:44:52 +02:00 |
|
