|
|
6fb122e842
|
Merged in feature/MAPG-127-integrate-markerclustergroup (pull request #100)
Feature/MAPG-127 integrate markerclustergroup
|
2020-06-11 21:35:49 +00:00 |
|
|
|
90ccdf6de7
|
MAPG-127 cluster markers in map_editor
|
2020-06-11 23:23:28 +02:00 |
|
|
|
a869a55b7e
|
MAPG-127 load markercluster's CSS and JS in map_editor
|
2020-06-11 23:23:03 +02:00 |
|
|
|
420ed400a6
|
MAPG-127 add leaflet.markercluster to yarn dependencies
|
2020-06-11 23:22:26 +02:00 |
|
|
|
d6f34b916e
|
Merged in hotfix/MAPG-128-saving-a-new-map-does-not-work (pull request #99)
MAPG-128 set all default values when creating a new map
|
2020-06-11 08:34:52 +00:00 |
|
|
|
98fc735622
|
MAPG-128 set all default values when creating a new map
|
2020-06-11 10:33:59 +02:00 |
|
|
|
81a3079a1a
|
Merged in feature/MAPG-126-add-attribution-for-leaflet-map (pull request #98)
MAPG-126 add configurable attribution for Leaflet maps
|
2020-06-10 22:15:02 +00:00 |
|
|
|
a0d1e8778c
|
MAPG-126 add configurable attribution for Leaflet maps
|
2020-06-11 00:14:30 +02:00 |
|
|
|
2fc0ab557f
|
Merged in feature/MAPG-119-new-map-creation (pull request #97)
Feature/MAPG-119 new map creation
|
2020-06-10 21:59:49 +00:00 |
|
|
|
be8f0a1486
|
MAPG-119 fix distribution of the ids of the newly created places
|
2020-06-10 23:58:09 +02:00 |
|
|
|
ff201c2e8e
|
MAPG-119 add more area categories
|
2020-06-10 23:51:09 +02:00 |
|
|
|
805d91c0c0
|
MAPG-119 small fixes for game
|
2020-06-10 23:36:00 +02:00 |
|
|
|
ec7e806277
|
MAPG-119 'add new map' button and some desing improvements on maps page
|
2020-06-10 23:36:00 +02:00 |
|
|
|
947ce6b183
|
MAPG-119 view and JS adaptations for new map creation
|
2020-06-10 23:32:38 +02:00 |
|
|
|
6fc83c9459
|
MAPG-119 handle the case if no mapId is present when editing map
|
2020-06-10 23:32:37 +02:00 |
|
|
|
5237c3f454
|
MAPG-119 prevent endless loop for place selection
|
2020-06-10 23:12:30 +02:00 |
|
|
|
5a1c384c17
|
MAPG-119 fix maps query
|
2020-06-10 23:11:55 +02:00 |
|
|
|
3fb538469b
|
Merged in bugfix/MAPG-121-game-doesnt-work (pull request #96)
MAPG-121 fix wrong condition
|
2020-06-10 18:35:57 +00:00 |
|
|
|
04d10663dd
|
MAPG-121 fix wrong condition
|
2020-06-10 20:34:29 +02:00 |
|
|
|
f11cba4f10
|
Merged in bugfix/MAPG-120-fix-login-loading (pull request #95)
MAPG-120 don't hide the loading when user will be redirected
|
2020-06-10 18:23:11 +00:00 |
|
|
|
cfb0513825
|
Merged in bugfix/MAPG-117-map-selection-page (pull request #94)
MAPG-117 show the edit button only if user is admin
|
2020-06-10 18:22:51 +00:00 |
|
|
|
ed0e287c94
|
MAPG-120 don't hide the loading when user will be redirected
|
2020-06-10 20:22:01 +02:00 |
|
|
|
ad818af543
|
MAPG-117 show the edit button only if user is admin
|
2020-06-10 20:20:36 +02:00 |
|
|
|
2725754504
|
Merged in bugfix/MAPG-116-improve-loading-animation (pull request #93)
MAPG-116 don't show loading when no real link clicked
|
2020-06-09 22:41:25 +00:00 |
|
|
|
dc072bd3c0
|
Merged in bugfix/MAPG-41-create-place-administration (pull request #92)
MAPG-41 fix line ending replace
|
2020-06-09 22:41:10 +00:00 |
|
|
|
a70d59ed95
|
MAPG-116 don't show loading when no real link clicked
|
2020-06-10 00:40:47 +02:00 |
|
|
|
94cab9f433
|
MAPG-41 fix line ending replace
|
2020-06-10 00:33:11 +02:00 |
|
|
|
4b0057e3ba
|
Merged in feature/MAPG-117-map-selection-page (pull request #91)
MAPG-117 remove admin/maps and place a button to the maps page if admin is logged in
|
2020-06-09 22:31:40 +00:00 |
|
|
|
5a450c46db
|
MAPG-117 remove admin/maps and place a button to the maps page if admin is logged in
|
2020-06-10 00:30:29 +02:00 |
|
|
|
4af6f07ce1
|
Merged in feature/MAPG-116-improve-loading-animation (pull request #90)
MAPG-116 attach loading animation to anchors and not to beforeunload
|
2020-06-09 21:01:07 +00:00 |
|
|
|
5e28fcb64d
|
MAPG-116 attach loading animation to anchors and not to beforeunload
|
2020-06-09 23:00:07 +02:00 |
|
|
|
16bcbaecbe
|
Merged in feature/MAPG-103-map-editor-ui-elements (pull request #88)
Feature/MAPG-103 map editor ui elements
|
2020-06-09 19:40:33 +00:00 |
|
|
|
fbab712496
|
MAPG-103 save map metadata
|
2020-06-09 21:29:51 +02:00 |
|
|
|
46ef7f3b3b
|
MAPG-103 unify some styles and show map name in the header
|
2020-06-09 21:29:51 +02:00 |
|
|
|
5dd877d075
|
MAPG-103 implement saving the modified map on server side
|
2020-06-09 21:29:51 +02:00 |
|
|
|
88e8c5c027
|
MAPG-103 implement saving on client side + server side skeleton
|
2020-06-09 21:29:51 +02:00 |
|
|
|
3fd37b0a78
|
MAPG-103 add info about the modified places into the header
|
2020-06-09 21:13:16 +02:00 |
|
|
|
92fd282184
|
MAPG-103 reset UI elements in case of error
|
2020-06-09 21:13:16 +02:00 |
|
|
|
55a1cd24d6
|
MAPG-103 make some CSS rules more general
|
2020-06-09 21:13:16 +02:00 |
|
|
|
bb29bfdfe1
|
MAPG-103 don't use "position" everywhere
|
2020-06-09 21:13:16 +02:00 |
|
|
|
1179914f42
|
MAPG-103 rename "Core" to "Game" in game.js
|
2020-06-09 21:10:15 +02:00 |
|
|
|
85773d47a0
|
MAPG-103 create controls for place
|
2020-06-09 21:10:15 +02:00 |
|
|
|
199374a851
|
MAPG-103 prepare to send additional data with places
|
2020-06-09 21:10:15 +02:00 |
|
|
|
138ff3fe6a
|
MAPG-103 make possible to select a new place on map
|
2020-06-09 21:10:15 +02:00 |
|
|
|
1915b252c6
|
MAPG-103 change map's cursor to crosshair in map editor
|
2020-06-09 21:10:15 +02:00 |
|
|
|
2f2a7968a0
|
Merged in feature/MAPG-115-guard-endpoints-based-on-user-g (pull request #89)
Feature/MAPG-115 guard endpoints based on user g
|
2020-06-09 19:05:23 +00:00 |
|
|
|
edc2e4111a
|
MAPG-115 add login functionality
|
2020-06-09 21:04:27 +02:00 |
|
|
|
d93a758cd2
|
MAPG-115 make possible to add new users via command line
|
2020-06-09 21:04:27 +02:00 |
|
|
|
e8f9d74283
|
MAPG-115 adapt existing controllers to the new request classes
|
2020-06-09 21:04:27 +02:00 |
|
|
|
00dc78b50c
|
MAPG-115 add base model and User model
|
2020-06-09 21:04:27 +02:00 |
|
