Timo Volkmann
|
f110c81ba3
|
improved cache overview
|
2019-05-10 17:19:38 +02:00 |
|
Maximilian Leopold
|
ec4202a5aa
|
Noch mehr von Michaels methoden fixen
|
2019-05-10 17:13:10 +02:00 |
|
Timo Volkmann
|
235f3fd0b5
|
small bugfix
|
2019-05-10 11:30:39 +02:00 |
|
Timo Volkmann
|
8857f886d9
|
Merge branch 'develop' into frontend/timo2
# Conflicts:
# frontend/src/pages/MyCaches.vue
|
2019-05-10 11:22:06 +02:00 |
|
Timo Volkmann
|
9410463620
|
implemented progress bar
|
2019-05-10 11:16:29 +02:00 |
|
Timo Volkmann
|
d1b7fb7c87
|
fixed bug in qrscanner component
|
2019-05-10 09:49:15 +02:00 |
|
Timo Volkmann
|
dc2d693562
|
added confirmation promt to delete Cache
|
2019-05-10 09:23:55 +02:00 |
|
rchrist
|
fec8723bbd
|
Merge branch 'develop' into frontend/robin
|
2019-05-09 21:37:29 +02:00 |
|
rchrist
|
d3a49d677c
|
finished team component
|
2019-05-09 21:36:49 +02:00 |
|
Maximilian Leopold
|
54ebd80825
|
Noch mehr fixen von Michaels methoden
|
2019-05-09 20:01:21 +02:00 |
|
rchrist
|
ab7f3de3f9
|
Merge branch 'develop' into frontend/robin
|
2019-05-09 19:50:40 +02:00 |
|
rchrist
|
b3b170b609
|
deleteTeamInvite implemented
|
2019-05-09 19:49:53 +02:00 |
|
Maximilian Leopold
|
dbe32ba845
|
Bei Michael tut nix
|
2019-05-09 19:48:44 +02:00 |
|
rchrist
|
d88d7baf09
|
registration fixed/reworked
|
2019-05-09 19:13:34 +02:00 |
|
rchrist
|
cbc448b048
|
Merge branch 'develop' into frontend/robin
|
2019-05-09 18:41:54 +02:00 |
|
rchrist
|
8a7c26f6a2
|
fix
|
2019-05-09 18:41:32 +02:00 |
|
Maximilian Leopold
|
fc5d644ec5
|
Changed getTeamInvite fro better readibility (Worng folder)
|
2019-05-09 18:36:11 +02:00 |
|
Maximilian Leopold
|
4cdadc8f7b
|
Changed getTeamInvite fro better readibility
|
2019-05-09 18:35:25 +02:00 |
|
rchrist
|
8d3fe823a9
|
Merge branch 'develop' into frontend/robin
|
2019-05-09 18:03:30 +02:00 |
|
rchrist
|
45515d33e0
|
inviteToTeam finished
|
2019-05-09 18:02:53 +02:00 |
|
Maximilian Leopold
|
a124b96ae2
|
Added email to Teammeber api call
|
2019-05-09 15:26:53 +02:00 |
|
Maximilian Leopold
|
157beb4583
|
Json in Teammember api call
|
2019-05-09 15:23:57 +02:00 |
|
Maximilian Leopold
|
eaafad3741
|
Changed rankinglist call
|
2019-05-09 14:07:49 +02:00 |
|
rchrist
|
75f794da23
|
Merge branch 'develop' into frontend/robin
|
2019-05-09 14:02:43 +02:00 |
|
rchrist
|
245c2fb402
|
some fixes
|
2019-05-09 14:02:14 +02:00 |
|
Maximilian Leopold
|
8f7ed1516e
|
Fixed teamranking again
|
2019-05-09 14:00:56 +02:00 |
|
Timo Volkmann
|
d0c2852d4a
|
Merge branch 'develop' into frontend/timo
|
2019-05-09 13:49:27 +02:00 |
|
rchrist
|
6251a6b25f
|
Merge branch 'develop' into frontend/robin
|
2019-05-09 13:48:43 +02:00 |
|
Maximilian Leopold
|
6ee35d4b35
|
Merge branch 'backend/max' into develop
|
2019-05-09 13:47:50 +02:00 |
|
rchrist
|
38e22fed9b
|
createTeam finished
|
2019-05-09 13:46:43 +02:00 |
|
Maximilian Leopold
|
5c9b85e577
|
Adde Teammembers fixed
|
2019-05-09 13:46:11 +02:00 |
|
Maximilian Leopold
|
faa21575a8
|
Merged
|
2019-05-09 13:11:40 +02:00 |
|
rchrist
|
caa5494840
|
Merge branch 'develop' into frontend/robin
|
2019-05-09 13:07:57 +02:00 |
|
rchrist
|
59dd4b8b2b
|
some changes at createTeam
|
2019-05-09 13:07:19 +02:00 |
|
Maximilian Leopold
|
08e30ca5b5
|
Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop
|
2019-05-09 13:06:46 +02:00 |
|
Maximilian Leopold
|
525e705bf9
|
Fixed Create Team
|
2019-05-09 13:06:41 +02:00 |
|
Katharina Will
|
20bf3bfd51
|
Applied final changes to team rankinglist view
|
2019-05-08 20:39:36 +02:00 |
|
Katharina Will
|
ebdea962ae
|
Merge branch 'develop' into frontend/kathy
|
2019-05-08 20:23:08 +02:00 |
|
Katharina Will
|
2e315c6125
|
Started implementation of map view in Overview
|
2019-05-08 20:14:37 +02:00 |
|
rchrist
|
4774b6d111
|
Merge branch 'develop' into frontend/robin
|
2019-05-08 17:02:59 +02:00 |
|
Maximilian Leopold
|
eb0483af21
|
Changed hello method
|
2019-05-08 17:01:11 +02:00 |
|
rchrist
|
31bc540d4f
|
Merge branch 'develop' into frontend/robin
|
2019-05-08 16:56:20 +02:00 |
|
rchrist
|
a56d2f3c22
|
finished getPersonalRanking()
|
2019-05-08 16:55:43 +02:00 |
|
Maximilian Leopold
|
1173664f93
|
Fixed personal rankingplace
|
2019-05-08 16:54:04 +02:00 |
|
rchrist
|
2a16638278
|
fixed merge conflicts
|
2019-05-08 16:34:24 +02:00 |
|
rchrist
|
54b98e5f6a
|
fixed merge conflicts
|
2019-05-08 16:20:57 +02:00 |
|
rchrist
|
80459cd793
|
implementation of some api calls finished
|
2019-05-08 16:15:44 +02:00 |
|
Maximilian Leopold
|
1d3bd11331
|
Changed get my Station POIS Method
|
2019-05-08 14:19:04 +02:00 |
|
Maximilian Leopold
|
2c7d47e0f0
|
Fixed Delete Cache Method
|
2019-05-08 14:04:50 +02:00 |
|
Maximilian Leopold
|
99499feb12
|
Spring application fixed
|
2019-05-08 13:13:31 +02:00 |
|