Commit Graph

552 Commits

Author SHA1 Message Date
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
1d3bd11331 Changed get my Station POIS Method 2019-05-08 14:19:04 +02:00
Maximilian Leopold
2c7d47e0f0 Fixed Delete Cache Method 2019-05-08 14:04:50 +02:00
Maximilian Leopold
99499feb12 Spring application fixed 2019-05-08 13:13:31 +02:00
Timo Volkmann
62098b11b5 Merge branch 'frontend/timo' into develop 2019-05-08 12:20:48 +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
04f5a4d20b Merge branch 'frontend/timo' into develop 2019-05-07 22:58:24 +02:00
Timo Volkmann
b8ecb2a93b Merge branch 'develop' into frontend/timo 2019-05-07 22:57:59 +02:00
Timo Volkmann
21fc559a4b bugfixes 2019-05-07 22:57:30 +02:00
Maximilian Leopold
4783f8e7c8 Fixed Team Ranking List Call 2019-05-07 18:41:45 +02:00
Michael
45d84db362 adjusted the categoryIDs again 2019-05-07 17:54:25 +02:00
Michael
d32d8ca3ea adjusted categoryID values for POIS 2019-05-07 17:45:28 +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
Timo Volkmann
44aa93338d Merge branch 'develop' into frontend/timo 2019-05-07 09:25:33 +02:00
rchrist
20dfcd6ceb some work on api calls of profile and team 2019-05-06 20:19:45 +02:00
rchrist
c99b929076 Merge branch 'develop' into frontend/robin 2019-05-06 17:46:49 +02:00
rchrist
52b04a90a2 some work at profile component 2019-05-06 17:46:26 +02:00
Katharina Will
4bd210ab73 Merge branch 'develop' into frontend/kathy 2019-05-06 16:08:23 +02:00
Maximilian Leopold
51e87c239a Added getTeamOfUser 2019-05-06 15:49:54 +02:00
rchrist
e76581f128 Merge branch 'develop' into frontend/robin 2019-05-06 14:24:42 +02:00
Maximilian Leopold
ef819e5e54 Usermanagement fixed 2019-05-06 13:53:42 +02:00
Michael
68098b1fff fixed a spelling mistake 2019-05-03 19:18:47 +02:00
Michael
ed3fb3ff0e renamed to getMyStationPOIS 2019-05-03 19:13:21 +02:00
Michael
6ca87f84fc implemented getStationPOIS 2019-05-03 19:10:03 +02:00
Michael
c86ce22d27 renamed the helper class 2019-05-03 18:48:02 +02:00
Michael
3cc9fd5597 added StationPOI helper class 2019-05-03 18:43:09 +02:00
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