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

462c5d7bbd Merge pull request 'Fix bug on map-click' (#62) from final into master master adsu7578 2022-06-04 08:10:03 +02:00
f87dc614a7 Fix bug on map-click final Adam Sundberg 2022-06-04 08:08:22 +02:00
40fe0fedad Merge pull request 'fixed globalkey-issue' (#61) from LoginPage into master maen0574 2022-06-01 22:53:58 +02:00
35762a4229 fixed globalkey-issue LoginPage maen0574 2022-06-01 22:53:15 +02:00
9401609153 Merge pull request 'LoginPage' (#60) from LoginPage into master maen0574 2022-06-01 22:50:13 +02:00
8ce14be36e fixed globalkey-issue maen0574 2022-06-01 22:49:01 +02:00
53a2f5029a fixed globalkey-issue maen0574 2022-06-01 22:00:09 +02:00
4ba0c3341c fixed globalkey-issue maen0574 2022-06-01 14:09:30 +02:00
75ad9db170 Merge pull request 'Minor edits' (#59) from connecter into master adsu7578 2022-06-01 13:39:17 +02:00
cec07c0a22 edits after name changes connecter Adam Sundberg 2022-06-01 13:38:49 +02:00
6b017899ce Merge branch 'master' into connecter Adam Sundberg 2022-06-01 13:34:46 +02:00
01bab2c13d minor edits Adam Sundberg 2022-06-01 13:34:16 +02:00
78d2a62583 Merge pull request 'Cleaning' (#58) from shas6395----- into master shas6395 2022-06-01 13:12:41 +02:00
f952e53581 Cleaning shas6395----- shas6395 2022-06-01 13:10:04 +02:00
ef90a8e76c Merge pull request 'clean up, and a few tests' (#57) from connecter into master adsu7578 2022-06-01 12:50:16 +02:00
664563df35 clean up, and a few tests Adam Sundberg 2022-06-01 12:49:49 +02:00
1e74a80ae1 implemented change password feature maen0574 2022-06-01 11:57:55 +02:00
049ca366e3 Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage maen0574 2022-05-31 09:21:38 +02:00
48176cfe8e polished classes maen0574 2022-05-31 09:21:09 +02:00
d3b3d5c4f6 Merge pull request 'shas6395-----' (#56) from shas6395----- into master shas6395 2022-05-30 18:28:11 +02:00
739bb5fc6e Final version? shas6395 2022-05-30 18:21:43 +02:00
defc482611 Final version? shas6395 2022-05-30 18:04:05 +02:00
6a8aa8c4e1 Merge remote-tracking branch 'origin/master' shas6395 2022-05-30 17:45:12 +02:00
3a47a28beb Merge pull request 'polished classes' (#55) from LoginPage into master maen0574 2022-05-30 17:37:41 +02:00
5d1039d28b polished classes maen0574 2022-05-30 17:37:03 +02:00
c7e515ac3f Merge pull request 'LoginPage' (#54) from LoginPage into master maen0574 2022-05-30 17:09:43 +02:00
fcc0e0c7c8 Added outdoorseatingarea with raw data from DB maen0574 2022-05-30 17:05:08 +02:00
a9fe97cae6 Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage maen0574 2022-05-30 16:10:30 +02:00
fefdd965b9 Added outdoorseatingarea with raw data from DB maen0574 2022-05-30 15:57:49 +02:00
c1c098ad66 Merge remote-tracking branch 'origin/master' shas6395 2022-05-30 15:45:20 +02:00
575d914528 Merge pull request 'BottomModalSheet & Venue details' (#53) from connecter into master adsu7578 2022-05-30 15:30:42 +02:00
cd5495d4b5 minor edit Adam Sundberg 2022-05-30 15:29:22 +02:00
5270b3ee81 change to modalBottomSheet Adam Sundberg 2022-05-30 15:22:51 +02:00
95ba70c7f3 merge Adam Sundberg 2022-05-30 14:17:30 +02:00
b79bab257c ..... shas6395 shas6395 2022-05-30 14:12:22 +02:00
1f659c8913 New bottomsheet and venue features Adam Sundberg 2022-05-30 14:06:35 +02:00
5c428f8453 HomePage and Globals updated shas6395 2022-05-30 14:05:48 +02:00
3bac5c5c5c Merge remote-tracking branch 'origin/master' shas6395 2022-05-30 13:56:17 +02:00
2b6e2bb4ad HomePage and Globals updated shas6395 2022-05-30 13:42:12 +02:00
495c757cb7 Merge pull request 'ManageAccountPage' (#50) from ManageAccountPage into master maze6343 2022-05-30 13:41:54 +02:00
9f3b64c326 added test file ManageAccountPage maze6343 2022-05-30 13:40:53 +02:00
dce681c798 added ManageAccountPage_test.dart maze6343 2022-05-30 13:36:47 +02:00
cab9f25612 Merge pull request 'VenuInfo improved' (#49) from shas6395 into master shas6395 2022-05-30 12:33:16 +02:00
fc045a6f87 VenuInfo improved shas6395 2022-05-30 12:29:25 +02:00
fec6bef35f Markers showing depending on camera location, encrypting passwords maen0574 2022-05-30 11:00:30 +02:00
7f3cefdadd Markers showing depending on camera location, encrypting passwords maen0574 2022-05-30 10:48:51 +02:00
b7067ce62b dependencies LastFeedbackBranch Nikolina Sandstedt 2022-05-29 09:39:23 +02:00
4c8305474c Merge pull request 'LastFeedbackBranch' (#48) from LastFeedbackBranch into master settingsPageFix nisa9769 2022-05-28 05:33:08 +02:00
7ebb64a08f hamburgarmenyn hade försvunnit, så lade till den igen Nikolina Sandstedt 2022-05-28 05:29:15 +02:00
5adca7e419 ändrat newnewnewFeedback Nikolina Sandstedt 2022-05-28 05:00:34 +02:00
26beaa855c fixade så att användare navigeras direkt till kartan Nikolina Sandstedt 2022-05-28 04:49:56 +02:00
51fe8f7eb2 ändrade så att användaren tas direkt till kartan istället för hemskärmen Nikolina Sandstedt 2022-05-28 04:41:58 +02:00
f6fc0d551d Merge pull request 'VenuInfo blabla' (#46) from shas6395 into master shas6395 2022-05-27 11:34:02 +02:00
475e036c7f VenuInfo blabla shas6395 2022-05-27 11:30:28 +02:00
c1178a7994 Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage maen0574 2022-05-27 10:48:16 +02:00
ff3a80a2b5 Merge pull request 'VenueInfo' (#45) from shas6395 into master shas6395 2022-05-26 21:03:08 +02:00
992b4be7d0 VenueInfo Shakir 2022-05-26 20:51:03 +02:00
38accf9553 Markers showing depending on camera location maen0574 2022-05-26 12:33:30 +02:00
57d77509c4 Merge pull request 'Venues from server' (#44) from venue-page into master adsu7578 2022-05-26 11:23:11 +02:00
9f359b944e Fixes for conflicts venue-page Adam Sundberg 2022-05-26 11:21:45 +02:00
c5455eb2aa Merge branch 'master' into venue-page Adam Sundberg 2022-05-26 10:59:59 +02:00
0c0600c493 Added list view Adam Sundberg 2022-05-26 10:39:45 +02:00
bfc653b71b Merge pull request 'ManageAccountPage' (#42) from ManageAccountPage into master maze6343 2022-05-25 22:16:44 +02:00
4aa63a77ae complete ManageAccountPage maze6343 2022-05-25 22:15:41 +02:00
1bb05a3196 push to master maze6343 2022-05-25 22:14:23 +02:00
b5de86173e update ManageAccountPage maze6343 2022-05-25 21:53:51 +02:00
58575914ec Merge pull request 'AdamsBranch' (#41) from AdamsBranch into master adli7087 2022-05-25 15:30:42 +02:00
9260520cb8 Fixade konflikter AdamsBranch adamlindroth 2022-05-25 15:27:42 +02:00
c65e9e24a1 Strul adamlindroth 2022-05-25 15:21:02 +02:00
2c186f202b Färdigställt filterrutan adamlindroth 2022-05-25 15:06:45 +02:00
d41908c203 Added functionality for navigation in the app Adam Sundberg 2022-05-25 14:03:24 +02:00
1a865f5da7 Merge pull request 'ändrade font i create login' (#40) from newnewnewFeedback into master nisa9769 2022-05-25 12:35:27 +02:00
e872f91013 ändrade font i create login Nikolina Sandstedt 2022-05-25 12:34:36 +02:00
57a0cbd968 Merge pull request 'fixade knapp i feedback' (#39) from newnewnewFeedback into master nisa9769 2022-05-25 12:17:16 +02:00
929eba0d70 fixade knapp i feedback Nikolina Sandstedt 2022-05-25 12:16:13 +02:00
52ce4e6ac0 Merge pull request 'newnewnewFeedback' (#38) from newnewnewFeedback into master nisa9769 2022-05-25 12:05:57 +02:00
bc9172d75a fixade problem med merge Nikolina Sandstedt 2022-05-25 12:02:58 +02:00
b51ee4156b Mergade med master adamlindroth 2022-05-25 11:55:49 +02:00
581b168cff changed dependencies Nikolina Sandstedt 2022-05-25 11:50:39 +02:00
7165a96a2e Lade till en filterknapp i appbar adamlindroth 2022-05-25 11:45:08 +02:00
6493f99658 la till newnewFeedback Nikolina Sandstedt 2022-05-25 11:44:43 +02:00
9509d7565d la till hamburgarmeny Nikolina Sandstedt 2022-05-25 11:18:03 +02:00
66efb8117a Added support to creating VenueObjects from data Adam Sundberg 2022-05-25 10:44:56 +02:00
d86af8d2ae implement ManageAccountPage maze6343 2022-05-24 21:40:46 +02:00
6593498f2c gitignore fuckar adamlindroth 2022-05-24 16:47:34 +02:00
d4085bf963 added new branch maze6343 2022-05-24 14:40:47 +02:00
8d49c6e605 add changes maze6343 2022-05-24 14:32:41 +02:00
3fcbf6e0cc Merge pull request 'LoginPage' (#36) from LoginPage into master unitTestFrontEnd maen0574 2022-05-24 13:28:55 +02:00
ecc446d44d Completed signin with gmail maen0574 2022-05-24 13:13:25 +02:00
87159d7532 Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage maen0574 2022-05-24 12:59:37 +02:00
04ef9f58f9 Completed signin with gmail maen0574 2022-05-24 12:50:45 +02:00
3d1884bbc5 Implemented FavoritePage, users can now see favorites and remove them maen0574 2022-05-24 12:04:40 +02:00
780f514aa3 Merge pull request 'shas6395' (#34) from shas6395 into master shas6395 2022-05-23 19:43:00 +02:00
866ee5398b Merge remote-tracking branch 'origin/master' Shakir 2022-05-23 19:39:41 +02:00
6821e0520d * Integrated ShadowDetector with markers. ShadowDetector Shakir 2022-05-23 19:34:23 +02:00
653e53c2c9 Merge pull request 'fixade feedback' (#33) from newnewFeedback into master nisa9769 2022-05-23 15:04:34 +02:00
eb54c855f1 fixade feedback Nikolina Sandstedt 2022-05-23 15:03:56 +02:00
3a42734375 Merge remote-tracking branch 'origin/master' sssss Shakir 2022-05-23 14:03:03 +02:00
e9200ecdd1 Merge pull request 'lade till filterknapp på karta' (#32) from newnewFeedback into master nisa9769 2022-05-23 13:17:19 +02:00
c364bd320f Merge branch 'master' into newnewFeedback nisa9769 2022-05-23 13:16:50 +02:00

1 2 3