Commit Graph

523 Commits

Author SHA1 Message Date
afbd0b4e20 Merged in feature/MAPG-69-implement-google-registration (pull request #112)
Feature/MAPG-69 implement google registration
2020-06-14 18:45:25 +00:00
062718dd75 MAPG-69 implement password modification 2020-06-14 20:43:13 +02:00
20102f0577 MAPG-69 implement sign up functionality 2020-06-14 20:43:13 +02:00
a69ba3a99b MAPG-69 unifying some style and text 2020-06-14 20:43:13 +02:00
66b21ec710 MAPG-69 add active flag for users and check if user is active before login 2020-06-14 20:43:13 +02:00
28ed02091a MAPG-69 add mailing 2020-06-14 20:43:13 +02:00
334df3462b MAPG-69 add menu with user info to header 2020-06-14 17:43:14 +02:00
01db72796b MAPG-69 fix migration - transaction should not be started in that scope 2020-06-14 17:12:29 +02:00
c50c5ed422 MAPG-69 initialize Request earlier
add Request to global Container
add base URL to Request
2020-06-14 17:11:48 +02:00
142c91f36b Merged in bugfix/MAPG-138-fix-js-minifying (pull request #111)
MAPG-138 use traditional for loop for compatibility
2020-06-14 09:33:54 +00:00
1269c876e9 MAPG-138 use traditional for loop for compatibility 2020-06-14 11:33:13 +02:00
44e441fac0 Merged in bugfix/MAPG-137-fix-errors-reported-by-speed-an (pull request #110)
Bugfix/MAPG-137 fix errors reported by speed an
2020-06-14 09:25:47 +00:00
f85340cd00 MAPG-137 optimize png images (favicons) 2020-06-14 11:21:07 +02:00
ba83f73c31 MAPG-137 add width and height to images where possible 2020-06-14 11:12:18 +02:00
86f05f7738 MAPG-137 place static maps into container to avoid large layout shifts 2020-06-14 11:11:37 +02:00
61ce915ec0 Merged in hotfix/MAPG-125-ability-to-delete-maps (pull request #109)
MAPG-125 re-add select map name when opening modal
2020-06-14 00:53:38 +00:00
2aa3cdc7f3 MAPG-125 re-add select map name when opening modal 2020-06-14 02:53:11 +02:00
5760e31e29 Merged in feature/MAPG-125-ability-to-delete-maps (pull request #108)
Feature/MAPG-125 ability to delete maps
2020-06-14 00:42:31 +00:00
14fd723f26 MAPG-125 add functionality to delete map button 2020-06-14 02:37:49 +02:00
a6d5214166 MAPG-125 add deleteMap endpoint 2020-06-14 02:36:23 +02:00
d1d9dede9c MAPG-125 use modal instead of custom box in map editor 2020-06-14 02:31:09 +02:00
171064816c MAPG-125 add modal design 2020-06-14 02:30:47 +02:00
f8bb7bd092 MAPG-125 rename #cover to #guessCover in game 2020-06-14 02:07:20 +02:00
466f065718 MAPG-125 switch off diff calculation in Modify for better performance
(not sure if needed - we probably won't log)
2020-06-14 02:06:27 +02:00
6d68f247e6 Merged in feature/MAPG-133-csrf-protection (pull request #107)
Feature/MAPG-133 csrf protection
2020-06-13 20:41:49 +00:00
e4c7aadc64 MAPG-133 replace XHRs to MapGuesser.httpRequest 2020-06-13 22:39:44 +02:00
25262fb5fe MAPG-133 pass CSRF token to JS
create separate mapguesser.js
2020-06-13 22:39:17 +02:00
8e0c1ce08b MAPG-133 add basic CSRF protection to server side 2020-06-13 22:38:30 +02:00
9e196ebf33 Merged in feature/MAPG-131-store-session-is-database (pull request #106)
Feature/MAPG-131 store session is database
2020-06-13 18:49:26 +00:00
013668e3d6 MAPG-131 split web specific code from main.php to web.php
set the new session handler as session handler
configure session with longer lifetime and with stricter cookie settings
2020-06-13 20:45:36 +02:00
dbd16d6cbe MAPG-131 create custom session handler for DB sessions 2020-06-13 20:39:42 +02:00
6a191d5c28 MAPG-131 adapt Modify to be able to handle external ID 2020-06-13 20:39:22 +02:00
39e49724da MAPG-131 add sessions table to DB 2020-06-13 20:38:45 +02:00
6c8a3c6a90 Merged in feature/MAPG-111-calculate-map-area-when-bounds-are-modified (pull request #105)
Feature/MAPG-111 calculate map area when bounds are modified
2020-06-12 19:57:07 +00:00
7159867db0 MAPG-111 query map area from DB
modify calculations to be in square km (instead of m)
2020-06-12 21:55:04 +02:00
4d7c86fd1b MAPG-111 store map area in table 'maps' 2020-06-12 21:54:05 +02:00
9ca97dccb9 Merged in bugfix/MAPG-28-rewrite-missiong-static-asset-paths (pull request #104)
MAPG-28 fix static asset paths (add STATIC_ROOT and REVISION)
2020-06-12 18:16:36 +00:00
2ef67d53f4 MAPG-28 fix static asset paths (add STATIC_ROOT and REVISION) 2020-06-12 20:13:43 +02:00
06a0722899 Merged in feature/MAPG-28-configure-static-root-for-assets (pull request #103)
Feature/MAPG-28 configure static root for assets
2020-06-12 18:01:56 +00:00
4a9cf8a217 MAPG-28 add update-version.sh and adapt deploy py script to that 2020-06-12 20:00:45 +02:00
b3caf1fb38 MAPG-28 adapt cssFiles and jsFiles to the new handler 2020-06-12 20:00:45 +02:00
08d4aec48e MAPG-28 add static root and revision to the local JS and CSS files 2020-06-12 20:00:45 +02:00
9c380076fa Merged in feature/MAPG-129-add-git-hooks (pull request #102)
MAPG-129 add prepare-commit-msg hook template
2020-06-12 17:48:37 +00:00
95508ad284 MAPG-129 add prepare-commit-msg hook template 2020-06-12 19:47:58 +02:00
7690714b26 MAPG-28 make it possible to configure static root (eg. for static.example.com) 2020-06-12 19:42:55 +02:00
f732dad1b1 MAPG-28 add version and revision info in main.php 2020-06-12 19:39:25 +02:00
49b6f28a9d Merged in bugfix/MAPG-130-fix-loading-animation-position (pull request #101)
MAPG-130 loading animation should be fixed and not absolute
2020-06-11 21:53:47 +00:00
33ec9d3a9c MAPG-130 loading animation should be fixed and not absolute 2020-06-11 23:53:15 +02:00
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