Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge changes to staging for 4.7.2 #6410

Merged
merged 60 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
3e7d824
Prettier
tsmock Feb 20, 2024
6f310e5
Update node versions used in CI and docker images
tsmock Mar 21, 2023
9731475
Initial frontend dependency updates
tsmock Mar 27, 2023
45e18c0
Drop polyfills
tsmock Mar 28, 2023
02b3acc
ReactJS: update root rendering method
tsmock Mar 28, 2023
75fa01b
Load only necessary translations
tsmock Mar 29, 2023
4d4c5b2
Wrap methods which affect UI by act in tests
tsmock Mar 30, 2023
e078b11
React Tooltip v4 -> v5 adaptions
tsmock Apr 3, 2023
1c2e977
Update test message
tsmock Apr 3, 2023
33ea26d
Fix query-string usages
tsmock Apr 4, 2023
6046222
Fix infinite recursion due to state changes
tsmock Apr 5, 2023
0df82c3
Use CRACO to workaround CRA #11770
tsmock Apr 11, 2023
e1ce970
Fix tests
tsmock Apr 12, 2023
190f75e
ReactJS: Fix "<div> cannot appear as a descendant of <p>" warnings
tsmock Apr 13, 2023
f4cf85d
Fix forwardRef warnings
tsmock Apr 13, 2023
0ee01c0
commentInput: Ensure react-md-editor is not part of the main chunk
tsmock Apr 20, 2023
c14841b
Improve treeshaking
tsmock Apr 24, 2023
a5724da
fixup! Improve treeshaking
tsmock Mar 28, 2024
da410aa
Revise implementation to insert testimonial image
HelNershingThapa Jan 4, 2023
978c2ad
Fix tests again
tsmock May 16, 2023
191c6f6
internationalization: Fix Sonar issues for promises with no exception…
tsmock May 24, 2023
845d617
Add JOSM responses to server-handlers
tsmock May 25, 2023
bf33971
Fix navigation on point click
tsmock May 25, 2023
de0b494
Testing-Library: Increase default timeout
tsmock May 31, 2023
e53fe0b
project.test.js: Attempt to fix resource leak by waiting for renderin…
tsmock May 31, 2023
2a911ca
Fix Rapid imports for newer build-time dependencies
tsmock Feb 27, 2024
56da86b
Cancel call to ohsome when a component is unloaded
tsmock Mar 11, 2024
e8e93dc
Explicitly import lazy imports in tests
tsmock Mar 18, 2024
67ad269
Fix failing test in projectStats.test.js by waiting for text
tsmock Mar 25, 2024
a61d4d9
Fix Project Instructions not picking up user opted language issue
royallsilwallz Apr 18, 2024
dae0178
Add default changeset comment from env in ohsome API
royallsilwallz Apr 18, 2024
918b7cc
Merge pull request #6343 from hotosm/fix/6338-project-instructions-la…
ramyaragupathy Apr 22, 2024
6292d64
Merge pull request #6344 from hotosm/fix/6339-use-default-changeset-c…
royallsilwallz Apr 25, 2024
dd0ac73
docs: fix readme landing page screenshot
spwoodcock Apr 25, 2024
dfa796e
Simplify docker image tags
eternaltyro Apr 29, 2024
517ee6c
Shorten workflow name
eternaltyro Apr 29, 2024
b1970ee
Fix container image name
eternaltyro Apr 29, 2024
248595c
Fix container image name
eternaltyro Apr 29, 2024
67fb4ff
Revert "Fix container image name"
eternaltyro Apr 29, 2024
82e6bb3
Revert "Fix container image name"
eternaltyro Apr 29, 2024
3115315
Merge pull request #5721 from facebook/chore/frontend-dependency-cleanup
ramyaragupathy Apr 30, 2024
cf92789
infra: Updates to dockerfile & circleci images for node v18 upgrade
mahesh-naxa May 1, 2024
4dd471e
docs: updated version docs to v18
mahesh-naxa May 1, 2024
2a53bcc
Merge pull request #6397 from hotosm/infra-node-18-version
ramyaragupathy May 1, 2024
68702ed
Delete .github/dependabot.yml
ramyaragupathy May 1, 2024
616e42e
Merge pull request #6399 from hotosm/remove-dependabot
eternaltyro May 1, 2024
9d3d086
Fix for loading Live Monitoring View
emi420 May 2, 2024
3e45ab3
Merge pull request #6401 from hotosm/fix/liveMonitoringViewLoad
ramyaragupathy May 2, 2024
72db554
feat: fixed osm download destroy issue
varun2948 May 1, 2024
0b56dd4
Add `AWS Logo` to footer
royallsilwallz May 2, 2024
1fde799
Update labeler.yml
ramyaragupathy May 2, 2024
a5cd1e1
New container image build workflow
eternaltyro May 2, 2024
1051071
Trigger build again
eternaltyro May 2, 2024
06c215f
Add default context to build workflow
eternaltyro May 2, 2024
0660636
+ Configurable project's hashtag on Live Monitoring
emi420 May 2, 2024
4de0ad8
Merge pull request #6375 from varun2948/fix-frontend-dependency-osm-d…
ramyaragupathy May 3, 2024
d1dcbaf
Merge pull request #6406 from hotosm/fix/liveMonitoringViewLoad
ramyaragupathy May 3, 2024
038f744
Merge pull request #6403 from hotosm/feature/6402-integrate-aws-logo
ramyaragupathy May 3, 2024
ffee548
Remove container build trigger for PR to develop branch
eternaltyro May 6, 2024
8ce70d1
Remove container build trigger for PR to develop branch
eternaltyro May 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
frontend-code-test:
resource_class: large
docker:
- image: cimg/node:16.20
- image: cimg/node:18.19.1
working_directory: /home/circleci/tasking-manager
steps:
- checkout
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
working_directory: /home/circleci/tasking-manager
resource_class: medium
docker:
- image: cimg/python:3.10.7-node
- image: cimg/node:18.19.1
steps:
- checkout
- aws-cli/setup:
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
working_directory: /home/circleci/tasking-manager
resource_class: large
docker:
- image: cimg/python:3.10.7-node
- image: cimg/node:18.19.1
parameters:
stack_name:
description: "the name of the stack for cfn-config"
Expand Down
322 changes: 0 additions & 322 deletions .github/dependabot.yml

This file was deleted.

12 changes: 4 additions & 8 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
"codebase: frontend":
"scope: frontend":
- frontend/**/*
"codebase: backend":
"scope: backend":
- backend/**/*
- tests/**/*
- migrations/**/*
- ./manage.py
- ./pyproject.toml
"infrastructure":
"scope: infrastructure":
- .circleci/*
- .github/**/*
- scripts/aws/**/*
Expand All @@ -16,9 +16,5 @@
"dependencies":
- frontend/yarn.lock
- ./pyproject.toml
"javascript":
- frontend/yarn.lock
"python":
- ./pyproject.toml
"type: translations":
"scope: translations":
- frontend/src/locales/*
Loading
Loading