adamlindroth
|
9260520cb8
|
Fixade konflikter
|
2022-05-25 15:27:42 +02:00 |
|
adamlindroth
|
c65e9e24a1
|
Strul
|
2022-05-25 15:21:02 +02:00 |
|
adamlindroth
|
2c186f202b
|
Färdigställt filterrutan
|
2022-05-25 15:06:45 +02:00 |
|
|
|
1a865f5da7
|
Merge pull request 'ändrade font i create login' (#40) from newnewnewFeedback into master
Reviewed-on: #40
|
2022-05-25 12:35:27 +02:00 |
|
Nikolina Sandstedt
|
e872f91013
|
ändrade font i create login
|
2022-05-25 12:34:36 +02:00 |
|
|
|
57a0cbd968
|
Merge pull request 'fixade knapp i feedback' (#39) from newnewnewFeedback into master
Reviewed-on: #39
|
2022-05-25 12:17:16 +02:00 |
|
Nikolina Sandstedt
|
929eba0d70
|
fixade knapp i feedback
|
2022-05-25 12:16:13 +02:00 |
|
|
|
52ce4e6ac0
|
Merge pull request 'newnewnewFeedback' (#38) from newnewnewFeedback into master
Reviewed-on: #38
|
2022-05-25 12:05:57 +02:00 |
|
Nikolina Sandstedt
|
bc9172d75a
|
fixade problem med merge
|
2022-05-25 12:02:58 +02:00 |
|
adamlindroth
|
b51ee4156b
|
Mergade med master
|
2022-05-25 11:55:49 +02:00 |
|
Nikolina Sandstedt
|
581b168cff
|
changed dependencies
|
2022-05-25 11:50:39 +02:00 |
|
adamlindroth
|
7165a96a2e
|
Lade till en filterknapp i appbar
|
2022-05-25 11:45:08 +02:00 |
|
Nikolina Sandstedt
|
6493f99658
|
la till
|
2022-05-25 11:44:43 +02:00 |
|
Nikolina Sandstedt
|
9509d7565d
|
la till hamburgarmeny
|
2022-05-25 11:18:03 +02:00 |
|
adamlindroth
|
6593498f2c
|
gitignore fuckar
|
2022-05-24 16:47:34 +02:00 |
|
|
|
3fcbf6e0cc
|
Merge pull request 'LoginPage' (#36) from LoginPage into master
Reviewed-on: #36
|
2022-05-24 13:28:55 +02:00 |
|
|
|
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 |
|
|
|
780f514aa3
|
Merge pull request 'shas6395' (#34) from shas6395 into master
Reviewed-on: #34
|
2022-05-23 19:43:00 +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 |
|
|
|
653e53c2c9
|
Merge pull request 'fixade feedback' (#33) from newnewFeedback into master
Reviewed-on: #33
|
2022-05-23 15:04:34 +02:00 |
|
Nikolina Sandstedt
|
eb54c855f1
|
fixade feedback
|
2022-05-23 15:03:56 +02:00 |
|
Shakir
|
3a42734375
|
Merge remote-tracking branch 'origin/master'
|
2022-05-23 14:03:03 +02:00 |
|
|
|
e9200ecdd1
|
Merge pull request 'lade till filterknapp på karta' (#32) from newnewFeedback into master
Reviewed-on: #32
|
2022-05-23 13:17:19 +02:00 |
|
|
|
c364bd320f
|
Merge branch 'master' into newnewFeedback
|
2022-05-23 13:16:50 +02:00 |
|
Nikolina Sandstedt
|
89ba4c746e
|
lade till filterknapp på karta
|
2022-05-23 13:15:45 +02:00 |
|
|
|
55c915f345
|
Merge pull request 'la till text' (#31) from newnewFeedback into master
Reviewed-on: #31
|
2022-05-23 11:45:27 +02:00 |
|
Nikolina Sandstedt
|
96fb318685
|
la till text
|
2022-05-23 11:44:32 +02:00 |
|
|
|
ba9a8ceddc
|
Merge pull request 'ändrade home knappen' (#30) from newnewFeedback into master
Reviewed-on: #30
|
2022-05-23 11:39:28 +02:00 |
|
Nikolina Sandstedt
|
31faf12df7
|
ändrade home knappen
|
2022-05-23 11:38:23 +02:00 |
|
Shakir
|
a2335b0109
|
Merge remote-tracking branch 'origin/master'
|
2022-05-22 13:24:44 +02:00 |
|
|
|
5e50fa7aaa
|
Merge pull request 'shas6395' (#24) from shas6395 into master
Reviewed-on: #24
|
2022-05-22 13:20:51 +02:00 |
|
Shakir
|
a5c08137de
|
* 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:19:05 +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 |
|
|
|
2be238534a
|
Merge pull request 'google_markers' (#23) from google_markers into master
Reviewed-on: #23
|
2022-05-20 13:48:52 +02:00 |
|
|
|
916616dc59
|
added some changes
|
2022-05-20 13:47:35 +02:00 |
|
|
|
66f79dcdb7
|
push some changes
|
2022-05-20 13:44:44 +02:00 |
|
|
|
423ec364f2
|
merge to master
|
2022-05-20 13:40:17 +02:00 |
|
|
|
8f25b58f51
|
added boxes for markers
|
2022-05-20 13:37:51 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
4b8d37867f
|
added merkers info window
|
2022-05-20 09:29:20 +02:00 |
|
|
|
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 |
|
