Commit Graph

132 Commits

Author SHA1 Message Date
rchrist
45515d33e0 inviteToTeam finished 2019-05-09 18:02:53 +02:00
rchrist
245c2fb402 some fixes 2019-05-09 14:02:14 +02:00
rchrist
38e22fed9b createTeam finished 2019-05-09 13:46:43 +02:00
rchrist
caa5494840 Merge branch 'develop' into frontend/robin 2019-05-09 13:07:57 +02:00
rchrist
59dd4b8b2b some changes at createTeam 2019-05-09 13:07:19 +02:00
Maximilian Leopold
08e30ca5b5 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-05-09 13:06:46 +02:00
Maximilian Leopold
525e705bf9 Fixed Create Team 2019-05-09 13:06:41 +02:00
Katharina Will
20bf3bfd51 Applied final changes to team rankinglist view 2019-05-08 20:39:36 +02:00
Katharina Will
ebdea962ae Merge branch 'develop' into frontend/kathy 2019-05-08 20:23:08 +02:00
Katharina Will
2e315c6125 Started implementation of map view in Overview 2019-05-08 20:14:37 +02:00
rchrist
a56d2f3c22 finished getPersonalRanking() 2019-05-08 16:55:43 +02:00
rchrist
2a16638278 fixed merge conflicts 2019-05-08 16:34:24 +02:00
rchrist
54b98e5f6a fixed merge conflicts 2019-05-08 16:20:57 +02:00
rchrist
80459cd793 implementation of some api calls finished 2019-05-08 16:15:44 +02:00
Maximilian Leopold
99499feb12 Spring application fixed 2019-05-08 13:13:31 +02:00
Timo Volkmann
b5ba5230ab improvements: profile, qr-scanner, layout 2019-05-08 12:17:47 +02:00
Timo Volkmann
b6a9cdcb07 added qr-generator and fixed some bugs 2019-05-08 00:40:10 +02:00
Timo Volkmann
21fc559a4b bugfixes 2019-05-07 22:57:30 +02:00
Timo Volkmann
14fe441e80 moved QR-Scanner to Component 2019-05-07 15:07:57 +02:00
Katharina Will
7512c2e49e Added map to CacheStart view 2019-05-07 14:36:43 +02:00
Timo Volkmann
41d0cb028a improve qr-code-scanner 2019-05-07 14:20:08 +02:00
Timo Volkmann
3c884dcd90 bugfixes 2019-05-07 13:19:11 +02:00
Timo Volkmann
c0845f835f bugfixes 2019-05-07 12:56:04 +02:00
rchrist
20dfcd6ceb some work on api calls of profile and team 2019-05-06 20:19:45 +02:00
rchrist
52b04a90a2 some work at profile component 2019-05-06 17:46:26 +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
742d2b5d66 Startes Swagger Documentation 2019-05-02 19:31:16 +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
fad27b0e35 save 2019-04-30 15:28:57 +02:00
rchrist
247e762289 design of profl 2019-04-30 14:21:22 +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
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
Timo Volkmann
65d3e77558 fixed some bugs and created data-store for current cache 2019-04-29 20:37:30 +02:00
rchrist
51b9587410 started logical implementation of profile and team 2019-04-29 19:51:12 +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