Commit Graph

710 Commits

Author SHA1 Message Date
1075533b3c
MAPG-238 include view with @include 2021-05-11 19:33:13 +02:00
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
54bc9c31db
MAPG-143 make it possible to disable game for guests (default is disable) 2021-05-10 19:10:09 +02:00
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
All checks were successful
default-pipeline default-pipeline #204
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/45
2021-05-09 17:22:13 +02:00
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
All checks were successful
default-pipeline default-pipeline #203
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/44
2021-05-09 17:21:46 +02:00
6cb9e17ddf
Merge pull request 'give example for LEAFLET_TILESERVER_ATTRIBUTION' (#46) from feature/extend-leaflet-env-examples into develop
All checks were successful
default-pipeline default-pipeline #202
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/46
2021-05-09 17:17:18 +02:00
88ad6e9d61
give example for LEAFLET_TILESERVER_ATTRIBUTION
All checks were successful
default-pipeline default-pipeline #197
2021-05-09 17:11:51 +02:00
2fb807c479
MAPG-229 make .controlItem relative so it's children can be sized more properly
All checks were successful
default-pipeline default-pipeline #196
2021-05-09 16:15:29 +02:00
8e9e5b08f9
MAPG-230 renew session cookie if it already exists
All checks were successful
default-pipeline default-pipeline #194
2021-05-09 15:49:27 +02:00
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
All checks were successful
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
71c728d56c reverted removal of preference for outdoor panorama in the front end
All checks were successful
default-pipeline default-pipeline #190
2021-05-09 11:46:03 +02:00
216d30329f Merge pull request 'feature/avoid-repeating-places-in-game' (#38) from feature/avoid-repeating-places-in-game into develop
All checks were successful
default-pipeline default-pipeline #189
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/38
Reviewed-by: Pőcze Bence <bence@pocze.ch>
2021-05-09 10:58:53 +02:00
3f8311d708 implemented review findings
All checks were successful
default-pipeline default-pipeline #188
2021-05-08 23:37:36 +02:00
7f8c1eb291 Merge pull request 'added error handling when requesting to join non existing room' (#41) from bugfix/unhandled-error-when-trying-to-join-non-existing-room into develop
All checks were successful
default-pipeline default-pipeline #187
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/41
Reviewed-by: Pőcze Bence <bence@pocze.ch>
2021-05-08 20:59:29 +02:00
d57a4c63e0 Merge pull request 'check the user type if it has valid value' (#40) from bugfix/cli-user-creation-crashes-when-no-type-is-given into develop
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/40
Reviewed-by: Pőcze Bence <bence@pocze.ch>
2021-05-08 20:59:09 +02:00
ed8e1773c4 Merge pull request 'allow error string to be null in case the password was correct' (#39) from bugfix/account-cannot-be-deleted into develop
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/39
Reviewed-by: Pőcze Bence <bence@pocze.ch>
2021-05-08 20:57:37 +02:00
2963bfe739 Merge pull request 'added leaflet subdomains to the environment variables, which are used now for initializing a leaflet map' (#42) from feature/leaflet-subdomains-in-environment-variables into develop
All checks were successful
default-pipeline default-pipeline #184
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/42
Reviewed-by: Pőcze Bence <bence@pocze.ch>
2021-05-08 20:57:07 +02:00
7232b322ab extended readme
All checks were successful
default-pipeline default-pipeline #183
2021-05-08 18:30:37 +02:00
e6819b6dd3 added leaflet subdomains to the environment variables, which are used now for initializing a leaflet map
All checks were successful
default-pipeline default-pipeline #182
2021-05-08 18:20:54 +02:00
01a4fdf5e5 added error handling when requesting to join non existing room
All checks were successful
default-pipeline default-pipeline #181
2021-05-08 18:03:17 +02:00
1cc3294ee7 check the user type if it has valid value
All checks were successful
default-pipeline default-pipeline #180
2021-05-08 16:19:49 +02:00
ad0b8d078f allow error string to be null in case the password was correct
All checks were successful
default-pipeline default-pipeline #178
2021-05-08 09:34:34 +02:00
899817a853 removed unnecessary comment
All checks were successful
default-pipeline default-pipeline #177
2021-05-06 20:41:23 +02:00
c626e36bbb specified explicit type in function parameter
All checks were successful
default-pipeline default-pipeline #176
2021-05-06 20:39:00 +02:00
8d8074977b fixing comments
All checks were successful
default-pipeline default-pipeline #175
2021-05-06 20:25:48 +02:00
8b3c95bdc7 handling of deleting places or user updated
All checks were successful
default-pipeline default-pipeline #174
2021-05-06 20:09:05 +02:00
b2535ad78a refactored function and variable names, and replaced variables in inner scope
All checks were successful
default-pipeline default-pipeline #173
2021-05-06 17:12:18 +02:00
886bd02f88 removed mistakenly added parameter
All checks were successful
default-pipeline default-pipeline #172
2021-05-06 10:09:28 +02:00
7143c7ec63 moved saving to UserPlayedPlace to seperate function
Some checks failed
default-pipeline default-pipeline #171
2021-05-06 10:05:23 +02:00
fb7c0e7a5c renamed the random int generator function
All checks were successful
default-pipeline default-pipeline #170
2021-05-06 09:36:49 +02:00
8136273b33 replaced left join with inner join for older places search
All checks were successful
default-pipeline default-pipeline #169
2021-05-05 21:58:19 +02:00
3c6a7a3c5f selection with preference for older places; refactored PlaceRepository 2021-05-05 21:50:23 +02:00
01f3c7c8cf added preference for places not seen by user in the selection of places for the game 2021-05-05 19:19:38 +02:00
66c871fbc2 Extended Select functionality with handling of derived tables 2021-05-05 19:18:07 +02:00
807b4d024f extended database with UserPlayedPlace table for tracking when and what place a User played in game 2021-05-05 19:16:54 +02:00
430b32d0c6
Merge pull request 'do not exclude indoor panoramas' (#37) from feature/pano-could-be-indoor into develop
All checks were successful
default-pipeline default-pipeline #179
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/37
2021-05-02 18:44:40 +02:00
11eee64895
do not exclude indoor panoramas
All checks were successful
default-pipeline default-pipeline #166
2021-05-02 18:38:29 +02:00
cc24f96395 Merge pull request 'radius calculation for new panorama search based on latitude and mercator projection for google maps' (#36) from feature/more-accurate-new-selection-in-mapeditor-on-google-maps into develop
All checks were successful
default-pipeline default-pipeline #165
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/36
Reviewed-by: Pőcze Bence <bence@pocze.ch>
2021-05-02 18:02:28 +02:00
c3e5a6db1c radius calculation for new panorama search based on latitude and mercator projection for google maps
All checks were successful
default-pipeline default-pipeline #164
2021-05-02 16:57:47 +02:00
398204c5d5
Merge pull request 'feature/place-streetview-cover-to-the-map' (#35) from feature/place-streetview-cover-to-the-map into develop
All checks were successful
default-pipeline default-pipeline #162
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/35
2021-05-02 16:27:41 +02:00
aaa5a1daba
Merge pull request 'bugfix/streetviewcontrol-is-still-visible' (#34) from bugfix/streetviewcontrol-is-still-visible into develop
All checks were successful
default-pipeline default-pipeline #161
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/34
2021-05-02 16:27:34 +02:00
c112a25409
move street view cover button to the map as circleControl
All checks were successful
default-pipeline default-pipeline #160
2021-05-02 15:04:14 +02:00
35cab17c21
make circle control items more general 2021-05-02 15:04:14 +02:00
f9c1829a00
enable zoomControl for Leaflet map to be consistent with Google map
All checks were successful
default-pipeline default-pipeline #157
2021-05-02 13:45:34 +02:00
e03850ce05
switch off streetViewControl explicitly 2021-05-02 13:42:46 +02:00
55ec226407 Merge pull request 'feature/google-maps-in-mapeditor-added' (#33) from feature/google-maps-in-mapeditor-added into develop
All checks were successful
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
6ef04fcd4e
fit both google and leaflet map to bounds if map already exists
All checks were successful
default-pipeline default-pipeline #154
2021-05-02 13:29:48 +02:00
3045d8acbb
remove builtin streetViewControl from google map 2021-05-02 13:13:11 +02:00
19a1b79b0a toggling of street view cover added
All checks were successful
default-pipeline default-pipeline #153
2021-05-02 12:56:25 +02:00
d432a5b584 cleaned up the comment 2021-05-02 12:34:57 +02:00