Commit Graph
100 Commits
Author SHA1 Message Date
bence de78084ad5 MAPG-243 delete classes which come from soko-web now 2023-04-07 20:26:52 +02:00
bence d30ec3a3a0 Merge pull request 'feature/MAPG-242-add-captcha-for-signup-and-password-reset' (!54) from feature/MAPG-242-add-captcha-for-signup-and-password-reset into develop
mapguesser/pipeline/head This commit looks good
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/54
2022-05-26 18:47:46 +02:00
bence cc19d454fa MAPG-242 add captcha validation for password reset
mapguesser/pipeline/pr-develop This commit looks good
2022-05-26 18:45:16 +02:00
bence 241d2f2b30 MAPG-242 add captcha validation for signup 2022-05-26 18:41:26 +02:00
bence d0751017db MAPG-242 add possibility to captcha validation 2022-05-26 18:39:33 +02:00
bence 6014e4517a Merge pull request 'MAPG-241 use class 'text' for text inputs' (!53) from bugfix/MAPG-241-fix-text-input-styles into develop
mapguesser/pipeline/head This commit looks good
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/53
2022-05-26 15:58:22 +02:00
bence 81a8153866 MAPG-241 use class 'text' for text inputs
mapguesser/pipeline/pr-develop This commit looks good
2022-05-26 15:55:45 +02:00
bence e435ef6be0 Merge pull request 'feature/MAPG-231-make-it-possible-to-create-unlisted-maps' (!52) from feature/MAPG-231-make-it-possible-to-create-unlisted-maps into develop
mapguesser/pipeline/head This commit looks good
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/52
2022-05-26 14:34:48 +02:00
bence 90528e61e5 MAPG-231 cleanup input styles
mapguesser/pipeline/pr-develop This commit looks good
2022-05-26 14:23:29 +02:00
bence d02aa4abe0 MAPG-231 introduce unlisted maps 2022-05-26 14:23:08 +02:00
bence 4f45e213c3 Merge pull request 'add badge for passing builds' (!51) from feature/add-badge-for-builds into develop
mapguesser/pipeline/head This commit looks good
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/51
2021-12-22 02:26:03 +01:00
bence d877d2fe03 add badge for passing builds
mapguesser/pipeline/head This commit looks good
mapguesser/pipeline/pr-develop This commit looks good
2021-12-22 02:21:22 +01:00
bence 66240c2d65 Merge pull request 'add Jenkinsfile and Dockerfile-test' (!50) from feature/add-jenkins-support into develop
mapguesser/pipeline/head This commit looks good
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/50
2021-12-22 02:14:44 +01:00
bence 0654b65940 add Jenkinsfile and Dockerfile-test
mapguesser/pipeline/pr-develop This commit looks good
default-pipeline default-pipeline #18
2021-12-22 01:59:31 +01:00
bence 272ec3568d Merge pull request 'bugfix/MAPG-240-fix-static-code-analysis-errors' (!49) from bugfix/MAPG-240-fix-static-code-analysis-errors into develop
default-pipeline default-pipeline #11
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/49
Reviewed-by: Balázs Vigh <balazs@vigh.eu>
2021-05-29 10:22:20 +02:00
bence be4a2038e5 MAPG-240 add use for PlaceInChallenge (used in MapAdminController::deleteChallenge)
default-pipeline default-pipeline #9
2021-05-29 00:57:59 +02:00
bence f305c97513 MAPG-240 UserInChallengeRepository::isUserParticipatingInChallenge should return bool 2021-05-29 00:56:43 +02:00
bence c02f595606 Merge pull request 'MAPG-143 make it possible to disable game for guests (default is disable)' (#47) from feature/MAPG-143-allow-game-only-for-users into develop
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/47
2021-05-11 18:29:55 +02:00
bence 54bc9c31db MAPG-143 make it possible to disable game for guests (default is disable) 2021-05-10 19:10:09 +02:00
bence 75bea7c05c Merge pull request 'MAPG-229 make .controlItem relative so it's children can be sized more properly' (#45) from bugfix/MAPG-229-circle-controls-won-t-show-up-in-firefox into develop
default-pipeline default-pipeline #204
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/45
2021-05-09 17:22:13 +02:00
bence 1c3238e64e Merge pull request 'MAPG-230 renew session cookie if it already exists' (#44) from bugfix/MAPG-230-session-s-cookie-is-not-renewed into develop
default-pipeline default-pipeline #203
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/44
2021-05-09 17:21:46 +02:00
bence 6cb9e17ddf Merge pull request 'give example for LEAFLET_TILESERVER_ATTRIBUTION' (#46) from feature/extend-leaflet-env-examples into develop
default-pipeline default-pipeline #202
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/46
2021-05-09 17:17:18 +02:00
bence 88ad6e9d61 give example for LEAFLET_TILESERVER_ATTRIBUTION
default-pipeline default-pipeline #197
2021-05-09 17:11:51 +02:00
bence 2fb807c479 MAPG-229 make .controlItem relative so it's children can be sized more properly
default-pipeline default-pipeline #196
2021-05-09 16:15:29 +02:00
bence 8e9e5b08f9 MAPG-230 renew session cookie if it already exists
default-pipeline default-pipeline #194
2021-05-09 15:49:27 +02:00
bence 94624d5b2c Merge pull request 'reverted removal of preference for outdoor panorama in the front end' (#43) from feature/preference-for-outdoor-panorama-in-the-frontend into develop
default-pipeline default-pipeline #195
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/43
Reviewed-by: Pőcze Bence <bence@pocze.ch>
2021-05-09 13:34:36 +02:00
bence 430b32d0c6 Merge pull request 'do not exclude indoor panoramas' (#37) from feature/pano-could-be-indoor into develop
default-pipeline default-pipeline #179
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/37
2021-05-02 18:44:40 +02:00
bence 11eee64895 do not exclude indoor panoramas
default-pipeline default-pipeline #166
2021-05-02 18:38:29 +02:00
bence 398204c5d5 Merge pull request 'feature/place-streetview-cover-to-the-map' (#35) from feature/place-streetview-cover-to-the-map into develop
default-pipeline default-pipeline #162
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/35
2021-05-02 16:27:41 +02:00
bence aaa5a1daba Merge pull request 'bugfix/streetviewcontrol-is-still-visible' (#34) from bugfix/streetviewcontrol-is-still-visible into develop
default-pipeline default-pipeline #161
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/34
2021-05-02 16:27:34 +02:00
bence c112a25409 move street view cover button to the map as circleControl
default-pipeline default-pipeline #160
2021-05-02 15:04:14 +02:00
bence 35cab17c21 make circle control items more general 2021-05-02 15:04:14 +02:00
bence f9c1829a00 enable zoomControl for Leaflet map to be consistent with Google map
default-pipeline default-pipeline #157
2021-05-02 13:45:34 +02:00
bence e03850ce05 switch off streetViewControl explicitly 2021-05-02 13:42:46 +02:00
bence 55ec226407 Merge pull request 'feature/google-maps-in-mapeditor-added' (#33) from feature/google-maps-in-mapeditor-added into develop
default-pipeline default-pipeline #155
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/33
Reviewed-by: Pőcze Bence <bence@pocze.ch>
2021-05-02 13:38:17 +02:00
bence 6ef04fcd4e fit both google and leaflet map to bounds if map already exists
default-pipeline default-pipeline #154
2021-05-02 13:29:48 +02:00
bence 3045d8acbb remove builtin streetViewControl from google map 2021-05-02 13:13:11 +02:00
bence f10ad37a74 Merge pull request 'update readme' (#32) from feature/update-readme into develop
default-pipeline default-pipeline #152
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/32
2021-04-29 20:03:19 +02:00
bence 70b60d2fb8 create the first user during installation in development mode 2021-04-29 20:02:00 +02:00
bence 7e68580db6 update readme 2021-04-29 20:01:42 +02:00
bence c09cce3c97 Merge pull request 'MAPG-167 set background color' (#31) from feature/MAPG-167-set-background-color into develop
default-pipeline default-pipeline #147
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/31
2021-04-29 18:46:26 +02:00
bence 276e331a47 MAPG-167 set background color
default-pipeline default-pipeline #146
2021-04-29 18:43:30 +02:00
bence 58cdc1be8d Merge pull request 'fix typo' (#29) from feature/modify-author into develop
default-pipeline default-pipeline #134
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/29
2021-04-29 00:58:57 +02:00
bence 4039202268 fix typo
default-pipeline default-pipeline #133
2021-04-29 00:58:20 +02:00
bence 4677cc5229 Merge pull request 'generalize author attribution' (#28) from feature/modify-author into develop
default-pipeline default-pipeline #131
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/28
2021-04-29 00:53:26 +02:00
bence 8800724aa9 generalize author attribution
default-pipeline default-pipeline #130
2021-04-29 00:52:46 +02:00
bence 0f810bd2ba Merge pull request 'feature/MAPG-228-deploy-signed-and-verified-tags-only' (#22) from feature/MAPG-228-deploy-signed-and-verified-tags-only into develop
default-pipeline default-pipeline #111
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/22
2021-04-25 15:16:46 +02:00
bence 9d1fc8b60c MAPG-228 prune local tags when fetching
default-pipeline default-pipeline #107
2021-04-25 15:11:49 +02:00
bence dd46fb3d32 MAPG-228 check if the Release* tag is signed and verified 2021-04-25 15:11:20 +02:00
bence 1a40e3a18d Merge pull request 'MAPG-226 change remaining time calculation' (#21) from feature/MAPG-226-change-timeout-algorithm into develop
default-pipeline default-pipeline #106
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/21
2021-04-10 19:00:20 +02:00
bence 1aa5d3b43e MAPG-226 change remaining time calculation 2021-04-10 18:59:27 +02:00
bence a418d5cf66 Merge pull request 'MAPG-213 move visibility workaround to Game.showResultMap' (#20) from bugfix/MAPG-213-result-map-not-show-on-mobile-after-reload into develop
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/20
2021-04-04 23:41:05 +02:00
bence 5cae286a5b MAPG-213 move visibility workaround to Game.showResultMap 2021-04-04 23:40:27 +02:00
bence c5d2591371 Merge pull request 'MAPG-223 send error if member already guessed' (#19) from feature/MAPG-223-user-should-not-be-able-to-guess-after-round-is-over into develop
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/19
2021-04-04 23:29:04 +02:00
bence cf59f937c9 MAPG-223 send error if member already guessed
default-pipeline default-pipeline #104
2021-04-04 23:28:44 +02:00
bence 257f59c96e Merge pull request 'MAPG-222 fixes: skip invalid guessPosition, hide showSummaryButton, handle countdown time if timeout is 0' (#18) from bugfix/MAPG-222-show-summary-can-be-clicked-when-game-is-restarted into develop
default-pipeline default-pipeline #98
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/18
2021-04-04 23:05:47 +02:00
bence c2f5806394 MAPG-222 fixes: skip invalid guessPosition, hide showSummaryButton, handle countdown time if timeout is 0
default-pipeline default-pipeline #96
2021-04-04 23:04:07 +02:00
bence ac0b71fe09 Merge pull request 'feature/MAPG-213-user-shouldn-t-be-able-to-re-guess-when-page-is-reloaded' (#17) from feature/MAPG-213-user-shouldn-t-be-able-to-re-guess-when-page-is-reloaded into develop
default-pipeline default-pipeline #94
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/17
2021-04-04 22:31:29 +02:00
bence 19f7b50002 MAPG-213 show results immediately if user already guessed
default-pipeline default-pipeline #91
2021-04-04 22:24:40 +02:00
bence 6342bb1e79 MAPG-213 send round data at initialization if user guessed 2021-04-04 22:18:00 +02:00
bence 3abdb6910e MAPG-213 clean up init
default-pipeline default-pipeline #90
2021-04-04 20:52:28 +02:00
bence 7d2588f7cd Merge pull request 'feature/MAPG-219-disable-continue-if-timeout-is-not-reached' (#16) from feature/MAPG-219-disable-continue-if-timeout-is-not-reached into develop
default-pipeline default-pipeline #88
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/16
2021-04-04 19:23:08 +02:00
bence be40acdb2d MAPG-219 disable continue button until round is over
default-pipeline default-pipeline #84
2021-04-04 18:48:31 +02:00
bence a2f2080959 MAPG-219 send 'end_round' when all members are finished
default-pipeline default-pipeline #83
2021-04-04 17:43:37 +02:00
bence cc49c56075 Merge pull request 'feature/MAPG-205-set-timeout-in-multiplayer-rooms' (#15) from feature/MAPG-205-set-timeout-in-multiplayer-rooms into develop
default-pipeline default-pipeline #82
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/15
2021-04-04 14:22:59 +02:00
bence 69329b9f81 MAPG-205 show countdown time
default-pipeline default-pipeline #80
2021-04-04 14:22:10 +02:00
bence 20914b466e MAPG-205 add elements for showing countdown 2021-04-04 14:20:12 +02:00
bence 3630637ec1 MAPG-205 handle round timeout on frontend 2021-04-04 14:20:12 +02:00
bence 42224b074e MAPG-205 set timeout for rounds 2021-04-04 14:20:12 +02:00
bence 0e8ed14305 MAPG-205 delete unnecessary empty lines 2021-04-03 23:39:20 +02:00
bence d3a12fb6f1 Merge pull request 'feature/MAPG-204-show-guesses-from-others' (#14) from feature/MAPG-204-show-guesses-from-others into develop
default-pipeline default-pipeline #76
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/14
2021-04-03 22:13:52 +02:00
bence 3f9d104adc MAPG-204 show guesses from others
default-pipeline default-pipeline #72
2021-04-03 22:10:21 +02:00
bence 9e5d20796c MAPG-204 clean up result sending 2021-04-03 18:24:43 +02:00
bence 7433813337 Merge pull request 'MAPG-208 error handling adaptations' (#13) from bugfix/MAPG-208-error-messages into develop
default-pipeline default-pipeline #75
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/13
2021-03-21 16:39:43 +01:00
bence 42854fe975 MAPG-208 error handling adaptations
default-pipeline default-pipeline #53
2021-03-21 14:37:08 +01:00
bence 71681f1e55 Merge pull request 'MAPG-207 don't use MapGuesser.showmodal for modal 'multi'' (#12) from bugfix/MAPG-207-prevent-closing-multi-modal into develop
default-pipeline default-pipeline #50
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/12
2021-03-21 12:47:35 +01:00
bence 1cf0ab44fd MAPG-207 don't use MapGuesser.showmodal for modal 'multi'
default-pipeline default-pipeline #49
2021-03-21 12:45:57 +01:00
bence fc9eb183f1 Merge pull request 'MAPG-203 fix wrong variable name' (#11) from bugfix/MAPG-203-fix-condition-in-js into develop
default-pipeline default-pipeline #46
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/11
2021-03-20 22:26:33 +01:00
bence d431a693fc MAPG-203 fix wrong variable name
default-pipeline default-pipeline #45
2021-03-20 22:24:47 +01:00
bence ace490b7e9 Merge pull request 'MAPG-203 use MULTI_WS_URL environment variable' (#10) from feature/MAPG-203-fine-tune-env-variables into develop
default-pipeline default-pipeline #43
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/10
2021-03-20 21:24:20 +01:00
bence e3771d36ce MAPG-203 use MULTI_WS_URL environment variable
default-pipeline default-pipeline #42
2021-03-20 21:21:40 +01:00
bence 6e03476173 Merge pull request 'bugfix/MAPG-203-fix-singleplayer' (#9) from bugfix/MAPG-203-fix-singleplayer into develop
default-pipeline default-pipeline #39
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/9
2021-03-20 21:00:14 +01:00
bence f3ec71d6dd MAPG-203 fix condition in game.js
default-pipeline default-pipeline #38
2021-03-20 20:59:10 +01:00
bence c2f0a1dd51 MAPG-203 fix signatures in GameController 2021-03-20 20:58:57 +01:00
bence a417fbd760 Merge pull request 'feature/MAPG-203-initial-multiplayer-implementation' (#8) from feature/MAPG-203-initial-multiplayer-implementation into develop
default-pipeline default-pipeline #37
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/8
2021-03-20 20:46:36 +01:00
bence a9cda56586 MAPG-203 install NPM packages on install and update
default-pipeline default-pipeline #36
2021-03-20 19:45:21 +01:00
bence 02fcbd2f9c MAPG-203 prepare GameFlowController for multiplayer 2021-03-20 19:45:21 +01:00
bence 2f665381c3 MAPG-203 prepare GameController for multiplayer 2021-03-20 19:45:21 +01:00
bence 573440868e MAPG-203 add new routes for multiplayer 2021-03-20 19:45:21 +01:00
bence 79490a0616 MAPG-203 add class for multiplayer internal connection (PHP-NodeJS TCP) 2021-03-20 19:45:21 +01:00
bence ed343f2359 MAPG-203 add new environment variables 2021-03-20 19:45:20 +01:00
bence 563f900423 MAPG-203 implement game mode selection UI 2021-03-20 19:45:20 +01:00
bence 24a10c534e MAPG-203 frontend adaptations for multiplayer 2021-03-20 19:44:48 +01:00
bence 0cbb7ba145 MAPG-203 add debugger config for NodeJS 2021-03-20 19:44:48 +01:00
bence 5dd2ce0d5a MAPG-203 add cleanup for multi_rooms to db:maintain 2021-03-20 19:44:48 +01:00
bence e5fb725c69 MAPG-203 add new table and model for multi_room 2021-03-20 19:44:48 +01:00
bence fc40c18679 MAPG-203 multiplayer handler server (NodeJS) 2021-03-20 19:44:48 +01:00
bence 4fabc39d44 MAPG-203 restructure Docker stack 2021-03-20 19:44:48 +01:00
bence 2120fbebbc MAPG-203 add Dockerfile for multiplayer (NodeJS) 2021-03-20 19:44:47 +01:00
bence b9f0529dce MAPG-203 add new Composer packages 2021-03-20 19:44:47 +01:00