Commit Graph

779 Commits

Author SHA1 Message Date
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
92408d6f02 MAPG-61 add onbeforeunload function to prevent accidental leave 2020-05-24 14:47:15 +02:00
830989dc4c Merged in master (pull request #40)
MAPG-60 fix JS syntax error
2020-05-24 12:12:12 +00:00
605149ab71 Merged in feature/MAPG-52-find-new-loading-animation (pull request #39)
MAPG-52 replace loading animation
2020-05-24 12:04:43 +00:00
4641aa81f8 MAPG-52 replace loading animation 2020-05-24 14:02:42 +02:00
9ef0a9ac79 Merged in hotfix/MAPG-60-fix-js-syntax-error (pull request #38)
MAPG-60 fix JS syntax error
2020-05-23 00:35:27 +00:00
1c0e423811 MAPG-60 fix JS syntax error 2020-05-23 02:35:01 +02:00
5006aae59a Merged in master (pull request #37)
MAPG-51 fix page overflow (showGuessButtonContainer is not absolute in non-mobile mode)
2020-05-23 00:19:31 +00:00
28aaaf1172 Merged in develop (pull request #36)
develop
2020-05-23 00:18:07 +00:00
df09dff48b Merged in feature/MAPG-58-make-result-info-fixed-height (pull request #35)
MAPG-58 make resultinfo fixed height and move out continue button
2020-05-23 00:09:08 +00:00
b2ac6d774b Merged in feature/MAPG-57-decrease-results-margin (pull request #34)
MAPG-57 decrease result's margin to minimal in case of low height
2020-05-23 00:08:41 +00:00
3285ce2a4f MAPG-58 make resultinfo fixed height and move out continue button 2020-05-23 02:07:50 +02:00
8fa8b501ed MAPG-57 decrease result's margin to minimal in case of low height 2020-05-23 01:34:40 +02:00
d6cafdeb06 Merged in feature/MAPG-54-show-round-and-score-continously (pull request #33)
MAPG-54 introduce round info - current round number and score
2020-05-22 23:26:48 +00:00
e8492994dd MAPG-54 introduce round info - current round number and score 2020-05-23 01:25:43 +02:00
4c850b30a4 Merged in feature/MAPG-55-mark-places-with-labels-on-summa (pull request #32)
Feature/MAPG-55 mark places with labels on summa
2020-05-22 21:57:41 +00:00
cb433ce822 MAPG-55 add title for real marker 2020-05-22 23:55:09 +02:00
5c309cd05f MAPG-55 set markers' z-index (real marker should always be over guess marker) 2020-05-22 23:50:14 +02:00
23b18a8e13 MAPG-55 set marker labels with round numbers 2020-05-22 23:45:31 +02:00
b7679254c7 Merged in bugfix/MAPG-53-fix-js-exception (pull request #31)
MAPG-53 check if Core.googleLink is not null before trying to modify it
2020-05-22 21:33:03 +00:00
e836a6b2b9 Merged in feature/MAPG-56-change-disabled-buttons-cursor (pull request #30)
MAPG-56 change disabled button's cursor to 'not-allowed'
2020-05-22 21:32:56 +00:00
94037dda31 MAPG-53 check if Core.googleLink is not null before trying to modify it 2020-05-22 23:32:17 +02:00
fd3cd5e673 MAPG-56 change disabled button's cursor to 'not-allowed' 2020-05-22 23:29:04 +02:00
4a1bb0fef6 Merged in feature/MAPG-20-make-it-work-with-1-map-instance (pull request #29)
Feature/MAPG-20 make it work with 1 map instance
2020-05-22 21:27:50 +00:00