rchrist
|
ce9e21018c
|
Merge branch 'develop' into frontend/robin
|
2019-05-03 18:40:20 +02:00 |
|
Maximilian Leopold
|
e78157e2f5
|
More documentation
|
2019-05-03 17:06:32 +02:00 |
|
rchrist
|
6fb8cd8f91
|
Merge branch 'develop' into frontend/robin
|
2019-05-03 15:21:46 +02:00 |
|
rchrist
|
0ea9a293a7
|
using token instead of name for getRanking API now
|
2019-05-03 15:20:51 +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
|
ea006b3915
|
cachers can now access their rewards at mycaches page
|
2019-05-01 21:40:13 +02:00 |
|
Timo Volkmann
|
e660a7bba7
|
continue cache works
|
2019-05-01 21:31:14 +02:00 |
|
Timo Volkmann
|
1f2ee957e8
|
cacheview now properly loads new data
|
2019-05-01 21:23:59 +02:00 |
|
Timo Volkmann
|
57c62d421d
|
changed registration process
|
2019-04-30 19:17:18 +02:00 |
|
Timo Volkmann
|
44086c630d
|
fixed register & continue cache
|
2019-04-30 19:07:18 +02:00 |
|
Timo Volkmann
|
a97b3f1c91
|
USER_API in quasar.conf
|
2019-04-30 17:59:13 +02:00 |
|
Timo Volkmann
|
a9450d448f
|
fixed delete cache
|
2019-04-30 17:49:58 +02:00 |
|
Timo Volkmann
|
8c647b0b09
|
changed some configurations for https
|
2019-04-30 17:09:51 +02:00 |
|
Timo Volkmann
|
6f4789fff0
|
fixed login & separated profile from mycaches
|
2019-04-30 16:45:27 +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 |
|
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 |
|