|
|
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 |
|
|
|
042571f4a0
|
added some changes
|
2022-05-20 13:57:40 +02:00 |
|
|
|
1edfef9dea
|
added some changes
|
2022-05-20 13:49:34 +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 |
|
|
|
46bc589b5c
|
merge to master
|
2022-05-20 13:44:07 +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 |
|
|
|
926fe34ae3
|
push changes
|
2022-05-20 13:34:45 +02:00 |
|
|
|
3f4c0da263
|
do merge
|
2022-05-20 13:28:34 +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 |
|
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 |
|
|
|
85695256fe
|
reorganize and global colors introduced
|
2022-05-19 13:50:06 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
ba4f133679
|
Merge pull request 'Added ShadowMap widget' (#11) from shas6395-ShadowMap into master
Reviewed-on: #11
|
2022-05-19 12:03:47 +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 |
|
|
|
07233db4cd
|
Added ShadowDetector
|
2022-05-19 11:53:53 +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 |
|
|
|
16c4c53539
|
added changes from master
|
2022-05-18 20:59:52 +02:00 |
|
|
|
8e92c0621c
|
pull master
|
2022-05-18 20:56:58 +02:00 |
|
|
|
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 |
|
|
|
c0419bca8b
|
added information on bottom sheet
|
2022-05-18 20:53:07 +02:00 |
|
