Commit Graph

163 Commits

Author SHA1 Message Date
Timo Volkmann
2fe73aebc9 cleaned repository 2019-04-11 12:17:30 +02:00
Maximilian Leopold
032c4e5d70 Merge branch 'frontend/robin' into develop 2019-04-11 12:01:10 +02:00
Maximilian Leopold
c0d6c1090e Changed iml files 2019-04-11 12:00:56 +02:00
Katharina Will
88505fb038 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-04-11 11:42:05 +02:00
Michael
16cae0ba90 fixed a bug with deleteCache 2019-04-11 03:20:17 +02:00
Michael
9828f88f7b a cache needs atleast 2 stations now(start and endstation) 2019-04-11 02:56:01 +02:00
Michael
1c602c1dab deleteCache deletes all stations related to taht cache now 2019-04-11 02:54:53 +02:00
rchrist
d810d782cb finished user story angefangene und abgeschlossene Caches ansehen 2019-04-11 00:52:27 +02:00
rchrist
46ac72ffa2 error 404 with api/getMyCaches 2019-04-10 16:52:05 +02:00
rchrist
2d024fc884 merge develop 2019-04-10 15:16:33 +02:00
rchrist
98da1b8094 local file structure changed 2019-04-10 15:11:29 +02:00
Timo Volkmann
1c7a34a735 Finished „create Cache/Station“
fixed Login and Frontend Usermanagement,
implemented delete Cache,
fixed some problems with store logic and router
2019-04-10 00:16:28 +02:00
Maximilian Leopold
1cd7e29fc1 Changed HTTP Respnse code 2019-04-09 16:54:19 +02:00
Maximilian Leopold
59103da8ac Changed responeentity json param. 2019-04-09 16:51:01 +02:00
Maximilian Leopold
283f56e02d There cant be two bearbeitet entities in the db featuring the same cache and user 2019-04-09 16:49:17 +02:00
Katharina Will
dc1d74a615 Merge branch 'develop' into frontend/kathy 2019-04-09 16:30:38 +02:00
Katharina Will
842ca6aa56 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-04-09 16:21:53 +02:00
Katharina Will
2bd3d36c14 rankinglist shows data from database 2019-04-09 16:20:07 +02:00
Maximilian Leopold
40661fb689 Build fail fixed 2019-04-09 16:01:48 +02:00
Timo Volkmann
2b6302bf81 Merge branch 'develop' into frontend/timo 2019-04-09 13:49:14 +02:00
Maximilian Leopold
d4a73ab436 Merged 2019-04-09 13:26:35 +02:00
Maximilian Leopold
14049730a4 Changed something, that previously worked without the anotation... 2019-04-09 13:24:33 +02:00
Timo Volkmann
2723c59056 changes in Cache & Station Editpages, worked on cacheCollector store 2019-04-09 03:41:05 +02:00
Katharina Will
7613fee705 Merge branch 'develop' into frontend/kathy 2019-04-08 14:50:27 +02:00
Katharina Will
5e5267afc8 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-04-08 14:50:07 +02:00
Katharina Will
941eba5e3d Added button to create new cache 2019-04-08 14:48:56 +02:00
Timo Volkmann
57e66dcc45 Merge branch 'develop' into frontend/timo 2019-04-08 14:46:46 +02:00
Timo Volkmann
560e90b760 continued work on Cache and Station 2019-04-08 14:46:37 +02:00
Maximilian Leopold
5145b203c4 Chaged format of RankingList JSON 2019-04-08 14:44:13 +02:00
Katharina Will
1c5aacab2b Merge branch 'develop' into frontend/kathy 2019-04-08 14:14:36 +02:00
Maximilian Leopold
629145b9c6 Komma vergessen 2019-04-08 14:14:11 +02:00
Katharina Will
dce98ffb86 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-04-08 14:14:08 +02:00
Maximilian Leopold
eb15f1fe35 Added id to rankinglist 2019-04-08 14:13:22 +02:00
Katharina Will
741f175cc2 Applied changes to layout 2019-04-08 14:04:09 +02:00
Katharina Will
ca0c21bf4d Merge branch 'develop' into frontend/kathy 2019-04-08 13:20:02 +02:00
Katharina Will
e5f8f23b18 Resolved conflicts 2019-04-08 13:18:19 +02:00
Katharina Will
74f664e2ba Implemented view of rankinglist 2019-04-08 13:09:16 +02:00
Michael
e86aa6adc2 removed stationReihenfolge database table, because its not needed 2019-04-07 14:06:41 +02:00
Maximilian Leopold
f28418a8ca Merged develop into max/backend 2019-04-06 16:16:13 +02:00
Maximilian Leopold
11d2b6165c Merged 2019-04-06 16:14:26 +02:00
Maximilian Leopold
d8780744a5 Implemented JWT 2019-04-06 16:10:01 +02:00
Maximilian Leopold
affd0a20f8 MErge Conflict 2019-04-06 12:39:45 +02:00
Maximilian Leopold
df13ac10c9 Merge branch 'backend/max' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into backend/max 2019-04-06 12:36:21 +02:00
Maximilian Leopold
e45bdb0456 Slight changes to jwt 2019-04-06 12:36:13 +02:00
Maximilian Leopold
9006272bff Merged 2019-04-06 12:30:00 +02:00
Maximilian Leopold
99512b4250 Implemented Login with JWT 2019-04-06 12:29:09 +02:00
Michael
3d78f0bc42 merge 2019-04-06 11:06:26 +02:00
Michael
99d29ffdec added comments 2019-04-05 15:45:53 +02:00
Michael
5bf05616c8 reworked checks to work with double instead of Double 2019-04-05 15:43:10 +02:00
Michael
6cf52503bc if a mistake occurs during cache creation, all previously created stations related to that cache get deleted now 2019-04-05 15:33:31 +02:00