Commit Graph

162 Commits

Author SHA1 Message Date
rchrist
a4e52596ae username validation updated 2019-05-15 14:29:53 +02:00
rchrist
27ab388636 login validation completed 2019-05-15 13:45:54 +02:00
rchrist
adad85d4d0 bugfixes 2019-05-14 14:12:10 +02:00
rchrist
93174fa788 Merge branch 'develop' into frontend/robin 2019-05-14 12:18:41 +02:00
Timo Volkmann
ff3deabb51 upgraded quasar 2019-05-14 12:16:08 +02:00
rchrist
08c933976f reworked design of profile and team site 2019-05-14 12:14:36 +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
rchrist
79ca7f53e9 Merge branch 'develop' into frontend/robin 2019-05-13 12:42:45 +02:00
rchrist
405c1e6bb7 changes to team view 2019-05-13 12:42:03 +02:00
Timo Volkmann
fd03285573 typo in warning 2019-05-13 12:30:42 +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
2d68ad6a2b improved cache progress percentage 2019-05-10 17:55:06 +02:00
Timo Volkmann
f110c81ba3 improved cache overview 2019-05-10 17:19:38 +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
d3a49d677c finished team component 2019-05-09 21:36:49 +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
4cdadc8f7b Changed getTeamInvite fro better readibility 2019-05-09 18:35:25 +02:00
rchrist
45515d33e0 inviteToTeam finished 2019-05-09 18:02:53 +02:00
rchrist
245c2fb402 some fixes 2019-05-09 14:02:14 +02:00
rchrist
38e22fed9b createTeam finished 2019-05-09 13:46:43 +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
a56d2f3c22 finished getPersonalRanking() 2019-05-08 16:55:43 +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
99499feb12 Spring application fixed 2019-05-08 13:13:31 +02:00
Timo Volkmann
b5ba5230ab improvements: profile, qr-scanner, layout 2019-05-08 12:17:47 +02:00
Timo Volkmann
b6a9cdcb07 added qr-generator and fixed some bugs 2019-05-08 00:40:10 +02:00
Timo Volkmann
21fc559a4b bugfixes 2019-05-07 22:57:30 +02:00
Timo Volkmann
14fe441e80 moved QR-Scanner to Component 2019-05-07 15:07:57 +02:00
Katharina Will
7512c2e49e Added map to CacheStart view 2019-05-07 14:36:43 +02:00