Skip to content

Integrate upstream and diary portion/date editing - #1

Open
matt8s wants to merge 47 commits into
masterfrom
integration/diary-20261105
Open

matt8s wants to merge 47 commits into
masterfrom
integration/diary-20261105

Conversation

@matt8s

@matt8s matt8s commented Nov 5, 2026

Copy link
Copy Markdown
Owner

Additively merges current upstream master and the diary editing changes from wger-project#1333.

At the combined revision, all 1,215 tests passed in America/Toronto, UTC and Asia/Kolkata with coverage. Typecheck, lint and production build passed. Existing lint warnings, happy-dom teardown traces and the bundle-size warning remain. Remote CI is pending.

matt8s and others added 30 commits October 29, 2026 19:04
Currently translated at 100.0% (473 of 473 strings)

Translation: wger Workout Manager/Webapp (frontend)
Translate-URL: https://hosted.weblate.org/projects/wger/frontend/uk/
Bumps the types group with 2 updates: [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) and [@types/luxon](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/luxon).


Updates `@types/lodash` from 4.17.25 to 4.17.27
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

Updates `@types/luxon` from 3.7.5 to 3.7.6
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/luxon)

---
updated-dependencies:
- dependency-name: "@types/lodash"
  dependency-version: 4.17.27
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: types
- dependency-name: "@types/luxon"
  dependency-version: 3.7.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: types
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) from 5.0.2 to 5.0.5.
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Changelog](https://github.com/vitest-dev/vitest/blob/main/docs/releases.md)
- [Commits](https://github.com/vitest-dev/vitest/commits/v5.0.5/packages/vitest)

---
updated-dependencies:
- dependency-name: vitest
  dependency-version: 5.0.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [i18next-http-backend](https://github.com/i18next/i18next-http-backend) from 4.0.4 to 4.0.6.
- [Changelog](https://github.com/i18next/i18next-http-backend/blob/master/CHANGELOG.md)
- [Commits](i18next/i18next-http-backend@v4.0.4...v4.0.6)

---
updated-dependencies:
- dependency-name: i18next-http-backend
  dependency-version: 4.0.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [react-dom](https://github.com/react/react/tree/HEAD/packages/react-dom) from 19.3.0 to 19.3.1.
- [Release notes](https://github.com/react/react/releases)
- [Changelog](https://github.com/react/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/react/react/commits/v19.3.1/packages/react-dom)

---
updated-dependencies:
- dependency-name: react-dom
  dependency-version: 19.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [jsdom](https://github.com/jsdom/jsdom) from 30.1.1 to 30.1.3.
- [Release notes](https://github.com/jsdom/jsdom/releases)
- [Commits](jsdom/jsdom@v30.1.1...v30.1.3)

---
updated-dependencies:
- dependency-name: jsdom
  dependency-version: 30.1.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [axios](https://github.com/axios/axios) from 1.20.0 to 1.21.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.20.0...v1.21.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-version: 1.21.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [i18next](https://github.com/i18next/i18next) from 26.4.2 to 26.5.11.
- [Release notes](https://github.com/i18next/i18next/releases)
- [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md)
- [Commits](i18next/i18next@v26.4.2...v26.5.11)

---
updated-dependencies:
- dependency-name: i18next
  dependency-version: 26.5.11
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Currently translated at 99.3% (470 of 473 strings)

Translation: wger Workout Manager/Webapp (frontend)
Translate-URL: https://hosted.weblate.org/projects/wger/frontend/hr/
Retain count interpolation in English one forms for target-language reuse. Record the v4 parser audit and the need to preserve existing Ukrainian and Slovak categories before a Weblate migration.
Bumps the mui group with 5 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [@mui/icons-material](https://github.com/mui/material-ui/tree/HEAD/packages/mui-icons-material) | `9.4.0` | `9.5.0` |
| [@mui/material](https://github.com/mui/material-ui/tree/HEAD/packages/mui-material) | `9.4.0` | `9.5.0` |
| [@mui/system](https://github.com/mui/material-ui/tree/HEAD/packages/mui-system) | `9.4.0` | `9.5.0` |
| [@mui/x-data-grid](https://github.com/mui/mui-x/tree/HEAD/packages/x-data-grid) | `9.14.0` | `9.17.0` |
| [@mui/x-date-pickers](https://github.com/mui/mui-x/tree/HEAD/packages/x-date-pickers) | `9.14.0` | `9.17.0` |



Updates `@mui/icons-material` from 9.4.0 to 9.5.0
- [Release notes](https://github.com/mui/material-ui/releases)
- [Changelog](https://github.com/mui/material-ui/blob/v9.5.0/CHANGELOG.md)
- [Commits](https://github.com/mui/material-ui/commits/v9.5.0/packages/mui-icons-material)

Updates `@mui/material` from 9.4.0 to 9.5.0
- [Release notes](https://github.com/mui/material-ui/releases)
- [Changelog](https://github.com/mui/material-ui/blob/v9.5.0/CHANGELOG.md)
- [Commits](https://github.com/mui/material-ui/commits/v9.5.0/packages/mui-material)

Updates `@mui/system` from 9.4.0 to 9.5.0
- [Release notes](https://github.com/mui/material-ui/releases)
- [Changelog](https://github.com/mui/material-ui/blob/v9.5.0/CHANGELOG.md)
- [Commits](https://github.com/mui/material-ui/commits/v9.5.0/packages/mui-system)

Updates `@mui/x-data-grid` from 9.14.0 to 9.17.0
- [Release notes](https://github.com/mui/mui-x/releases)
- [Changelog](https://github.com/mui/mui-x/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mui/mui-x/commits/v9.17.0/packages/x-data-grid)

Updates `@mui/x-date-pickers` from 9.14.0 to 9.17.0
- [Release notes](https://github.com/mui/mui-x/releases)
- [Changelog](https://github.com/mui/mui-x/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mui/mui-x/commits/v9.17.0/packages/x-date-pickers)

---
updated-dependencies:
- dependency-name: "@mui/icons-material"
  dependency-version: 9.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: mui
- dependency-name: "@mui/material"
  dependency-version: 9.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: mui
- dependency-name: "@mui/system"
  dependency-version: 9.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: mui
- dependency-name: "@mui/x-data-grid"
  dependency-version: 9.16.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: mui
- dependency-name: "@mui/x-date-pickers"
  dependency-version: 9.16.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: mui
...

Signed-off-by: dependabot[bot] <support@github.com>
…_and_yarn/i18next-26.5.11

Bump i18next from 26.4.2 to 26.5.11
…_and_yarn/axios-1.21.0

Bump axios from 1.20.0 to 1.21.0
…_and_yarn/jsdom-30.1.3

Bump jsdom from 30.1.1 to 30.1.3
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.16.1 to 1.16.2.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.16.1...v1.16.2)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-version: 1.16.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…_and_yarn/react-dom-19.3.1

Bump react-dom from 19.3.0 to 19.3.1
…_and_yarn/i18next-http-backend-4.0.6

Bump i18next-http-backend from 4.0.4 to 4.0.6
…_and_yarn/vitest-5.0.5

Bump vitest from 5.0.2 to 5.0.5
…_and_yarn/types-9af14061c6

Bump the types group with 2 updates
rolandgeider and others added 17 commits November 4, 2026 21:01
…_and_yarn/mui-0d92e6726e

Bump the mui group across 1 directory with 5 updates
Bumps [eslint](https://github.com/eslint/eslint) from 10.11.0 to 10.14.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](eslint/eslint@v10.11.0...v10.14.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-version: 10.14.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [i18next-cli](https://github.com/i18next/i18next-cli) from 1.74.2 to 1.81.0.
- [Changelog](https://github.com/i18next/i18next-cli/blob/main/CHANGELOG.md)
- [Commits](i18next/i18next-cli@v1.74.2...v1.81.0)

---
updated-dependencies:
- dependency-name: i18next-cli
  dependency-version: 1.81.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@tanstack/react-query](https://github.com/TanStack/query/tree/HEAD/packages/react-query) from 5.104.0 to 5.105.1.
- [Release notes](https://github.com/TanStack/query/releases)
- [Changelog](https://github.com/TanStack/query/blob/main/packages/react-query/CHANGELOG.md)
- [Commits](https://github.com/TanStack/query/commits/@tanstack/react-query@5.105.1/packages/react-query)

---
updated-dependencies:
- dependency-name: "@tanstack/react-query"
  dependency-version: 5.105.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 8.3.4 to 8.3.5.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v8.3.5/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 8.3.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [react-i18next](https://github.com/i18next/react-i18next) from 17.0.15 to 17.1.10.
- [Changelog](https://github.com/i18next/react-i18next/blob/master/CHANGELOG.md)
- [Commits](i18next/react-i18next@v17.0.15...v17.1.10)

---
updated-dependencies:
- dependency-name: react-i18next
  dependency-version: 17.1.10
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@testing-library/user-event](https://github.com/testing-library/user-event) from 14.6.7 to 14.6.8.
- [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@v14.6.7...v14.6.8)

---
updated-dependencies:
- dependency-name: "@testing-library/user-event"
  dependency-version: 14.6.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…_and_yarn/eslint-10.14.0

Bump eslint from 10.11.0 to 10.14.0
…_and_yarn/i18next-cli-1.81.0

Bump i18next-cli from 1.74.2 to 1.81.0
…_and_yarn/react-i18next-17.1.10

Bump react-i18next from 17.0.15 to 17.1.10
…_and_yarn/tanstack/react-query-5.105.1

Bump @tanstack/react-query from 5.104.0 to 5.105.1
…_and_yarn/follow-redirects-1.16.2

Bump follow-redirects from 1.16.1 to 1.16.2
…_and_yarn/vite-8.3.5

Bump vite from 8.3.4 to 8.3.5
…_and_yarn/testing-library/user-event-14.6.8

Bump @testing-library/user-event from 14.6.7 to 14.6.8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants