Commit Graph

585 Commits

Author SHA1 Message Date
Michael
623c1c7ab0 logout returns a boolean now which indicates that the logout worked out 2019-03-28 15:46:18 +01:00
Michael
67216233f9 Merge branch 'develop' into backend/michael 2019-03-28 14:55:54 +01:00
Michael
5c9cfc08fe removed default parameter 2019-03-28 14:53:03 +01:00
Michael
0d6f765367 api methods use the user token instead of the userID now, also added a logout apit method 2019-03-28 14:51:45 +01:00
Michael
ab1c6899d6 a cache has a startStation now 2019-03-28 14:50:52 +01:00
Katharina Will
6233d89802 Merge branch 'frontend/kathy' into develop 2019-03-27 19:51:39 +01:00
Timo Volkmann
67d6ad1b6b adopted changes from kathy, some changes and implemented api/allCaches, api/login 2019-03-27 19:21:43 +01:00
Katharina Will
0c74d23195 Modified layout on index and mylayout 2019-03-27 13:46:34 +01:00
Katharina Will
545b3ffeff enhanced layout for cacheview and index 2019-03-27 12:53:45 +01:00
Timo Volkmann
53dfb2a90a some fixes 2019-03-27 10:24:53 +01:00
Timo Volkmann
e6dd3b33b9 Merge branch 'develop' into frontend/timo 2019-03-27 10:15:53 +01:00
Timo Volkmann
a36c3f7469 pt. 2 2019-03-27 01:30:10 +01:00
Michael
bf7f178d17 Merge branch 'develop' into backend/michael 2019-03-26 22:33:34 +01:00
Michael
98e501c7b0 station has a field for a solution to a possible question now, also added some testdata 2019-03-26 22:33:21 +01:00
Timo Volkmann
76d42d30ef header und cache overview 2019-03-26 22:26:23 +01:00
Maximilian Leopold
6c72dacb20 Console now shows executed SQL Statements 2019-03-26 14:33:01 +01:00
Timo Volkmann
907d344a26 added error dialog 2019-03-26 13:18:56 +01:00
Timo Volkmann
3527b681be Merge branch 'develop' into frontend/timo 2019-03-26 01:53:56 +01:00
Timo Volkmann
ab4a642619 login implemented and wired 2019-03-25 22:39:41 +01:00
Michael
d5ca26bbd3 startCache wurde aufgrund des neuen Attributs station in der bearbeitet-Tabelle überarbeitet 2019-03-25 21:51:00 +01:00
Michael
161d29f248 bearbeitet tabelle trackt nun die station, bis zu der ein user innerhalb eines caches gekommen ist 2019-03-25 21:49:37 +01:00
Michael
8bcaab5bff Station hat nun ein Feld für den code 2019-03-25 21:48:13 +01:00
Michael
2db55ac35d stationen haben nun eine reihenfolge innerhalb eines caches 2019-03-25 21:47:46 +01:00
Timo Volkmann
d7db6fd056 Merge branch 'develop' into frontend/timo 2019-03-25 19:34:37 +01:00
Timo Volkmann
9110c581ca uncached .idea/ 2019-03-25 19:33:43 +01:00
Timo Volkmann
7db636b01a some changes 2019-03-25 19:22:48 +01:00
Katharina Will
aa6d2c31fa Merge branch 'frontend/kathy' into develop 2019-03-25 18:31:16 +01:00
Katharina Will
fdeab95b3d deleted files for fixes 2019-03-25 17:32:50 +01:00
Maximilian Leopold
251f5c3f25 @RequestBody hinzugefügt beim login 2019-03-25 17:22:58 +01:00
Maximilian Leopold
211b7279b5 Login is now possible 2019-03-25 15:56:45 +01:00
Katharina Will
d5e3bfc566 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-03-25 13:21:21 +01:00
Katharina Will
e0ee65f16d Deleted .idea/ files 2019-03-25 13:17:21 +01:00
Maximilian Leopold
d06b2aacc1 Deleted idea files 2019-03-25 13:17:11 +01:00
Michael
f031ae9a91 mapping is done with /api beforehand now 2019-03-25 13:14:54 +01:00
Maximilian Leopold
22bf31bfe8 Merge branch 'develop' into backend/max 2019-03-24 15:11:19 +01:00
Maximilian Leopold
d377594720 Implemented Login 2019-03-24 15:09:28 +01:00
Timo Volkmann
3721b4986c Merge branch 'frontend/kathy' into frontend/timo
# Conflicts:
#	frontend/quasar.conf.js
#	frontend/src/router/routes.js
2019-03-24 12:44:48 +01:00
Michael
8803f4419a startCache throws an IllegalParameterExcpetion if the method gets called with illegal parameters 2019-03-24 06:31:35 +01:00
Michael
920a34920e removed cacheAccesDefinition as a parameter 2019-03-24 00:24:04 +01:00
Michael
5b6fe52a04 added a isPresent() check and unregistered users are able start a cache now 2019-03-24 00:16:01 +01:00
Michael
07010e9899 Merge branch 'backend/michael' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into backend/michael 2019-03-23 19:24:01 +01:00
Michael
033682ada1 bearbeitet uses objects foreign keys now 2019-03-23 19:23:39 +01:00
Maximilian Leopold
c124d77f32 Changed intellij files... 2019-03-23 19:22:24 +01:00
Michael
99f8a26c9f added a first implementation for /startCache 2019-03-23 19:08:02 +01:00
Michael
4ed03b2f3f renamned bearbeitet to Bearbeitet 2019-03-23 19:07:40 +01:00
Michael
0ef66cc48f removed unneeded annotations 2019-03-23 18:22:42 +01:00
Timo Volkmann
b75f4d65e3 changed quasar dev port to 8081 and therefor added CORS policy to controller. tested allcaches api 2019-03-23 17:52:36 +01:00
Timo Volkmann
42e6d72fc3 changed quasar dev port to 8081 and therefor added CORS policy to controller. tested allcaches api 2019-03-23 17:52:19 +01:00
Michael
ffca748e93 changed the type of the IDs inside bearbeitet to the correct type 2019-03-23 17:49:57 +01:00
Michael
f7ea304d40 added remaining entity classes/repositories 2019-03-23 17:45:22 +01:00