Commit Graph

22 Commits

Author SHA1 Message Date
16c4c53539 added changes from master 2022-05-18 20:59:52 +02:00
1c0e250036 push google_markers 2022-05-18 13:46:18 +02:00
Adam Sundberg
5d07a72d45 minor change 2022-05-18 13:37:21 +02:00
7dfa42134d kommentera bort firebase 2022-05-18 13:35:38 +02:00
96f31fa1df fix some problem 2022-05-17 12:11:50 +02:00
2c4c201b3d pull from master 2022-05-17 11:07:39 +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
83e14e1d5b google_markers (#6)
Reviewed-on: #6
2022-05-16 11:36:25 +02:00
3fb16f52ff get data from json file 2022-05-12 20:09:08 +02:00
adamlindroth
f04b853eed Untracked files 2022-05-12 11:44:52 +02:00
3cf3a4bef3 create new branch markers 2022-05-11 10:16:31 +02:00
ddfa92c557 added filerna för att göra git pull 2022-05-10 12:32:09 +02:00
8343e823cf göra merge för att få hjälp med google search places från Adam S 2022-05-06 10:18:36 +02:00
7e4b3665b5 10 filer kvar 2022-05-05 21:02:47 +02:00
5d4779a4a2 update serach button 2022-05-05 15:35:41 +02:00
f06f883325 added search icon 2022-05-04 13:27:37 +02:00
2b92ae49c2 added new files and new changes to the project 2022-05-01 11:36:13 +02:00
1755304e49 add some changes to map page 2022-04-29 22:50:03 +02:00
c315640691 add some changes 2022-04-29 21:53:49 +02:00
7df1787da2 add 2022-04-29 13:43:48 +02:00
ca8c167d75 add 2022-04-28 13:33:37 +02:00
6ef070e083 Add all packages 2022-04-28 11:43:45 +02:00