|
|
4c8305474c
|
Merge pull request 'LastFeedbackBranch' (#48) from LastFeedbackBranch into master
Reviewed-on: #48
|
2022-05-28 05:33:08 +02:00 |
|
Nikolina Sandstedt
|
7ebb64a08f
|
hamburgarmenyn hade försvunnit, så lade till den igen
|
2022-05-28 05:29:15 +02:00 |
|
Nikolina Sandstedt
|
5adca7e419
|
ändrat
|
2022-05-28 05:00:34 +02:00 |
|
Nikolina Sandstedt
|
26beaa855c
|
fixade så att användare navigeras direkt till kartan
|
2022-05-28 04:49:56 +02:00 |
|
Nikolina Sandstedt
|
51fe8f7eb2
|
ändrade så att användaren tas direkt till kartan istället för hemskärmen
|
2022-05-28 04:41:58 +02:00 |
|
|
|
f6fc0d551d
|
Merge pull request 'VenuInfo blabla' (#46) from shas6395 into master
Reviewed-on: #46
|
2022-05-27 11:34:02 +02:00 |
|
|
|
475e036c7f
|
VenuInfo blabla
|
2022-05-27 11:30:28 +02:00 |
|
|
|
ff3a80a2b5
|
Merge pull request 'VenueInfo' (#45) from shas6395 into master
Reviewed-on: #45
|
2022-05-26 21:03:08 +02:00 |
|
Shakir
|
992b4be7d0
|
VenueInfo
|
2022-05-26 20:51:03 +02:00 |
|
|
|
57d77509c4
|
Merge pull request 'Venues from server' (#44) from venue-page into master
Reviewed-on: #44
|
2022-05-26 11:23:11 +02:00 |
|
Adam Sundberg
|
9f359b944e
|
Fixes for conflicts
|
2022-05-26 11:21:45 +02:00 |
|
Adam Sundberg
|
c5455eb2aa
|
Merge branch 'master' into venue-page
# Conflicts:
# lib/ListViewPage.dart
# lib/Map.dart
# lib/main.dart
|
2022-05-26 10:59:59 +02:00 |
|
Adam Sundberg
|
0c0600c493
|
Added list view
|
2022-05-26 10:39:45 +02:00 |
|
|
|
bfc653b71b
|
Merge pull request 'ManageAccountPage' (#42) from ManageAccountPage into master
Reviewed-on: #42
|
2022-05-25 22:16:44 +02:00 |
|
|
|
4aa63a77ae
|
complete ManageAccountPage
|
2022-05-25 22:15:41 +02:00 |
|
|
|
1bb05a3196
|
push to master
|
2022-05-25 22:14:23 +02:00 |
|
|
|
b5de86173e
|
update ManageAccountPage
|
2022-05-25 21:53:51 +02:00 |
|
|
|
58575914ec
|
Merge pull request 'AdamsBranch' (#41) from AdamsBranch into master
Reviewed-on: #41
|
2022-05-25 15:30:42 +02:00 |
|
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 |
|
Adam Sundberg
|
d41908c203
|
Added functionality for navigation in the app
|
2022-05-25 14:03:24 +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 |
|
Adam Sundberg
|
66efb8117a
|
Added support to creating VenueObjects from data
|
2022-05-25 10:44:56 +02:00 |
|
|
|
d86af8d2ae
|
implement ManageAccountPage
|
2022-05-24 21:40:46 +02:00 |
|
adamlindroth
|
6593498f2c
|
gitignore fuckar
|
2022-05-24 16:47:34 +02:00 |
|
|
|
d4085bf963
|
added new branch
|
2022-05-24 14:40:47 +02:00 |
|
|
|
8d49c6e605
|
add changes
|
2022-05-24 14:32:41 +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 |
|
