Commit Graph

852 Commits

Author SHA1 Message Date
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
7129459d72 Merged in develop (pull request #57)
Develop
2020-05-29 23:59:45 +00:00
1ca023e612 Merged in feature/MAPG-79-replace-the-non-free-svg (pull request #56)
Feature/MAPG-79 replace the non free svg
2020-05-29 23:55:08 +00:00
675dd7cd07 MAPG-78 [fix] add missing return types to some methods 2020-05-30 01:53:39 +02:00
d55caefda0 MAPG-78 use svgo instead of html-minifier 2020-05-30 01:53:39 +02:00
f4e9930093 MAPG-78 replace loading SVG to an own version 2020-05-30 01:53:39 +02:00
7ac7694fc6 Merged in feature/MAPG-78-change-license-to-agpl (pull request #55)
MAPG-78 change license to AGPL and include the license
2020-05-29 23:43:01 +00:00
d5a17e1050 MAPG-78 change license to AGPL and include the license 2020-05-30 01:42:14 +02:00
647f5a1392 Merged in feature/MAPG-43-workout-concept-for-handling-db (pull request #54)
Feature/MAPG-43 workout concept for handling db
2020-05-28 22:21:29 +00:00
81d2c9e3fb MAPG-43 rewrite controllers to use the new http classes 2020-05-29 00:12:35 +02:00
a33244fb56 MAPG-43 rewrite controllers to use the new DB classes 2020-05-29 00:12:35 +02:00
5a41348cc3 MAPG-43 connect to MySQL database in main.php 2020-05-29 00:12:35 +02:00
d1c28e2d91 MAPG-43 add classes to handle http queries
remove romanpitak/php-rest-client from composer.json
2020-05-29 00:12:35 +02:00
5738be5c98 MAPG-43 move existing interfaces into separate namespace 2020-05-28 21:07:59 +02:00
17c0ec73df MAPG-43 initial classes for DB handling 2020-05-28 21:07:59 +02:00
46c9819502 Merged in develop (pull request #53)
Develop
2020-05-26 21:35:18 +00:00
b821d4a045 Merged in master (pull request #52)
MAPG-65 create variable so it can be a reference
2020-05-26 21:27:15 +00:00
2bb0d33ae3 Merged in feature/MAPG-67-handle-expiring-session (pull request #51)
Feature/MAPG-67 handle expiring session
2020-05-26 21:26:40 +00:00
a3665c5a6a MAPG-67 make it possible to reset the game on error in JS
refactor JS to make round and game resetting unified
2020-05-26 23:25:21 +02:00
6f8f2cf9cf MAPG-67 make GameController able to return JSON response 2020-05-26 23:19:23 +02:00
9582c93ec1 Merged in hotfix/MAPG-65-fix-php-error (pull request #50)
MAPG-65 create variable so it can be a reference
2020-05-26 19:44:25 +00:00
59b93e0078 MAPG-65 create variable so it can be a reference 2020-05-26 21:27:15 +02:00
98f975bf91 Merged in develop (pull request #49)
Develop
2020-05-25 19:05:28 +00:00
7633f793d6 Merged in feature/MAPG-47-install-composer-packages-at-update (pull request #48)
MAPG-47 install Composer packages at update
2020-05-25 18:13:59 +00:00
eef7f03166 MAPG-47 install Composer packages at update 2020-05-25 20:13:07 +02:00
ebebff2c02 Merged in feature/MAPG-47-store-session-on-server-side (pull request #47)
Feature/MAPG-47 store session on server side
2020-05-25 18:08:07 +00:00
5e068e0aed MAPG-47 refactor JS to be adapted to the new PositionController 2020-05-25 19:51:02 +02:00
72a79d4267 MAPG-47 introduce PositionController which replaces GetNewPosition and also calculates results 2020-05-25 19:46:31 +02:00
567238c979 MAPG-47 refactor GameController and its view 2020-05-25 19:14:49 +02:00
8eb3dcf2e2 MAPG-47 add toArray() method to Bounds 2020-05-25 18:54:37 +02:00
55d5cad40a MAPG-47 add GOOGLE_MAPS_SERVER_API_KEY to .env.example 2020-05-25 18:53:01 +02:00
e56361274c MAPG-47 start server-side session 2020-05-25 18:52:42 +02:00
2d22d14817 MAPG-47 make possible to pass GET parameters to URL 2020-05-25 18:52:31 +02:00
41e8564872 MAPG-47 install romanpitak/php-rest-client 2020-05-25 18:51:44 +02:00
e9f4de99e7 MAPG-47 add php-curl to Dockerfile 2020-05-25 18:51:15 +02:00
7037bad313 Merged in develop (pull request #46)
MAPG-63 query only outdoor panos from StreetViewService
2020-05-24 20:05:21 +00:00
a36428f54d Merged in feature/MAPG-63-show-only-outdoor-panos (pull request #45)
MAPG-63 query only outdoor panos from StreetViewService
2020-05-24 16:02:34 +00:00
46abd1fb63 MAPG-63 query only outdoor panos from StreetViewService 2020-05-24 17:59:26 +02:00
c9c23e912f Merged in develop (pull request #44)
Develop
2020-05-24 13:46:59 +00:00
4dbb8a7cba Merged in feature/MAPG-62-minify-svg-after-deployment (pull request #43)
Feature/MAPG-62 minify svg after deployment
2020-05-24 13:44:00 +00:00
334038dc97 MAPG-62 add html-minifier to Dockerfile 2020-05-24 15:43:22 +02:00
0b7012b4d2 MAPG-62 minify SVG files with html-minifier
put minify calls into separate sh script
2020-05-24 15:42:29 +02:00
0c97d0301d Merged in bugfix/MAPG-59-avoid-overlapping-markers-on-summary (pull request #42)
MAPG-59 fix overlapping markers
2020-05-24 13:01:43 +00:00
a6541d1152 MAPG-59 fix overlapping markers
- real markers are always over guess markers
- latest marker is always over the old marker in real/guess group
2020-05-24 15:00:58 +02:00
b32cfacdad Merged in feature/MAPG-61-prevent-leaving-page-accidentall (pull request #41)
MAPG-61 add onbeforeunload function to prevent accidental leave
2020-05-24 12:47:48 +00:00