This repository has been archived by the owner on Apr 6, 2023. It is now read-only.
Rebase onto upstream 4.5.2 #341
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@robsavoye as suggested changed to .md only. If anything else need changing please add and review :)
Adding here again as code_of_conduct was saved in old_docs https://github.com/hotosm/tasking-manager/blob/develop/docs-old/code_of_conduct.md
These should be the MAIN contributing guidelines. They introduce users to the different ways of contributing and refer to two more detailed pages: - Translation contributions: https://github.com/hotosm/tasking-manager/blob/develop/docs/contributing-translation.md @dakotabenjamin this links gives me an error- could check where it might be held or it is now part of code contributions below? - Code contributions: https://github.com/hotosm/tasking-manager/blob/develop/docs/developers/contributing-guidelines.md - @dakotabenjamin I also updated the URL for tech support https://hotosm.atlassian.net/servicedesk/customer/portal/4/group/5/create/51 @ramyaragupathy we can also late update the labels if any changes.
Update contributing.md
Rename LICENSE.txt to LICENSE.md
Updated the new contributing.md link
Create code_of_conduct.md
Added updated list: https://community.openstreetmap.org/c/general/38/all
Bumps [eventsource](https://github.com/EventSource/eventsource) from 1.0.7 to 1.1.1. - [Release notes](https://github.com/EventSource/eventsource/releases) - [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md) - [Commits](EventSource/eventsource@v1.0.7...v1.1.1) --- updated-dependencies: - dependency-name: eventsource dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [react-select-event](https://github.com/romgain/react-select-event) from 5.3.0 to 5.5.1. - [Release notes](https://github.com/romgain/react-select-event/releases) - [Commits](romgain/react-select-event@v5.3.0...v5.5.1) --- updated-dependencies: - dependency-name: react-select-event dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [workbox-recipes](https://github.com/googlechrome/workbox) from 6.1.5 to 6.5.4. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](GoogleChrome/workbox@v6.1.5...v6.5.4) --- updated-dependencies: - dependency-name: workbox-recipes dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…287) Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.14.1 to 5.16.5. - [Release notes](https://github.com/testing-library/jest-dom/releases) - [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md) - [Commits](testing-library/jest-dom@v5.14.1...v5.16.5) --- updated-dependencies: - dependency-name: "@testing-library/jest-dom" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.12.0 to 6.12.6. - [Release notes](https://github.com/ajv-validator/ajv/releases) - [Commits](ajv-validator/ajv@v6.12.0...v6.12.6) --- updated-dependencies: - dependency-name: ajv dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…5190) Bumps [@testing-library/react-hooks](https://github.com/testing-library/react-hooks-testing-library) from 7.0.0 to 8.0.1. - [Release notes](https://github.com/testing-library/react-hooks-testing-library/releases) - [Changelog](https://github.com/testing-library/react-hooks-testing-library/blob/main/CHANGELOG.md) - [Commits](testing-library/react-hooks-testing-library@v7.0.0...v8.0.1) --- updated-dependencies: - dependency-name: "@testing-library/react-hooks" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#5295) * Bump @testing-library/user-event from 13.1.9 to 14.4.3 in /frontend Bumps [@testing-library/user-event](https://github.com/testing-library/user-event) from 13.1.9 to 14.4.3. - [Release notes](https://github.com/testing-library/user-event/releases) - [Changelog](https://github.com/testing-library/user-event/blob/main/CHANGELOG.md) - [Commits](testing-library/user-event@v13.1.9...v14.4.3) --- updated-dependencies: - dependency-name: "@testing-library/user-event" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Fix failing mouse over events Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Hel Nershing Thapa <[email protected]>
Removes condition to display priority boxes for all priority options.
…tion list(inbox) page (#5443) * Bump reactjs-popup from 1.5.0 to 2.0.5 * Add primitive styles for popover content * Remove route for notification detaill * Add nested prop for user tasks list Some errors relating to refs were encountered when migrating to the latest version of the pop-up library. I had to add the nested props to fix this. This commit also fixes the wrapper element of the tasks list to fit the content, not the whole width. * Remove redirecting to previous page on notif delete * Implement handling notification content on popups
Bumps [prettier](https://github.com/prettier/prettier) from 2.6.2 to 2.8.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](prettier/prettier@2.6.2...2.8.1) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [express](https://github.com/expressjs/express) from 4.17.1 to 4.18.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.17.1...4.18.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [osmtogeojson](https://github.com/tyrasd/osmtogeojson) from 3.0.0-beta.4 to 3.0.0-beta.5. - [Release notes](https://github.com/tyrasd/osmtogeojson/releases) - [Changelog](https://github.com/tyrasd/osmtogeojson/blob/gh-pages/CHANGELOG.md) - [Commits](tyrasd/osmtogeojson@3.0.0-beta.4...3.0.0-beta.5) --- updated-dependencies: - dependency-name: osmtogeojson dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.28.0 to 2.29.3. - [Release notes](https://github.com/date-fns/date-fns/releases) - [Changelog](https://github.com/date-fns/date-fns/blob/main/CHANGELOG.md) - [Commits](date-fns/date-fns@v2.28.0...v2.29.3) --- updated-dependencies: - dependency-name: date-fns dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [sass](https://github.com/sass/dart-sass) from 1.35.1 to 1.58.0. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](sass/dart-sass@1.35.1...1.58.0) --- updated-dependencies: - dependency-name: sass dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump use-query-params from 1.2.2 to 2.1.2 in /frontend * Replace globalHistory with ReachAdapter
updated meet up dates
Brush up on the responsiveness of the navigation bar
facebook-github-bot
added
the
CLA Signed
github-actions
bot
added
Component: Backend
Component: Frontend
Component: Infrastructure
dependencies
- Date picker added to imagery page in settings - Database migrated with new column for the date Frontend legend visuals 2 new trim toggles + image capture on legend Set date filters as default - Mapillary photo overlay now open by default in iD editor - fromDate filter set from project settings in iD editor Frontend imagery form revamp - Added image capture mode toggle - Settings related to image capture mode only appear if this toggle is enabled - Added all connected UI prompts to messages - "Earliest imagery capture date" shortened to "After:" positioned before date picker - Added mapillary organization id filter input iD/RapiD editor fromdate filter added earliestStreetImagery as a dependency, wrapped filter in if statement Backend add fields of imageCaptureMode and mapillaryOrganizationId Updates DTOs to make the new project settings persistent Mapillary API organization get call Map legend update Now updates based on whether user selects image capture mode Update editor/rapideditor Now only enables mapillary and date filter by default if image capture mode is enabled Update map.js Update action.js Fixed missing brackets Addressing comments Renamed new columns to use underscores Project states
Signed-off-by: Taylor Smock <[email protected]>
tsmock
force-pushed
the
mwai-develop-v4.5.2
branch
from
faceff7
to
ec34534
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See v4.5.1 and v4.5.2 for the upstream changes. For a full list of upstream changes included in this branch, see hotosm/tasking-manager@v4.5.0...4.5.2.
Notes about the rebase:
When reviewing this pr, I recommend comparing against facebook/OSM-HOT-Tasking-Manager@mwai-develop-v4.5.0...mwai-develop-v4.5.2 and facebook/OSM-HOT-Tasking-Manager@4.5.0...mwai-develop-v4.5.2, instead of looking at the changed files directly in this PR.