Timo Volkmann
|
479173de84
|
changes for cache creation
|
2019-04-25 12:08:03 +02:00 |
|
Timo Volkmann
|
b4057e9c85
|
Merge branch 'frontend/kathy' into frontend/timo
# Conflicts:
# frontend/src/pages/CacheStart.vue
|
2019-04-25 10:27:29 +02:00 |
|
Timo Volkmann
|
3ed9a1bf21
|
implemented qr-code scanner in caching process
|
2019-04-25 10:22:28 +02:00 |
|
Katharina Will
|
11e84effa1
|
Added missing end-tags
|
2019-04-24 11:00:20 +02:00 |
|
Katharina Will
|
4b0063b852
|
Merge branch 'develop' into frontend/kathy
|
2019-04-24 10:11:33 +02:00 |
|
Katharina Will
|
582edef020
|
Minor changes to CacheEnd
|
2019-04-24 10:10:02 +02:00 |
|
Timo Volkmann
|
e412d4a797
|
updated frontend caching logic
|
2019-04-24 09:31:54 +02:00 |
|
Michael
|
73cd87765f
|
checkStation is a god now
|
2019-04-23 22:53:21 +02:00 |
|
Katharina Will
|
6f6fa8a0b0
|
Added error handling to CacheStart and implemented qr scanner as own page
|
2019-04-23 21:02:02 +02:00 |
|
rchrist
|
1427e4dcd2
|
Merge branch 'develop' into frontend/robin
|
2019-04-23 16:58:51 +02:00 |
|
rchrist
|
7a693d51f9
|
register page added
|
2019-04-23 16:58:22 +02:00 |
|
Katharina Will
|
75798eaaca
|
Merge branch 'develop' into frontend/kathy
|
2019-04-23 15:54:27 +02:00 |
|
Katharina Will
|
fe3070204d
|
Added functionality to start a Cache and view first station
|
2019-04-23 15:53:13 +02:00 |
|
Michael
|
7cfae18552
|
added another error message
|
2019-04-23 15:44:09 +02:00 |
|
Katharina Will
|
bfe303f277
|
Merge branch 'develop' into frontend/kathy
|
2019-04-23 14:56:44 +02:00 |
|
Katharina Will
|
30365d8db6
|
Modified cacheStart and cacheEnd
|
2019-04-23 14:55:34 +02:00 |
|
Michael
|
b0ee8a75f6
|
removed unneeded roles
|
2019-04-23 13:32:52 +02:00 |
|
Timo Volkmann
|
0ec3dbb0b1
|
qr-code scanner working
|
2019-04-22 22:43:58 +02:00 |
|
Maximilian Leopold
|
f244cf408b
|
Added Query to get Rankingplace of specific User
|
2019-04-22 14:15:47 +02:00 |
|
Katharina Will
|
6e53127fed
|
Added pages for starting and ending a cache
|
2019-04-21 20:40:31 +02:00 |
|
Maximilian Leopold
|
76c426b252
|
Rankinglist user now isnt dupkicate
|
2019-04-19 22:34:18 +02:00 |
|
Maximilian Leopold
|
a72d65a518
|
Merge branch 'frontend/robin' into backend/max
|
2019-04-19 18:53:04 +02:00 |
|
Maximilian Leopold
|
063b0a0816
|
Added config
|
2019-04-19 18:52:49 +02:00 |
|
rchrist
|
0173cb28c6
|
Merge branch 'develop' into frontend/robin
|
2019-04-19 18:03:31 +02:00 |
|
Timo Volkmann
|
de75a47c80
|
Merge branch 'frontend/timo' into develop
|
2019-04-18 22:42:43 +02:00 |
|
Timo Volkmann
|
79cfd4b280
|
fixed broken getMyCaches call in frontend
|
2019-04-18 22:37:44 +02:00 |
|
rchrist
|
c690c620e4
|
updated error handling to see the difference between request errors, response errors and other ones
|
2019-04-18 22:03:23 +02:00 |
|
rchrist
|
ddd21915c8
|
added first error dialogs w/o any error specification
|
2019-04-18 18:04:40 +02:00 |
|
Michael
|
deb50cad9c
|
a cache needs atleast 2 stations
|
2019-04-18 14:38:20 +02:00 |
|
Michael
|
48275e09f1
|
fixed a mistake
|
2019-04-18 14:21:10 +02:00 |
|
Michael
|
7d17277c46
|
fixed a bug in CacheConstrutctionUtil
|
2019-04-18 13:50:22 +02:00 |
|
Timo Volkmann
|
e1a10ed23d
|
Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop
|
2019-04-18 13:01:18 +02:00 |
|
Timo Volkmann
|
621978e08d
|
resolved merge conflict
|
2019-04-18 12:59:02 +02:00 |
|
Timo Volkmann
|
3611b49165
|
Merge branch 'develop' into frontend/timo
|
2019-04-18 12:58:43 +02:00 |
|
Michael
|
cfd520501e
|
changed response status
|
2019-04-18 12:53:57 +02:00 |
|
Timo Volkmann
|
da4bbdeeea
|
fixed login and admin evaluation
|
2019-04-18 12:51:57 +02:00 |
|
Maximilian Leopold
|
5aa9b9537a
|
Merge branch 'backend/max' into develop
|
2019-04-18 12:50:08 +02:00 |
|
Timo Volkmann
|
28be17404d
|
Merge branch 'develop' into frontend/timo
|
2019-04-18 12:49:53 +02:00 |
|
Maximilian Leopold
|
496c5fcb6b
|
Ready to deploy
|
2019-04-18 12:48:33 +02:00 |
|
Michael
|
ab119b5006
|
changed the rankingListQuery so it only shows user from the domain geocaching
|
2019-04-18 12:10:24 +02:00 |
|
Timo Volkmann
|
89ebb7a315
|
Merge branch 'develop' into frontend/timo
|
2019-04-18 11:45:16 +02:00 |
|
Michael
|
eaaa1fb2bb
|
fixed some bugs with FinderUtil
|
2019-04-18 00:31:31 +02:00 |
|
Timo Volkmann
|
71b0618ab2
|
Fixed login, several other fixes
|
2019-04-17 23:22:44 +02:00 |
|
Timo Volkmann
|
3110f40826
|
Merge branch 'develop' into frontend/timo
|
2019-04-17 23:02:59 +02:00 |
|
Michael
|
22ed8e41e2
|
- implemented the checkAdmin logic
- fixed a mistake in checkStation
- simplified some code and removed old unnecessary comments
|
2019-04-17 18:44:32 +02:00 |
|
Timo Volkmann
|
0850692f7f
|
Merge branch 'develop' into frontend/timo
|
2019-04-17 17:49:32 +02:00 |
|
Maximilian Leopold
|
0bc1855284
|
Changed Find User Methods so its matching to the user management
|
2019-04-17 15:02:42 +02:00 |
|
Maximilian Leopold
|
4b039cb198
|
Changed format of rankinglist
|
2019-04-17 14:47:12 +02:00 |
|
Maximilian Leopold
|
b9a975c101
|
Added helper class for rankinglist
|
2019-04-17 11:12:13 +02:00 |
|
Michael
|
da75fbb922
|
fixed a mistake
|
2019-04-17 08:36:52 +02:00 |
|