Commit Graph

188 Commits

Author SHA1 Message Date
Maximilian Leopold
eb0483af21 Changed hello method 2019-05-08 17:01:11 +02:00
Maximilian Leopold
1173664f93 Fixed personal rankingplace 2019-05-08 16:54:04 +02:00
Maximilian Leopold
2c7d47e0f0 Fixed Delete Cache Method 2019-05-08 14:04:50 +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
Maximilian Leopold
51e87c239a Added getTeamOfUser 2019-05-06 15:49:54 +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
Maximilian Leopold
e78157e2f5 More documentation 2019-05-03 17:06:32 +02:00
Maximilian Leopold
d92d43e63e More Swagger Doku 2019-05-02 20:31:13 +02:00
Maximilian Leopold
5c5adebbc4 Started Swagger Documentation 2019-05-02 19:55:39 +02:00
Maximilian Leopold
22e94a8c1a Merge branch 'frontend/timo' into develop 2019-05-02 19:32:02 +02:00
Maximilian Leopold
742d2b5d66 Startes Swagger Documentation 2019-05-02 19:31:16 +02:00
Michael
a5c630d0d5 more merge fixes... 2019-05-02 13:27:36 +02:00
Michael
2c1f40bc5f fixed more previous merge mistakes... 2019-05-02 12:57:06 +02:00
Michael
800c9d96cd fixed previous merge conflict mistakes 2019-05-02 12:46:37 +02:00
Timo Volkmann
44086c630d fixed register & continue cache 2019-04-30 19:07:18 +02:00
Timo Volkmann
8c647b0b09 changed some configurations for https 2019-04-30 17:09:51 +02:00
Timo Volkmann
9e132b21ef Merge branch 'develop' into frontend/timo; weird merge conflicts
# Conflicts:
#	.idea/modules.xml
#	src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
2019-04-30 15:39:50 +02:00
Maximilian Leopold
a3a61dbce0 New Rankingplace Method 2019-04-30 15:24:56 +02:00
rchrist
247e762289 design of profl 2019-04-30 14:21:22 +02:00
Maximilian Leopold
5246249bf8 Added getCurrentStation 2019-04-30 13:46:12 +02:00
Timo Volkmann
865d48cd63 reworked cache creation 2019-04-30 02:00:38 +02:00
Timo Volkmann
8636443f87 fixed merge problems 2019-04-29 22:16:18 +02:00
Timo Volkmann
2509d0dc6d Merge branch 'release2' into frontend/timo
# Conflicts:
#	src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
2019-04-29 21:53:05 +02:00
Michael
e1944ff8d4 works???? pls? 2019-04-29 20:51:40 +02:00
rchrist
30d90b2a21 fixed merge conflicts 2019-04-29 19:55:08 +02:00
rchrist
51b9587410 started logical implementation of profile and team 2019-04-29 19:51:12 +02:00
Maximilian Leopold
565bf98432 Added some team methods 2019-04-29 19:48:32 +02:00
Maximilian Leopold
9816cdf488 Some changes 2019-04-29 17:35:50 +02:00
Michael
c53fbaf9d5 added table annotation for teaminvite 2019-04-29 14:44:38 +02:00
Michael
37af0bb49e changed return body to JSON 2019-04-29 11:40:29 +02:00
Michael
d9a76e9783 added teamStatus and setTeamStatus API method 2019-04-29 11:15:24 +02:00
Michael
ac484e5d0c removed old unneeded methods 2019-04-29 11:03:59 +02:00
Michael
ac15616e22 added deleteTeamInvite API method 2019-04-29 11:02:43 +02:00
Michael
80510eb467 improved sendTeamInvite 2019-04-29 10:58:09 +02:00
Michael
06e2b54aef added getMyTeamInvites API method 2019-04-29 10:51:49 +02:00
Michael
54e488ac28 added sendTeamInvite API method and all needed database tables 2019-04-29 10:19:52 +02:00
Michael
1a6fb9d35e added a getTeamRankingList API method 2019-04-27 20:17:24 +02:00
Michael
50f7204cf5 added teamRankingListHelper 2019-04-27 20:15:18 +02:00
Michael
c4b3c52fea added getTeamRankingList sql query 2019-04-27 20:12:51 +02:00
Michael
35ad020c84 added leaveTeam and added some comments 2019-04-27 19:48:14 +02:00
Maximilian Leopold
ccba1fcab1 Fixed RankingPoints Vue 2019-04-26 19:38:58 +02:00
Michael
e81338dd38 more bugfixes 2019-04-25 14:33:58 +02:00
Michael
5e10ffbe1b fixed a bug 2019-04-25 14:26:14 +02:00