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 |
|
Timo Volkmann
|
62098b11b5
|
Merge branch 'frontend/timo' into develop
|
2019-05-08 12:20:48 +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
|
04f5a4d20b
|
Merge branch 'frontend/timo' into develop
|
2019-05-07 22:58:24 +02:00 |
|
Timo Volkmann
|
b8ecb2a93b
|
Merge branch 'develop' into frontend/timo
|
2019-05-07 22:57:59 +02:00 |
|
Timo Volkmann
|
21fc559a4b
|
bugfixes
|
2019-05-07 22:57:30 +02:00 |
|
Maximilian Leopold
|
4783f8e7c8
|
Fixed Team Ranking List Call
|
2019-05-07 18:41:45 +02:00 |
|
Michael
|
45d84db362
|
adjusted the categoryIDs again
|
2019-05-07 17:54:25 +02:00 |
|
Michael
|
d32d8ca3ea
|
adjusted categoryID values for POIS
|
2019-05-07 17:45:28 +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 |
|
Timo Volkmann
|
41d0cb028a
|
improve qr-code-scanner
|
2019-05-07 14:20:08 +02:00 |
|
Timo Volkmann
|
3c884dcd90
|
bugfixes
|
2019-05-07 13:19:11 +02:00 |
|
Timo Volkmann
|
c0845f835f
|
bugfixes
|
2019-05-07 12:56:04 +02:00 |
|
Timo Volkmann
|
44aa93338d
|
Merge branch 'develop' into frontend/timo
|
2019-05-07 09:25:33 +02:00 |
|
rchrist
|
20dfcd6ceb
|
some work on api calls of profile and team
|
2019-05-06 20:19:45 +02:00 |
|
rchrist
|
c99b929076
|
Merge branch 'develop' into frontend/robin
|
2019-05-06 17:46:49 +02:00 |
|
rchrist
|
52b04a90a2
|
some work at profile component
|
2019-05-06 17:46:26 +02:00 |
|
Katharina Will
|
4bd210ab73
|
Merge branch 'develop' into frontend/kathy
|
2019-05-06 16:08:23 +02:00 |
|
Maximilian Leopold
|
51e87c239a
|
Added getTeamOfUser
|
2019-05-06 15:49:54 +02:00 |
|
rchrist
|
e76581f128
|
Merge branch 'develop' into frontend/robin
|
2019-05-06 14:24:42 +02:00 |
|
Maximilian Leopold
|
ef819e5e54
|
Usermanagement fixed
|
2019-05-06 13:53:42 +02:00 |
|
Michael
|
68098b1fff
|
fixed a spelling mistake
|
2019-05-03 19:18:47 +02:00 |
|
Michael
|
ed3fb3ff0e
|
renamed to getMyStationPOIS
|
2019-05-03 19:13:21 +02:00 |
|
Michael
|
6ca87f84fc
|
implemented getStationPOIS
|
2019-05-03 19:10:03 +02:00 |
|
Michael
|
c86ce22d27
|
renamed the helper class
|
2019-05-03 18:48:02 +02:00 |
|
Michael
|
3cc9fd5597
|
added StationPOI helper class
|
2019-05-03 18:43:09 +02:00 |
|