Merge branch 'main' into hotosm-latest

# Conflicts:
#	Dockerfile
#	README.md
#	backend/models/postgis/organisation.py
#	frontend/.env.expand
#	frontend/package.json
#	frontend/public/index.html
#	frontend/src/App.js
#	frontend/src/assets/styles/_extra.scss
#	frontend/src/assets/styles/index.scss
#	frontend/src/components/button.js
#	frontend/src/components/comments/commentInput.js
#	frontend/src/components/contributions/myTasksNav.js
#	frontend/src/components/contributions/taskBodyCard.js
#	frontend/src/components/contributions/taskCard.js
#	frontend/src/components/deleteModal/index.js
#	frontend/src/components/dropdown.js
#	frontend/src/components/footer/index.js
#	frontend/src/components/header/NavLink.js
#	frontend/src/components/header/burgerMenu.js
#	frontend/src/components/header/index.js
#	frontend/src/components/header/updateDialog.js
#	frontend/src/components/homepage/jumbotron.js
#	frontend/src/components/homepage/testimonials.js
#	frontend/src/components/homepage/whoIsMapping.js
#	frontend/src/components/interests/index.js
#	frontend/src/components/licenses/index.js
#	frontend/src/components/notifications/inboxNav.js
#	frontend/src/components/notifications/notificationBodyCard.js
#	frontend/src/components/notifications/notificationCard.js
#	frontend/src/components/notifications/notificationResults.js
#	frontend/src/components/projectCard/priorityBox.js
#	frontend/src/components/projectCard/projectCard.js
#	frontend/src/components/projectCreate/index.js
#	frontend/src/components/projectDetail/favorites.js
#	frontend/src/components/projectDetail/footer.js
#	frontend/src/components/projectDetail/header.js
#	frontend/src/components/projectDetail/index.js
#	frontend/src/components/projectDetail/privateProjectError.js
#	frontend/src/components/projectEdit/actionsForm.js
#	frontend/src/components/projectStats/edits.js
#	frontend/src/components/projects/clearFilters.js
#	frontend/src/components/projects/list.js
#	frontend/src/components/projects/moreFiltersForm.js
#	frontend/src/components/projects/myProjectNav.js
#	frontend/src/components/projects/projectNav.js
#	frontend/src/components/taskSelection/action.js
#	frontend/src/components/taskSelection/actionSidebars.js
#	frontend/src/components/taskSelection/actionTabsNav.js
#	frontend/src/components/taskSelection/contributions.js
#	frontend/src/components/taskSelection/footer.js
#	frontend/src/components/taskSelection/index.js
#	frontend/src/components/taskSelection/lockedTasks.js
#	frontend/src/components/taskSelection/permissionErrorModal.js
#	frontend/src/components/taskSelection/taskList.js
#	frontend/src/components/taskSelection/tests/lockedTasks.test.js
#	frontend/src/components/teamsAndOrgs/campaigns.js
#	frontend/src/components/teamsAndOrgs/management.js
#	frontend/src/components/teamsAndOrgs/members.js
#	frontend/src/components/teamsAndOrgs/organisations.js
#	frontend/src/components/teamsAndOrgs/projects.js
#	frontend/src/components/teamsAndOrgs/teams.js
#	frontend/src/components/user/avatar.js
#	frontend/src/components/user/content.js
#	frontend/src/components/user/forms/settings.js
#	frontend/src/components/userDetail/barListChart.js
#	frontend/src/components/userDetail/countriesMapped.js
#	frontend/src/components/userDetail/editsByNumbers.js
#	frontend/src/components/userDetail/elementsMapped.js
#	frontend/src/components/userDetail/headerProfile.js
#	frontend/src/components/userDetail/tests/editByNumbers.test.js
#	frontend/src/components/userDetail/tests/headerProfile.test.js
#	frontend/src/config/index.js
#	frontend/src/index.js
#	frontend/src/locales/en.json
#	frontend/src/views/about.js
#	frontend/src/views/authorized.js
#	frontend/src/views/campaigns.js
#	frontend/src/views/contributions.js
#	frontend/src/views/fallback.js
#	frontend/src/views/interests.js
#	frontend/src/views/learn.js
#	frontend/src/views/licenses.js
#	frontend/src/views/login.js
#	frontend/src/views/notFound.js
#	frontend/src/views/notifications.js
#	frontend/src/views/organisationManagement.js
#	frontend/src/views/organisationStats.js
#	frontend/src/views/project.js
#	frontend/src/views/projectEdit.js
#	frontend/src/views/quickstart.js
#	frontend/src/views/settings.js
#	frontend/src/views/stats.js
#	frontend/src/views/taskAction.js
#	frontend/src/views/teams.js
#	frontend/src/views/userDetail.js
#	frontend/src/views/verifyEmail.js
#	frontend/src/views/welcome.js
#	frontend/yarn.lock
#	requirements.txt
#	scripts/docker/Dockerfile.backend

.circleci/rdsid.sh

@@ -6,4 +6,4 @@ for line in $ARNS; do
     if [[ ! -z $MATCHES ]]; then
         echo $MATCHES
     fi
-done
+done

.coveragerc

@@ -9,6 +9,7 @@ omit =
 omit =
         tests/*
         backend/*/__init__.py
+        __pypackages__/*
 
 # Regexes for lines to exclude from consideration
 exclude_lines =
@@ -18,6 +19,10 @@ exclude_lines =
     # Don't complain if non-runnable code isn't run:
     if __name__ == .__main__.:
 
+    # Don't complain if tests don't hit defensive assertion code:
+    except Exception as e:
+
+
 ignore_errors = True
 
 [html]

.dockerignore

@@ -1,7 +1,22 @@
 .*
 *.yml
 **/*.pyc
+**/__pypackages__
+**/__pycache__
 **/node_modules
 **/npm-debug.log
-logs/
+**/venv
+**/.venv
+docs-old/
 docs/
+logs/
+
+# Generated frontend #
+frontend/node_modules/
+frontend/build/
+frontend/public/static/
+frontend/assets/styles/
+frontend/package-lock.json
+frontend/.env
+frontend/.eslintcache
+frontend/coverage/

.flaskenv

@@ -0,0 +1,5 @@
+# This file is not read for Tasking Manager variables. Use tasking-manager.env instead.
+# Flask (the web server framework) uses this file to figure out what the entry point is,
+# if it is non-standard.
+# For more information, see https://flask.palletsprojects.com/en/2.0.x/cli/#environment-variables-from-dotenv
+FLASK_APP=manage.py

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: hotosm
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']