Commit Graph

418 Commits

Author SHA1 Message Date
Timo Volkmann
ff3deabb51 upgraded quasar 2019-05-14 12:16:08 +02:00
Timo Volkmann
0f71f843ab changed error dialog messages 2019-05-14 12:06:02 +02:00
Timo Volkmann
21d35288db bugfix in editCache 2019-05-14 10:52:44 +02:00
Timo Volkmann
16381ac8c2 implemented edit Cache, bugfixes 2019-05-14 10:17:06 +02:00
Timo Volkmann
4935298d66 Merge branch 'develop' into frontend/timo 2019-05-14 08:58:27 +02:00
Maximilian Leopold
c75eb3f5e2 Small changes in Logging 2019-05-13 19:08:02 +02:00
Maximilian Leopold
9608f082ae Configured Logging for Backend 2019-05-13 15:50:19 +02:00
Maximilian Leopold
8ba109427c Added map api call for the last station you visited from a cache 2019-05-13 15:32:53 +02:00
Maximilian Leopold
e64b607276 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-05-13 14:55:34 +02:00
Michael
d0976ab921 fixed valid lonitude, lattitude values 2019-05-13 12:49:57 +02:00
Timo Volkmann
fd03285573 typo in warning 2019-05-13 12:30:42 +02:00
Timo Volkmann
53e3005dc9 Merge branch 'develop' into frontend/timo 2019-05-13 12:29:58 +02:00
Michael
96221b9504 fixed an error in leaveTeam 2019-05-13 11:32:57 +02:00
Maximilian Leopold
ac99234c51 Merge branch 'develop' into frontend/timo 2019-05-13 11:28:24 +02:00
Maximilian Leopold
fce24179a6 Fixed Leave team 2019-05-13 11:14:22 +02:00
Timo Volkmann
30954310e1 improvements 2019-05-10 19:00:51 +02:00
Timo Volkmann
8c1bff3a20 auth evaluation bugfix 2019-05-10 18:49:51 +02:00
Timo Volkmann
f598516ed0 bugfix in overview 2019-05-10 18:16:03 +02:00
Timo Volkmann
210a92b82d Merge branch 'frontend/timo' into develop 2019-05-10 17:57:57 +02:00
Timo Volkmann
2d68ad6a2b improved cache progress percentage 2019-05-10 17:55:06 +02:00
Maximilian Leopold
06da9b9a4f Added docu 2019-05-10 17:51:59 +02:00
Maximilian Leopold
c5ffa61eda Added edit Cache 2019-05-10 17:50:45 +02:00
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