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 |
|
Michael
|
b10226b5b9
|
added joinTeam
|
2019-04-25 14:22:43 +02:00 |
|
Michael
|
a8b0b1bbb4
|
added createTeam
|
2019-04-25 12:40:56 +02:00 |
|
Michael
|
73cd87765f
|
checkStation is a god now
|
2019-04-23 22:53:21 +02:00 |
|
Michael
|
7cfae18552
|
added another error message
|
2019-04-23 15:44:09 +02:00 |
|
Michael
|
b0ee8a75f6
|
removed unneeded roles
|
2019-04-23 13:32:52 +02:00 |
|
Timo Volkmann
|
0ec3dbb0b1
|
qr-code scanner working
|
2019-04-22 22:43:58 +02:00 |
|
Maximilian Leopold
|
f244cf408b
|
Added Query to get Rankingplace of specific User
|
2019-04-22 14:15:47 +02:00 |
|
Maximilian Leopold
|
76c426b252
|
Rankinglist user now isnt dupkicate
|
2019-04-19 22:34:18 +02:00 |
|
Michael
|
deb50cad9c
|
a cache needs atleast 2 stations
|
2019-04-18 14:38:20 +02:00 |
|
Michael
|
48275e09f1
|
fixed a mistake
|
2019-04-18 14:21:10 +02:00 |
|
Michael
|
7d17277c46
|
fixed a bug in CacheConstrutctionUtil
|
2019-04-18 13:50:22 +02:00 |
|
Timo Volkmann
|
e1a10ed23d
|
Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop
|
2019-04-18 13:01:18 +02:00 |
|
Timo Volkmann
|
621978e08d
|
resolved merge conflict
|
2019-04-18 12:59:02 +02:00 |
|
Michael
|
cfd520501e
|
changed response status
|
2019-04-18 12:53:57 +02:00 |
|
Maximilian Leopold
|
5aa9b9537a
|
Merge branch 'backend/max' into develop
|
2019-04-18 12:50:08 +02:00 |
|
Maximilian Leopold
|
496c5fcb6b
|
Ready to deploy
|
2019-04-18 12:48:33 +02:00 |
|
Michael
|
ab119b5006
|
changed the rankingListQuery so it only shows user from the domain geocaching
|
2019-04-18 12:10:24 +02:00 |
|
Michael
|
eaaa1fb2bb
|
fixed some bugs with FinderUtil
|
2019-04-18 00:31:31 +02:00 |
|