-
-
Notifications
You must be signed in to change notification settings - Fork 46
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
2024-01-25 merge development --> staging #1140
Commits on Jan 14, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 3e5b7d1 - Browse repository at this point
Copy the full SHA 3e5b7d1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3cbaa95 - Browse repository at this point
Copy the full SHA 3cbaa95View commit details -
Configuration menu - View commit details
-
Copy full SHA for fa562b2 - Browse repository at this point
Copy the full SHA fa562b2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0f7e855 - Browse repository at this point
Copy the full SHA 0f7e855View commit details -
Configuration menu - View commit details
-
Copy full SHA for 359b682 - Browse repository at this point
Copy the full SHA 359b682View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6bc5eff - Browse repository at this point
Copy the full SHA 6bc5effView commit details
Commits on Jan 15, 2024
-
build: add justfile to repo for basic commands (#1098)
* build: add justfile to repo for basic commands * build: remove Makefile, update Justfile * build: add Justfile commands to clean databases * docs: add Justfile to pr auto labeller
Configuration menu - View commit details
-
Copy full SHA for f6c0243 - Browse repository at this point
Copy the full SHA f6c0243View commit details
Commits on Jan 16, 2024
-
refactor: organization routes/crud/schemas to use best practice (#1096)
* fix: use enums for HTTPStatus over codes * refactor: update organization routes/crud/schemas best pracice * added int to the union with str in org_exists functions * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: Niraj Adhikari <nrjadkry@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for d4b20b1 - Browse repository at this point
Copy the full SHA d4b20b1View commit details
Commits on Jan 17, 2024
-
feat: add basic user role support to backend (#1094)
* feat: update role enums: UserRole and ProjectRole * feat: update DbUserRole model to use ProjectRole enum + comp key * build: update base schema with new enum types * fix: osm login methods to async * feat: add basic roles: super admin & validator * build: add migration for ProjectRole db enum type * build: fix migrations with revert for projectrole * build: fix enum migrations with intermediate varchar * fix: handle invalid access tokens * refactor: correct use of 403 http status over 401 * refactor: tidy minor code edits & lint fixes * build: default to 4 workers on dev uvicorn container * feat: add project_deps with get_project_by_id logic * feat: add org_admin role to role deps * fix: add user role to response /me for frontend * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for f8cf65f - Browse repository at this point
Copy the full SHA f8cf65fView commit details -
refactor: fix all pre-commit.ci linting errors (#1101)
* build: add migration for ProjectRole db enum type * fix: database model backrefs for DbUserRole --> (DbProject/DbUser) * fix: add debug user to bypass auth during tests * refactor: simplify project deletion endpoint /project/{id} * test: add test for project deletion endpoint * refactor: rename upload_multi_polygon --> custom_task_boundaries * ci: disable markdownlint rule MD033 (allow inline html img resize) * docs: update docs home page to use ref links * refactor: fix all linting errors for code * ci: add CONTRIBUTING.md to prettier ignore list * docs: fix linting errors for all markdown docs * refactor: rename LICENSE --> LICENSE.md * refactor: update badges in readme * docs: add allcontributors to badge table * ci: add LICENSE.md to markdownlint ignore * ci: update markdownlint ignore syntax for ci * ci: add LICENSE.md to prettier ignore * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * style: revert prettier changes to LICENSE.md * ci: update pre-commit hook versions * docs: fix markdown linting errors after update * ci: disable hadolint until bundled binary * ci: do not run shellcheck on contrib dir * ci: ignore SC2188,SC2143 from shellcheck * refactor: fix lint errors for all shell/bash scripts --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for da5c95f - Browse repository at this point
Copy the full SHA da5c95fView commit details -
fix: editable vector layer in ol for project creation (#1102)
* fix: backend import error fix * fix (vectorLayer): style - conditionaly apply style on onModify present * fix (splitTasks): map - edit added to splitted taskLayer * fix (splitTasks): onModify - edited geojson set to dividedTaskGeojson state * feat (createNewProject): only enable generate task btn if fgb file fetch is completed * fix (createNewProject): splitTasks - logic fix * fix (createNewProject): splitTasks - clear dividedTaskGeojson, splitTasksSelection, and dataExtractGeojson state on previous click * feat (createNewProject): splitTasks - show loader and message until FGB file is fetching * fix (createNewProject): taskSplit - display error on taskSplit fail * fix vectorLayer: on modifyEnd return area of boundary as well * fix button: loading text added to the button * fix NewDefineAreaMap: removed data extraction in progress message from mapComponent * fix (createNewProject): splitTasks - clearing state on step toggle remove * fix (createNewProject): uploadArea - clear step4 & step5 step on AOI edit * fix (createNewProject): dataExtract - generateTaskBTN added, disable next until taskGeneration success, state logic changed to track extractWays & featureType state validation * fix (createNewProject): dataExtract - clear file state on reset click or if generateDataExtract click * fix (createNewProject): customLine, customPolygon file state clear on AOI edit * fix (createNewProject): dataExtract - clear previous extractGeojson, customLine, customPolygon on generate extract, btn disable state update
Configuration menu - View commit details
-
Copy full SHA for c03f908 - Browse repository at this point
Copy the full SHA c03f908View commit details
Commits on Jan 18, 2024
-
fix: limit project area during create (#1109)
* fix: backend import error fix * fix (vectorLayer): style - conditionaly apply style on onModify present * fix (splitTasks): map - edit added to splitted taskLayer * fix (splitTasks): onModify - edited geojson set to dividedTaskGeojson state * feat (createNewProject): only enable generate task btn if fgb file fetch is completed * fix (createNewProject): splitTasks - logic fix * fix (createNewProject): splitTasks - clear dividedTaskGeojson, splitTasksSelection, and dataExtractGeojson state on previous click * feat (createNewProject): splitTasks - show loader and message until FGB file is fetching * fix (createNewProject): taskSplit - display error on taskSplit fail * fix vectorLayer: on modifyEnd return area of boundary as well * fix button: loading text added to the button * fix NewDefineAreaMap: removed data extraction in progress message from mapComponent * fix (createNewProject): splitTasks - clearing state on step toggle remove * fix (createNewProject): uploadArea - clear step4 & step5 step on AOI edit * fix (createNewProject): dataExtract - generateTaskBTN added, disable next until taskGeneration success, state logic changed to track extractWays & featureType state validation * fix (createNewProject): dataExtract - clear file state on reset click or if generateDataExtract click * fix (createNewProject): customLine, customPolygon file state clear on AOI edit * fix (createNewProject): dataExtract - clear previous extractGeojson, customLine, customPolygon on generate extract, btn disable state update * fix (createNewProject): uploadArea - warning & error shown if AOI exceeds 100 & 1000 sq.km respectively
Configuration menu - View commit details
-
Copy full SHA for da99c41 - Browse repository at this point
Copy the full SHA da99c41View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0ce89c9 - Browse repository at this point
Copy the full SHA 0ce89c9View commit details -
Merge pull request #1113 from hotosm/fix/use-org-admin-table
Use organisation manager table for organisation admins
Configuration menu - View commit details
-
Copy full SHA for 1322cd1 - Browse repository at this point
Copy the full SHA 1322cd1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8ad3ec1 - Browse repository at this point
Copy the full SHA 8ad3ec1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1c5420b - Browse repository at this point
Copy the full SHA 1c5420bView commit details -
Configuration menu - View commit details
-
Copy full SHA for ee8f1a8 - Browse repository at this point
Copy the full SHA ee8f1a8View commit details -
Configuration menu - View commit details
-
Copy full SHA for c5b1cad - Browse repository at this point
Copy the full SHA c5b1cadView commit details -
Configuration menu - View commit details
-
Copy full SHA for 670c455 - Browse repository at this point
Copy the full SHA 670c455View commit details -
Configuration menu - View commit details
-
Copy full SHA for e67aeaa - Browse repository at this point
Copy the full SHA e67aeaaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 36af459 - Browse repository at this point
Copy the full SHA 36af459View commit details -
Configuration menu - View commit details
-
Copy full SHA for ed95c47 - Browse repository at this point
Copy the full SHA ed95c47View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4d7ba07 - Browse repository at this point
Copy the full SHA 4d7ba07View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0c01424 - Browse repository at this point
Copy the full SHA 0c01424View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0db23d1 - Browse repository at this point
Copy the full SHA 0db23d1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1a9aabc - Browse repository at this point
Copy the full SHA 1a9aabcView commit details -
Configuration menu - View commit details
-
Copy full SHA for b0bb274 - Browse repository at this point
Copy the full SHA b0bb274View commit details
Commits on Jan 19, 2024
-
Fix condition in elif statement for Feature type detection
sujanadh committedJan 19, 2024 Configuration menu - View commit details
-
Copy full SHA for 5704fe1 - Browse repository at this point
Copy the full SHA 5704fe1View commit details -
Merge pull request #1119 from hotosm/fix-data-extract
Fix condition in elif statement for Feature type detection
Configuration menu - View commit details
-
Copy full SHA for a3b2fc7 - Browse repository at this point
Copy the full SHA a3b2fc7View commit details -
Merge pull request #1117 from hotosm/build/upgrade-osm-pkgs
Upgrade osm-fieldwork --> 0.4.1 & fmtm-splitter --> 0.2.6
Configuration menu - View commit details
-
Copy full SHA for 60399ca - Browse repository at this point
Copy the full SHA 60399caView commit details -
docs: update markdown links from inline to reference (footnote) style (…
…#1116) * Clean up links in contributing * done: CONTRIBUTING.md * done: INSTALL.md * done: User-Mantual-For-Project-Managers.md * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Moving script file to a new directory * move new script file to a new directory * deleted superfluous XINSTALL copy.md --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 512b130 - Browse repository at this point
Copy the full SHA 512b130View commit details -
Configuration menu - View commit details
-
Copy full SHA for 650f7c3 - Browse repository at this point
Copy the full SHA 650f7c3View commit details -
feat: paginated submissions by project (#1110)
* feat: submission form fields for the submision table * feat: paginated submissions by project * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * refactor: format submission_routes, remove dup import * refactor: fix incorrect import from app.submission * run pre-commit --------- Co-authored-by: sujanadh <sujanadh07@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: spwoodcock <sam.woodcock@protonmail.com>
Configuration menu - View commit details
-
Copy full SHA for b44ebee - Browse repository at this point
Copy the full SHA b44ebeeView commit details -
Configuration menu - View commit details
-
Copy full SHA for 10c31fc - Browse repository at this point
Copy the full SHA 10c31fcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 126f80a - Browse repository at this point
Copy the full SHA 126f80aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1033e0f - Browse repository at this point
Copy the full SHA 1033e0fView commit details
Commits on Jan 21, 2024
-
Configuration menu - View commit details
-
Copy full SHA for c74855e - Browse repository at this point
Copy the full SHA c74855eView commit details
Commits on Jan 22, 2024
-
fix divide by square on multipolygon geojson
sujanadh committedJan 22, 2024 Configuration menu - View commit details
-
Copy full SHA for e97ef2c - Browse repository at this point
Copy the full SHA e97ef2cView commit details -
Merge pull request #1125 from hotosm/fix-square-split
Fix divide by square on multipolygon geojson
Configuration menu - View commit details
-
Copy full SHA for 6b32142 - Browse repository at this point
Copy the full SHA 6b32142View commit details -
Configuration menu - View commit details
-
Copy full SHA for 66b3607 - Browse repository at this point
Copy the full SHA 66b3607View commit details -
feat: add test coverage metric (#1129)
* build: add coverage.py to test dependencies * docs: add dev info about coverage and profiling * refactor: add doxygen output to gitignore * build: add coverage-badge to test deps * ci: update all workflows v1.4.2 --> v1.4.3 * ci: add coverage output during deploy pytest * docs: add coverage stats to readme * build: lock dependencies after merge coverage+fmtm-splitter * build: add coverage files to gitignore * ci: update pytest workflow test to use coverage * ci: update all workflows v1.4.3 --> v1.4.4
Configuration menu - View commit details
-
Copy full SHA for 148de05 - Browse repository at this point
Copy the full SHA 148de05View commit details -
Configuration menu - View commit details
-
Copy full SHA for 15345c5 - Browse repository at this point
Copy the full SHA 15345c5View commit details
Commits on Jan 23, 2024
-
hotfix: geom type not populated with feature type
sujanadh committedJan 23, 2024 Configuration menu - View commit details
-
Copy full SHA for aa2680d - Browse repository at this point
Copy the full SHA aa2680dView commit details -
Merge pull request #1130 from hotosm/fix-geom-type
hotfix: geom type not populated with feature type
Configuration menu - View commit details
-
Copy full SHA for 749431f - Browse repository at this point
Copy the full SHA 749431fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 67a099f - Browse repository at this point
Copy the full SHA 67a099fView commit details -
feat: organisation approval and admin endpoints (#1126)
* dependencies to cehck if user_exists * endpoint to add organisation admin * added approved field in organisation model * fix: table name in migration file for organisations * feat: organisations list api updated according to role * feat: endpoint to approve organisations * update: get organisation endpoint for filtering approval * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * added docstrings * fix: pre-commit linting errors * added docstring in user_deps file * build: add default odk credentials to organisations * build: merge migrations to organisations table * refactor: fix linting errors * refactor: remove subscription_tier field for orgs * build: add public.organisation.approved field to base schema * refactor: remove extra url field from DbOrganisation * refactor: fix organizationModel dir --> organisation for import * fix: remove router get_db global dependency (on routes) * fix: use separate super_admin + check_super_admin deps * fix: update org_admin to also allow super_admin * refactor: remove missed log.warning from organisations endpoint * fix: separate Depends from logic, working org approval --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: spwoodcock <sam.woodcock@protonmail.com>
Configuration menu - View commit details
-
Copy full SHA for 36ae5d4 - Browse repository at this point
Copy the full SHA 36ae5d4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8349c8c - Browse repository at this point
Copy the full SHA 8349c8cView commit details -
refactor: update project dashboard to use deps functions (#1127)
* Refactor: updated code to use deps function * Created new deps function org_from_project * fix: call check_org_exists logic from dependency * refactor: var naming for consistency --------- Co-authored-by: sujanadh <sujanadh07@gmail.com> Co-authored-by: spwoodcock <sam.woodcock@protonmail.com>
Configuration menu - View commit details
-
Copy full SHA for 3060f19 - Browse repository at this point
Copy the full SHA 3060f19View commit details -
feat: paginated submissions per task (#1128)
* merge development * feat: paginated submissions by task --------- Co-authored-by: sujanadh <sujanadh07@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 9a9d728 - Browse repository at this point
Copy the full SHA 9a9d728View commit details -
Configuration menu - View commit details
-
Copy full SHA for 17ae34d - Browse repository at this point
Copy the full SHA 17ae34dView commit details -
build: replace project.private field with project.visibility enum (#1132
) * build: remove project_allowed_users table from db * build: remove odk_central_src field from project table * refactor: tidy/reorder project db model fields * build: remove project.task_creation_mode field + enum * build: replace project.private field with project.visibility enum * fix: fix visibility migration column add syntax * fix: apply migration to projects table * build: fix check for projectvisibility type in migration * ci: update workflows 1.4.5 for mkdocs --dirty
Configuration menu - View commit details
-
Copy full SHA for 0925773 - Browse repository at this point
Copy the full SHA 0925773View commit details -
Configuration menu - View commit details
-
Copy full SHA for ebb07cd - Browse repository at this point
Copy the full SHA ebb07cdView commit details
Commits on Jan 24, 2024
-
Configuration menu - View commit details
-
Copy full SHA for f3bea80 - Browse repository at this point
Copy the full SHA f3bea80View commit details -
Configuration menu - View commit details
-
Copy full SHA for d72b49f - Browse repository at this point
Copy the full SHA d72b49fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 307b8ca - Browse repository at this point
Copy the full SHA 307b8caView commit details -
Configuration menu - View commit details
-
Copy full SHA for 35f5c11 - Browse repository at this point
Copy the full SHA 35f5c11View commit details -
Configuration menu - View commit details
-
Copy full SHA for 69a1a19 - Browse repository at this point
Copy the full SHA 69a1a19View commit details -
Configuration menu - View commit details
-
Copy full SHA for c42af08 - Browse repository at this point
Copy the full SHA c42af08View commit details
Commits on Jan 25, 2024
-
Configuration menu - View commit details
-
Copy full SHA for d7f2075 - Browse repository at this point
Copy the full SHA d7f2075View commit details -
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
Configuration menu - View commit details
-
Copy full SHA for fbcbca1 - Browse repository at this point
Copy the full SHA fbcbca1View commit details -
Merge pull request #1137 from hotosm/feat-organization-cookie
feature/added withcredential to include cookies on organization list api
Configuration menu - View commit details
-
Copy full SHA for bb8b2ce - Browse repository at this point
Copy the full SHA bb8b2ceView commit details -
build: add deployment container replicas and resource constraints (#1139
Configuration menu - View commit details
-
Copy full SHA for ecdf41a - Browse repository at this point
Copy the full SHA ecdf41aView commit details -
feat: endpoint to return count of validated and mapped tasks (#1138)
* feat: new endpoint to return count of validated and mapped task * refactor: move to tasks router + use pydantic model * refactor: rename task_activity route --> tasks/activity --------- Co-authored-by: sujanadh <sujanadh07@gmail.com> Co-authored-by: spwoodcock <sam.woodcock@protonmail.com>
Configuration menu - View commit details
-
Copy full SHA for c8246ce - Browse repository at this point
Copy the full SHA c8246ceView commit details -
feat: add AOI editing to map during project creation (#1135)
* feat (createNewProject): mapControlComponent - mapControlComponent including edit, undo added * feat AssetModules: icons added * feat (createNewProject): splitTasks - edit task on editBtn click * fix codeRefactor: consoles removed * fix mapControlComponent: undoIcon removed
Configuration menu - View commit details
-
Copy full SHA for b382fde - Browse repository at this point
Copy the full SHA b382fdeView commit details -
refactor(frontend): use absolute (aliased) imports over relative impo…
…rts (#1136) * fix: add vite alias @ for src dir * refactor(frontend): replace all relative imports with @ alias * build: add lint command to package.json (eslint) * build: add @ alias to tsconfig for type imports * refactor: fix all linting errors from eslint * fix: browser console errors incorrect React usage * fix: add axios interceptor withCredentials, plus API const * refactor: fix remaining relative imports
Configuration menu - View commit details
-
Copy full SHA for 4c12cc3 - Browse repository at this point
Copy the full SHA 4c12cc3View commit details -
Configuration menu - View commit details
-
Copy full SHA for c8ed194 - Browse repository at this point
Copy the full SHA c8ed194View commit details