Timo Volkmann
|
bac0a31fd3
|
fixed bugs in cache creation and processing
|
2019-04-30 15:30:50 +02:00 |
|
rchrist
|
daafe5b1f7
|
Merge branch 'develop' into frontend/robin
|
2019-04-30 15:29:28 +02:00 |
|
rchrist
|
fad27b0e35
|
save
|
2019-04-30 15:28:57 +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
|
2536996b16
|
CacheEnd now shows reward correctly
|
2019-04-29 22:17:58 +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 |
|
Timo Volkmann
|
2b691fa6f3
|
fixed git problems
|
2019-04-29 21:51:33 +02:00 |
|
Timo Volkmann
|
33ed2e32b9
|
fixed cache process
|
2019-04-29 21:34:26 +02:00 |
|
Michael
|
e1944ff8d4
|
works???? pls?
|
2019-04-29 20:51:40 +02:00 |
|
Timo Volkmann
|
65d3e77558
|
fixed some bugs and created data-store for current cache
|
2019-04-29 20:37:30 +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 |
|
Timo Volkmann
|
2cace929d0
|
Merge branch 'develop' into frontend/timo
|
2019-04-29 18:38:04 +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
|
31d7bf3c51
|
Merge branch 'develop' into backend/michael
|
2019-04-29 10:24:36 +02:00 |
|
Michael
|
54e488ac28
|
added sendTeamInvite API method and all needed database tables
|
2019-04-29 10:19:52 +02:00 |
|
rchrist
|
bd811fbe99
|
icon for teaminvites updated
|
2019-04-28 20:56:05 +02:00 |
|
rchrist
|
45cef7d5f3
|
Profile mockup updated for presentation
|
2019-04-28 20:53:06 +02:00 |
|
rchrist
|
62de51f07d
|
create Team added (MOCKUP)
|
2019-04-27 22:06:06 +02:00 |
|
rchrist
|
8c10b4286d
|
ranking for teams added (MOCKUP)
|
2019-04-27 21:52:53 +02:00 |
|
rchrist
|
93e5a150cd
|
Merge branch 'develop' into frontend/robin
|
2019-04-27 21:44:21 +02:00 |
|
rchrist
|
c10820d832
|
myProfile and myTeams MOCKUP version added
|
2019-04-27 21:43:23 +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
|
06219f4b5c
|
Merge branch 'backend/michael' into develop
|
2019-04-25 23:55:19 +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 |
|
Michael
|
b10226b5b9
|
added joinTeam
|
2019-04-25 14:22:43 +02:00 |
|
rchrist
|
85cfd5e3f4
|
Merge branch 'develop' into frontend/robin
|
2019-04-25 13:56:07 +02:00 |
|
rchrist
|
a7223a49cb
|
finished user story Registrierung
|
2019-04-25 13:55:27 +02:00 |
|
Michael
|
a8b0b1bbb4
|
added createTeam
|
2019-04-25 12:40:56 +02:00 |
|
Timo Volkmann
|
57c5c7c39a
|
redirect finished station to CacheEnd. not tested
|
2019-04-25 12:38:04 +02:00 |
|
Timo Volkmann
|
33e6b6a35e
|
Merge branch 'frontend/kathy' into frontend/timo
|
2019-04-25 12:26:03 +02:00 |
|
Katharina Will
|
91dd4301a5
|
Merge branch 'develop' into frontend/kathy
|
2019-04-25 12:12:56 +02:00 |
|
Katharina Will
|
dcdbe2dd68
|
Minor changes to CacheEnd
|
2019-04-25 12:09:39 +02:00 |
|