Commit Graph

585 Commits

Author SHA1 Message Date
Katharina Will
c234ddeb5d Merge branch 'develop' into frontend/kathy 2019-05-23 12:53:33 +02:00
Katharina Will
d6d368ddb4 Added maps to necessary pages 2019-05-23 12:52:42 +02:00
Maximilian Leopold
485348fdfc Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-05-23 12:29:32 +02:00
Maximilian Leopold
eff92de0c0 Added Own rank to rankinglist 2019-05-23 12:29:26 +02:00
Michael
725572e3fc Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-05-23 12:22:34 +02:00
Michael
59acf0a79f fixed teamRankingList 2019-05-23 12:22:30 +02:00
Maximilian Leopold
4ff5574270 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-05-23 12:18:17 +02:00
Maximilian Leopold
8b7f08dcc5 Fixed Rankinglust 2019-05-23 12:18:11 +02:00
Michael
c0befac9e3 changed requestMethod 2019-05-23 12:12:40 +02:00
Michael
9332c8f079 merge conflicts 2019-05-23 12:11:26 +02:00
Michael
ce22469c79 added resetRankingList 2019-05-23 12:09:58 +02:00
Maximilian Leopold
cfe56d175c Added Method to reset Cache for certain user 2019-05-23 12:06:03 +02:00
Katharina Will
f2b84b93a3 Changes to iFrame URL of Lageplan for CacheStart map 2019-05-18 11:08:09 +02:00
Timo Volkmann
63e63c55fa fixed error messages in Profile 2019-05-16 21:11:12 +02:00
Timo Volkmann
74c5548f00 MyCaches: unified descriptions 2019-05-16 20:59:30 +02:00
Timo Volkmann
63649b2647 implemented user menu, fixed bugs 2019-05-16 20:45:34 +02:00
Timo Volkmann
2cacf050be Merge branch 'frontend/timo' into develop
# Conflicts:
#	frontend/src/pages/Register.vue
2019-05-16 16:55:09 +02:00
Timo Volkmann
426e24e096 implemented feedback from usability test 2019-05-16 16:52:47 +02:00
rchrist
4b2feaece5 void teaminvites leads to 'keine Einträge' now 2019-05-16 16:45:12 +02:00
rchrist
0675bdc2a4 Merge branch 'develop' into frontend/robin 2019-05-16 16:39:48 +02:00
rchrist
fc1e7c4b67 profile and register changes and bugfixes 2019-05-16 16:38:57 +02:00
Timo Volkmann
ab213517b7 Merge branch 'develop' into frontend/timo 2019-05-16 14:41:19 +02:00
Michael
7ae384b0da Breitengrad/Längengrad-Reihenfolge getauscht bei der Stationserstellung 2019-05-16 12:10:58 +02:00
Michael
99f9748de3 fehlermeldungen vereinfacht 2019-05-16 11:45:34 +02:00
Michael
0aff9266d6 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-05-16 10:00:50 +02:00
Michael
d00d310449 a user cant invite himself now 2019-05-16 10:00:41 +02:00
Maximilian Leopold
3b3e1ab3d7 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-05-16 09:35:00 +02:00
Maximilian Leopold
78008b010e More Logger 2019-05-16 09:34:55 +02:00
Michael
896702b8f8 fixed leaveTeam 2019-05-16 09:13:04 +02:00
rchrist
e12c82aa98 design adjustments 2019-05-15 15:27:40 +02:00
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
Timo Volkmann
8367def794 added click counter 2019-05-15 13:10:48 +02:00
Timo Volkmann
c00cdfcec1 Merge branch 'develop' into frontend/timo 2019-05-15 11:11:22 +02:00
Timo Volkmann
7faa9ef327 bugfixes in Cache edit 2019-05-15 11:11:12 +02:00
Michael
4b72e5c1e6 .. 2019-05-15 11:08:56 +02:00
Michael
8d1b2c5e8a changed longitude/latitude 2019-05-15 11:08:37 +02:00
Michael
a4f6401ff9 fehlermeldungen überarbeitet 2019-05-15 10:05:49 +02:00
rchrist
adad85d4d0 bugfixes 2019-05-14 14:12:10 +02:00
Timo Volkmann
eabf972012 some changes in login page 2019-05-14 13:48:43 +02:00
rchrist
93174fa788 Merge branch 'develop' into frontend/robin 2019-05-14 12:18:41 +02:00
Timo Volkmann
625574d765 Merge branch 'frontend/timo' into develop 2019-05-14 12:17:19 +02:00
Michael
eee5870eb4 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-05-14 12:16:47 +02:00
Michael
2533442cae better exception messages 2019-05-14 12:16:44 +02:00
Maximilian Leopold
e5c4a2a5e8 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-05-14 12:16:11 +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
Maximilian Leopold
c18cbeff51 Fehlermeldungen 2019-05-14 12:14:31 +02:00
Michael
2feadc12b5 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-05-14 12:08:35 +02:00
Michael
fd72445e1e reworked exception messages in FinderUtil 2019-05-14 12:08:25 +02:00