Skip to content

Commit 1f9ea90

Browse files
committed
Merge remote-tracking branch 'origin/master' into next
2 parents d145f1e + 6bf3c34 commit 1f9ea90

File tree

39 files changed

+364
-1103
lines changed

39 files changed

+364
-1103
lines changed

.greenframe.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## 5.11.2
4+
5+
* Fix `<BulkDeleteWithConfirmButton>` default color ([#10928](https://github.com/marmelab/react-admin/pull/10928)) ([wmatex](https://github.com/wmatex))
6+
* Fix `RaDataTable-rowCell` CSS class is not applied on `<DataTable>` cells ([#10933](https://github.com/marmelab/react-admin/pull/10933)) ([djhi](https://github.com/djhi))
7+
* Fix passing an element to `notify` requires to wrap it in `forwardRef` ([#10935](https://github.com/marmelab/react-admin/pull/10935)) ([djhi](https://github.com/djhi))
8+
* [Doc] Update `<TreeInput>` assets and doc ([#10929](https://github.com/marmelab/react-admin/pull/10929)) ([slax57](https://github.com/slax57))
9+
* [TypeScript] Fix inputs and fields label type ([#10922](https://github.com/marmelab/react-admin/pull/10922)) ([djhi](https://github.com/djhi))
10+
* [Demo] Fix demos with MSW ([#10920](https://github.com/marmelab/react-admin/pull/10920)) ([Madeorsk](https://github.com/Madeorsk))
11+
* [website] Remove greenframe widget ([#10934](https://github.com/marmelab/react-admin/pull/10934)) ([djhi](https://github.com/djhi))
12+
* [chore] Fix security vulnerabilities affecting `astro` and `ejs` ([#10937](https://github.com/marmelab/react-admin/pull/10937)) ([slax57](https://github.com/slax57))
13+
* [chore] Remove Greenframe CI step config ([#10936](https://github.com/marmelab/react-admin/pull/10936)) ([slax57](https://github.com/slax57))
14+
* [chore] Bump vite from 6.3.5 to 6.3.6 ([#10931](https://github.com/marmelab/react-admin/pull/10931)) ([dependabot[bot]](https://github.com/apps/dependabot))
15+
316
## 5.11.1
417

518
* Fix `<Datagrid>` and `<DataTable>` bulk selection ([#10918](https://github.com/marmelab/react-admin/pull/10918)) ([djhi](https://github.com/djhi))

docs/Scheduler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ title: "The Scheduler Component"
55

66
# `<Scheduler>`
77

8-
This [Enterprise Edition](https://react-admin-ee.marmelab.com)<img class="icon" src="./img/premium.svg" alt="React Admin Enterprise Edition icon" /> component, part of [`ra-scheduler`](https://react-admin-ee.marmelab.com/documentation/ra-search), is a full-featured scheduler for managing tasks, assignments, events, scheduling constraints and dependencies, completion, recurring events, property booking, skill matrix, nested events, etc.
8+
This [Enterprise Edition](https://react-admin-ee.marmelab.com)<img class="icon" src="./img/premium.svg" alt="React Admin Enterprise Edition icon" /> component, part of [`ra-scheduler`](https://react-admin-ee.marmelab.com/documentation/ra-scheduler), is a full-featured scheduler for managing tasks, assignments, events, scheduling constraints and dependencies, completion, recurring events, property booking, skill matrix, nested events, etc.
99

1010
<video controls autoplay playsinline muted loop>
1111
<source src="https://react-admin-ee.marmelab.com/assets/ra-scheduler.mp4" type="video/mp4"/>

docs_headless/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/mdx": "^4.3.1",
14-
"@astrojs/react": "^4.3.0",
15-
"@astrojs/starlight": "0.35.2",
13+
"@astrojs/mdx": "^4.3.5",
14+
"@astrojs/react": "^4.3.1",
15+
"@astrojs/starlight": "^0.35.3",
1616
"@astrojs/starlight-tailwind": "^4.0.1",
1717
"@expressive-code/plugin-collapsible-sections": "^0.41.3",
1818
"@tailwindcss/vite": "^4.1.11",
1919
"@types/react": "^19.1.8",
2020
"@types/react-dom": "^19.1.6",
21-
"astro": "5.12.6",
21+
"astro": "^5.13.7",
2222
"astro-expressive-code": "^0.41.3",
2323
"astro-rehype-relative-markdown-links": "^0.18.1",
2424
"expressive-code-fullscreen": "^1.0.0",

examples/data-generator/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "data-generator-retail",
3-
"version": "5.11.1",
3+
"version": "5.11.2",
44
"homepage": "https://github.com/marmelab/react-admin/tree/master/examples/data-generator",
55
"bugs": "https://github.com/marmelab/react-admin/issues",
66
"license": "MIT",
@@ -19,7 +19,7 @@
1919
},
2020
"devDependencies": {
2121
"cross-env": "^5.2.0",
22-
"ra-core": "^5.11.1",
22+
"ra-core": "^5.11.2",
2323
"rimraf": "^3.0.2",
2424
"typescript": "^5.1.3"
2525
},

examples/simple/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "simple",
3-
"version": "5.11.1",
3+
"version": "5.11.2",
44
"private": true,
55
"type": "module",
66
"scripts": {
@@ -17,13 +17,13 @@
1717
"fakerest": "^4.1.3",
1818
"jsonexport": "^3.2.0",
1919
"lodash": "~4.17.5",
20-
"ra-data-fakerest": "^5.11.1",
21-
"ra-i18n-polyglot": "^5.11.1",
22-
"ra-input-rich-text": "^5.11.1",
23-
"ra-language-english": "^5.11.1",
24-
"ra-language-french": "^5.11.1",
20+
"ra-data-fakerest": "^5.11.2",
21+
"ra-i18n-polyglot": "^5.11.2",
22+
"ra-input-rich-text": "^5.11.2",
23+
"ra-language-english": "^5.11.2",
24+
"ra-language-french": "^5.11.2",
2525
"react": "^18.3.1",
26-
"react-admin": "^5.11.1",
26+
"react-admin": "^5.11.2",
2727
"react-dom": "^18.3.1",
2828
"react-hook-form": "^7.53.0",
2929
"react-router": "^6.28.1",

greenframe/catalog.js

Lines changed: 0 additions & 62 deletions
This file was deleted.

greenframe/customers.js

Lines changed: 0 additions & 67 deletions
This file was deleted.

greenframe/sales.js

Lines changed: 0 additions & 81 deletions
This file was deleted.

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"lerna": "2.5.1",
33
"packages": ["examples/data-generator", "examples/simple", "packages/*"],
4-
"version": "5.11.1",
4+
"version": "5.11.2",
55
"npmClient": "yarn"
66
}

0 commit comments

Comments
 (0)