Commit Graph

446 Commits

Author SHA1 Message Date
aa68e748dd Merged in bugfix/MAPG-99-fix-redirect-bug (pull request #78)
MAPG-99 use HTTP_HOST instead of SERVER_NAME to prevent wrong redirection
2020-06-01 20:45:14 +00:00
637ed5d0ac MAPG-99 use HTTP_HOST instead of SERVER_NAME to prevent wrong redirection 2020-06-01 22:44:44 +02:00
b4de510a65 Merged in feature/MAPG-97-integrate-leaflet (pull request #77)
MAPG-97 switch off motion tracking in map editor
2020-06-01 20:07:39 +00:00
c51c023357 MAPG-97 switch off motion tracking in map editor 2020-06-01 22:07:13 +02:00
150bc5be20 Merged in feature/MAPG-97-integrate-leaflet (pull request #75)
Feature/MAPG-97 integrate leaflet
2020-06-01 20:01:33 +00:00
9085793c9f MAPG-97 add initial map editor with Leaflet (works as map viewer now) 2020-06-01 21:56:57 +02:00
a82b27cb90 MAPG-97 add Leaflet 2020-06-01 21:56:57 +02:00
f7d37b8513 MAPG-97 add and use new markers 2020-06-01 21:56:57 +02:00
b823af1f7d MAPG-97 make better split up of JSs, CSSs, SVGs, templates 2020-06-01 21:56:57 +02:00
601598367e Merged in master (pull request #76)
MAPG-88 fix js file name in minifier
2020-06-01 19:53:01 +00:00
ebda08095b Merged in develop (pull request #74)
Develop
2020-05-31 19:56:46 +00:00
9e9ada9478 Merged in feature/MAPG-86-make-routing-better (pull request #73)
Feature/MAPG-86 make routing better
2020-05-31 19:02:17 +00:00
665eb7e4d1 MAPG-86 adapt URLs in HTML and JS 2020-05-31 21:00:23 +02:00
28464fc4ac MAPG-86 add 404 error page 2020-05-31 21:00:23 +02:00
b2eabfb9b8 MAPG-86 adapt index.php to the new routing structure 2020-05-31 21:00:23 +02:00
44db217e8b MAPG-86 add home controller (only redirects now) 2020-05-31 21:00:23 +02:00
927b34956f MAPG-86 adapt controller classes to the new controller structure 2020-05-31 21:00:23 +02:00
88fe7b7a03 MAPG-86 refactor view-controller 2020-05-31 21:00:23 +02:00
b0b244712f MAPG-86 add RouteCollection to global Container 2020-05-31 21:00:23 +02:00
6835db5e1f MAPG-86 add classes for routing 2020-05-31 21:00:23 +02:00
7a924c5257 Merged in feature/MAPG-92-use-nginx-instead-of-apache-in-docker (pull request #71)
MAPG-92 use Nginx instead of Apache in Docker environment
2020-05-31 12:47:59 +00:00
6115dc7bc6 MAPG-92 use Nginx instead of Apache in Docker environment 2020-05-31 14:41:53 +02:00
02c258d1c0 Merged in develop (pull request #70)
MAPG-90 disable unload prevention and unify onbeforeunload script (loading animation)
2020-05-31 01:51:13 +00:00
0ca7ea75b2 Merged in feature/MAPG-90-switch-off-unload-prevention (pull request #69)
MAPG-90 disable unload prevention and unify onbeforeunload script (loading animation)
2020-05-31 01:50:50 +00:00
fe095cf435 MAPG-90 disable unload prevention and unify onbeforeunload script (loading animation) 2020-05-31 03:50:06 +02:00
65a6099a96 Merged in develop (pull request #68)
Develop
2020-05-30 22:38:43 +00:00
098f34ca0a Merged in feature/MAPG-82-create-html-template (pull request #67)
MAPG-82 introduce very basic templating
2020-05-30 22:24:56 +00:00
9a4d9435d9 MAPG-82 introduce very basic templating 2020-05-31 00:21:29 +02:00
2a14be7c3a Merged in feature/MAPG-81-create-favicon (pull request #66)
Feature/MAPG-81 create favicon
2020-05-30 21:22:22 +00:00
ea272582eb MAPG-81 modify Bootstrap Icon copyright not to be in generated code 2020-05-30 23:19:10 +02:00
2e2524474f MAPG-81 add favicons 2020-05-30 23:18:05 +02:00
82fa4e1c5f MAPG-81 update .gitattributes to store PNG files with Git LFS 2020-05-30 23:16:31 +02:00
c61121f63d Merged in hotfix/MAPG-88-fix-the-name-of-the-js-in-minifi (pull request #65)
MAPG-88 fix js file name in minifier
2020-05-30 18:51:47 +00:00
c615f00d03 MAPG-88 fix js file name in minifier 2020-05-30 20:51:15 +02:00
74dd30178d Merged in develop (pull request #64)
Develop
2020-05-30 18:48:47 +00:00
2d088f1108 Merged in feature/MAPG-83-format-map-area-value-more-properly (pull request #63)
MAPG-83 format area value with decimal separator and superscript in unit
2020-05-30 18:41:24 +00:00
77238a6ead MAPG-83 format area value with decimal separator and superscript in unit 2020-05-30 20:40:47 +02:00
4f422b2b29 Merged in feature/MAPG-64-create-cover-div-over-panorama (pull request #62)
MAPG-64 create cover div when user should not click on the pano or guess map
2020-05-30 18:14:08 +00:00
88a1d5ab8e MAPG-64 create cover div when user should not click on the pano or guess map
add loading animation to maps page too
CSS fixes
2020-05-30 20:13:00 +02:00
8a433abe9f Merged in bugfix/MAPG-85-fix-map-divs-width-on-mobile (pull request #61)
MAPG-85 make static map's width mobile friendly
2020-05-30 17:12:09 +00:00
b9a36e5ccf MAPG-85 make static map's width mobile friendly
further style improvements on map selection page
2020-05-30 19:11:38 +02:00
5bc2d73ceb Merged in feature/MAPG-72-revision-of-the-confirmation (pull request #60)
MAPG-72 prevent to show 'beforeonload' confirmation panel if we already have the real position (guess is evaluated)
2020-05-30 16:15:40 +00:00
1e7b106689 MAPG-72 prevent to show 'beforeonload' confirmation panel if we already have the real position (guess is evaluated) 2020-05-30 18:14:50 +02:00
136d4fe655 Merged in bugfix/MAPG-71-guess-button-stays-disabled (pull request #59)
MAPG-71 remove guessMarker from map when resetting the game
2020-05-30 16:06:00 +00:00
5ff42b0849 MAPG-71 remove guessMarker from map when resetting the game 2020-05-30 18:05:22 +02:00
a27aece4fa Merged in feature/MAPG-73-implement-map-selection (pull request #58)
Feature/MAPG-73 implement map selection
2020-05-30 15:43:05 +00:00
8afcde393f MAPG-73 show header with link on the gaming screen
move round info to the new header
2020-05-30 17:39:45 +02:00
c773240512 MAPG-73 add license of Boostrap Icons 2020-05-30 17:39:45 +02:00
9ffedf6030 MAPG-73 introduce map selection
unify CSS
2020-05-30 17:39:45 +02:00
92c35a2087 MAPG-73 pass mapId to GameController and PositionController
adapt JS to send mapId
make separate JS for the game
2020-05-30 15:33:28 +02:00