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
..
Cache.vue	reworked cache creation	2019-04-30 02:00:38 +02:00
CacheEnd.vue	CacheEnd now shows reward correctly	2019-04-29 22:17:58 +02:00
CacheStart.vue	fixed git problems	2019-04-29 21:51:33 +02:00
Error404.vue	continued work on Cache and Station	2019-04-08 14:46:37 +02:00
Index.vue	adopted changes from kathy, some changes and implemented api/allCaches, api/login	2019-03-27 19:21:43 +01:00
Login.vue	Merge branch 'develop' into frontend/timo; weird merge conflicts	2019-04-30 15:39:50 +02:00
Overview.vue	reworked cache creation	2019-04-30 02:00:38 +02:00
Profile.vue	Merge branch 'develop' into frontend/timo; weird merge conflicts	2019-04-30 15:39:50 +02:00
qr-scanner.vue	fixed cache process	2019-04-29 21:34:26 +02:00
ranking.vue	updated error handling to see the difference between request errors, response errors and other ones	2019-04-18 22:03:23 +02:00
Register.vue	fixed git problems	2019-04-29 21:51:33 +02:00
StationEdit.vue	reworked cache creation	2019-04-30 02:00:38 +02:00
StationEndEdit.vue	changes for cache creation	2019-04-25 12:08:03 +02:00
StationView.vue	fixed bugs in cache creation and processing	2019-04-30 15:30:50 +02:00