pvt-project-google-maps

maze6343/pvt-project-google-maps

Template

Fork 1

Commit Graph

Select branches

Hide Pull Requests

AdamsBranch

Feedback

LastFeedbackBranch

LoginFix

LoginPage

ManageAccountPage

MapPage-googleSearch

ShadowDetector

connecter

final

google_markers

master

newFeedbackBranch

newnewFeedback

newnewnewFeedback

nisa9769-patch-1

nisa9769-patch-2

settingsPage

settingsPageFix

shas6395

shas6395-----

shas6395-ShadowMap

sssss

unitTestFrontEnd

venue-page

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#7

#8

#9

89ba4c746e lade till filterknapp på karta Nikolina Sandstedt 2022-05-23 13:15:45 +02:00
55c915f345 Merge pull request 'la till text' (#31) from newnewFeedback into master nisa9769 2022-05-23 11:45:27 +02:00
96fb318685 la till text Nikolina Sandstedt 2022-05-23 11:44:32 +02:00
ba9a8ceddc Merge pull request 'ändrade home knappen' (#30) from newnewFeedback into master nisa9769 2022-05-23 11:39:28 +02:00
31faf12df7 ändrade home knappen Nikolina Sandstedt 2022-05-23 11:38:23 +02:00
7c9820b6d4 small change newFeedbackBranch Nikolina Sandstedt 2022-05-23 11:27:01 +02:00
27e7680cee Update '.flutter-plugins' nisa9769 2022-05-23 11:17:29 +02:00
41bfc6da0d removed plugin dependencies Nikolina Sandstedt 2022-05-23 11:08:59 +02:00
61ec322e7d ändrade knapp i home Nikolina Sandstedt 2022-05-23 10:59:08 +02:00
d782ed3a21 Merge branch 'master' into LoginFix LoginFix adli7087 2022-05-23 10:15:04 +02:00
a2335b0109 Merge remote-tracking branch 'origin/master' Shakir 2022-05-22 13:24:44 +02:00
5e50fa7aaa Merge pull request 'shas6395' (#24) from shas6395 into master shas6395 2022-05-22 13:20:51 +02:00
a5c08137de * Modified ShadowDetector to be able to take a list of venues, and return a list with the shade status for venues. Shakir 2022-05-22 13:10:30 +02:00
e2bab36392 * Modified ShadowDetector to be able to take a list of venues, and return a list with the shade status for venues. Shakir 2022-05-22 13:10:30 +02:00
2d614cfdb7 Merge remote-tracking branch 'origin/master' Shakir 2022-05-20 16:58:17 +02:00
042571f4a0 added some changes maze6343 2022-05-20 13:57:40 +02:00
1edfef9dea added some changes maze6343 2022-05-20 13:49:34 +02:00
2be238534a Merge pull request 'google_markers' (#23) from google_markers into master maze6343 2022-05-20 13:48:52 +02:00
916616dc59 added some changes google_markers maze6343 2022-05-20 13:47:35 +02:00
66f79dcdb7 push some changes maze6343 2022-05-20 13:44:44 +02:00
46bc589b5c merge to master maze6343 2022-05-20 13:44:07 +02:00
423ec364f2 merge to master maze6343 2022-05-20 13:40:17 +02:00
8f25b58f51 added boxes for markers maze6343 2022-05-20 13:37:51 +02:00
926fe34ae3 push changes maze6343 2022-05-20 13:34:45 +02:00
3f4c0da263 do merge maze6343 2022-05-20 13:28:34 +02:00
a9718baeaa Merge pull request 'lade till snackbar' (#21) from newFeedbackBranch into master nisa9769 2022-05-20 12:13:06 +02:00
783e1913af lade till snackbar Nikolina Sandstedt 2022-05-20 12:12:27 +02:00
f030047ea9 Merge pull request 'ändrade fonts' (#20) from newFeedbackBranch into master nisa9769 2022-05-20 10:34:30 +02:00
ab8bb89d9e ändrade fonts Nikolina Sandstedt 2022-05-20 10:33:22 +02:00
4b8d37867f added merkers info window maze6343 2022-05-20 09:29:20 +02:00
e9dfc61d39 Merge pull request 'newFeedbackBranch' (#19) from newFeedbackBranch into master nisa9769 2022-05-20 07:56:15 +02:00
6ebfe8d7fd made som changes with user feedback Nikolina Sandstedt 2022-05-20 07:53:23 +02:00
49ace48ce5 Merge branch 'master' into newFeedbackBranch Nikolina Sandstedt 2022-05-20 05:13:35 +02:00
210fa0f058 Merge remote-tracking branch 'origin/LoginPage' Shakir 2022-05-19 20:39:12 +02:00
e7ac9f1737 Merge remote-tracking branch 'origin/LoginPage' shas6395-ShadowMap shas6395 2022-05-19 13:51:13 +02:00
85695256fe reorganize and global colors introduced stjertnylle 2022-05-19 13:50:06 +02:00
b84e038328 Merge pull request 'checko' (#18) from newFeedbackBranch into master nisa9769 2022-05-19 13:27:29 +02:00
5ab4b66ae2 checkout Nikolina Sandstedt 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 nisa9769 2022-05-19 12:34:30 +02:00
278ed1c94d la till navigation för setting Nikolina Sandstedt 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 stjertnylle 2022-05-19 12:32:14 +02:00
fc28c983fd reorganize and global colors introduced stjertnylle 2022-05-19 12:28:09 +02:00
ba4f133679 Merge pull request 'Added ShadowMap widget' (#11) from shas6395-ShadowMap into master shas6395 2022-05-19 12:03:47 +02:00
45a00b6db8 Merge remote-tracking branch 'origin/shas6395-ShadowMap' shas6395 2022-05-19 11:55:25 +02:00
07233db4cd Added ShadowDetector shas6395 2022-05-19 11:53:53 +02:00
f772e0c8e5 Merge remote-tracking branch 'origin/shas6395-ShadowMap' shas6395 2022-05-19 11:50:55 +02:00
d47021c361 Added ShadowDetector shas6395 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 stjertnylle 2022-05-19 11:17:44 +02:00
1eff7a91fa reorganize stjertnylle 2022-05-19 11:15:21 +02:00
247b375f79 Merge branch 'LoginFix' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage stjertnylle 2022-05-19 11:10:49 +02:00
dd5d716275 added global colors to ease changes in colorschemes stjertnylle 2022-05-19 11:01:51 +02:00
9414be6a08 Update 'lib/Form.dart' Feedback nisa9769 2022-05-19 10:35:36 +02:00
e906978907 Update 'lib/FeedbackPage.dart' nisa9769 2022-05-19 10:33:20 +02:00
16c4c53539 added changes from master maze6343 2022-05-18 20:59:52 +02:00
8e92c0621c pull master maze6343 2022-05-18 20:56:58 +02:00
4e681bacb3 Merge pull request 'added information on bottom sheet' (#16) from google_markers into master maze6343 2022-05-18 20:55:40 +02:00
c0419bca8b added information on bottom sheet maze6343 2022-05-18 20:53:07 +02:00
4c525eb9d5 renamed imports stjertnylle 2022-05-18 14:50:12 +02:00
cde2f87473 Fixade snyggade till i loginpage unknown 2022-05-18 14:40:02 +02:00
50a3d59445 Added favoritepage - not yet fullt working, venue-class stjertnylle 2022-05-18 14:33:39 +02:00
7faf633b0c Merge pull request 'google_markers' (#14) from google_markers into master maze6343 2022-05-18 13:48:59 +02:00
1c0e250036 push google_markers maze6343 2022-05-18 13:46:18 +02:00
3ec8f99248 added some changes maze6343 2022-05-18 13:43:21 +02:00
9a8e4a1a94 Merge pull request 'venue-page-update FA-icons and weather status text' (#13) from venue-page into master adsu7578 2022-05-18 13:40:56 +02:00
5d07a72d45 minor change Adam Sundberg 2022-05-18 13:37:21 +02:00
7dfa42134d kommentera bort firebase maze6343 2022-05-18 13:35:38 +02:00
1dbf5befed Fixed conflict 'pubspec.yaml' Adam Sundberg 2022-05-18 12:56:17 +02:00
555e509a2b Design with dedicated FA-icons and text status Adam Sundberg 2022-05-18 12:41:38 +02:00
12f5cc9358 Update 'lib/FeedbackPage.dart' nisa9769 2022-05-18 11:40:14 +02:00
48a1fbc766 Added ShadowMap widget Shakir 2022-05-17 18:07:41 +02:00
59861dcb05 pull from master maze6343 2022-05-17 12:19:23 +02:00
a3d96281b8 add plugin maze6343 2022-05-17 12:17:21 +02:00
96f31fa1df fix some problem maze6343 2022-05-17 12:11:50 +02:00
2c4c201b3d pull from master maze6343 2022-05-17 11:07:39 +02:00
8044ca4ca5 added som plugins and get user location function maze6343 2022-05-17 11:02:21 +02:00
0e1814d371 Merge pull request 'Merge Loginpage to master' (#9) from LoginPage into master maen0574 2022-05-17 10:19:57 +02:00
d272d8a32b connected feedback to database stjertnylle 2022-05-17 10:15:35 +02:00
8f6ac6273c Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage stjertnylle 2022-05-17 08:59:36 +02:00
ef57648790 connected feedback to database stjertnylle 2022-05-17 08:53:44 +02:00
1f21467b9d Merge pull request 'Weather service' (#8) from venue-page into master adsu7578 2022-05-16 17:30:57 +02:00
3e0abe57b4 Merge branch 'master' into venue-page adsu7578 2022-05-16 17:30:40 +02:00
acb80a6d33 minor change for conflict Adam Sundberg 2022-05-16 17:28:01 +02:00
bd41f97e13 Added support for fetching current weather Adam Sundberg 2022-05-16 17:14:37 +02:00
24e80a5812 Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into google_markers maze6343 2022-05-16 13:41:08 +02:00
fed5edebbc update marker maze6343 2022-05-16 13:39:11 +02:00
a3a5c939b0 update marker maze6343 2022-05-16 13:38:48 +02:00
83e14e1d5b google_markers (#6) maze6343 2022-05-16 11:36:25 +02:00
fb4fa23ce6 do merge maze6343 2022-05-16 11:34:33 +02:00
f033c16bd7 Merge branch 'master' into map-page maze6343 2022-05-16 11:29:26 +02:00
129742984f connected feedback to database stjertnylle 2022-05-13 15:00:05 +02:00
d6b1c31a2e added create account functionality, users will be added to database stjertnylle 2022-05-13 13:46:31 +02:00
446fbe9b65 försökte lägga till databas Nikolina Sandstedt 2022-05-13 13:39:22 +02:00
060ba0eb44 försökte lägga till databas Nikolina Sandstedt 2022-05-13 13:38:29 +02:00
327f48decd göra gitt pull maze6343 2022-05-12 20:10:42 +02:00
3fb16f52ff get data from json file maze6343 2022-05-12 20:09:08 +02:00
19ab7e6c60 Lägger till CreateAccountPage adamlindroth 2022-05-12 13:43:28 +02:00
a8428ad50f fixade dependencies adamlindroth 2022-05-12 13:32:50 +02:00
15fc0bc7eb Merge med mårtens branch adamlindroth 2022-05-12 13:30:20 +02:00
f04b853eed Untracked files adamlindroth 2022-05-12 11:44:52 +02:00
8b0995e389 added class user, updated loginpage stjertnylle 2022-05-12 11:07:34 +02:00

1 2 3