Timo Volkmann
|
2cace929d0
|
Merge branch 'develop' into frontend/timo
|
2019-04-29 18:38:04 +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
|
dcdbe2dd68
|
Minor changes to CacheEnd
|
2019-04-25 12:09:39 +02:00 |
|
Timo Volkmann
|
479173de84
|
changes for cache creation
|
2019-04-25 12:08:03 +02:00 |
|
Timo Volkmann
|
b4057e9c85
|
Merge branch 'frontend/kathy' into frontend/timo
# Conflicts:
# frontend/src/pages/CacheStart.vue
|
2019-04-25 10:27:29 +02:00 |
|
Timo Volkmann
|
3ed9a1bf21
|
implemented qr-code scanner in caching process
|
2019-04-25 10:22:28 +02:00 |
|
Katharina Will
|
11e84effa1
|
Added missing end-tags
|
2019-04-24 11:00:20 +02:00 |
|
Katharina Will
|
4b0063b852
|
Merge branch 'develop' into frontend/kathy
|
2019-04-24 10:11:33 +02:00 |
|
Katharina Will
|
582edef020
|
Minor changes to CacheEnd
|
2019-04-24 10:10:02 +02:00 |
|
Timo Volkmann
|
e412d4a797
|
updated frontend caching logic
|
2019-04-24 09:31:54 +02:00 |
|
Michael
|
73cd87765f
|
checkStation is a god now
|
2019-04-23 22:53:21 +02:00 |
|
Katharina Will
|
6f6fa8a0b0
|
Added error handling to CacheStart and implemented qr scanner as own page
|
2019-04-23 21:02:02 +02:00 |
|
rchrist
|
1427e4dcd2
|
Merge branch 'develop' into frontend/robin
|
2019-04-23 16:58:51 +02:00 |
|
rchrist
|
7a693d51f9
|
register page added
|
2019-04-23 16:58:22 +02:00 |
|
Katharina Will
|
75798eaaca
|
Merge branch 'develop' into frontend/kathy
|
2019-04-23 15:54:27 +02:00 |
|
Katharina Will
|
fe3070204d
|
Added functionality to start a Cache and view first station
|
2019-04-23 15:53:13 +02:00 |
|
Michael
|
7cfae18552
|
added another error message
|
2019-04-23 15:44:09 +02:00 |
|
Katharina Will
|
bfe303f277
|
Merge branch 'develop' into frontend/kathy
|
2019-04-23 14:56:44 +02:00 |
|
Katharina Will
|
30365d8db6
|
Modified cacheStart and cacheEnd
|
2019-04-23 14:55:34 +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 |
|