Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
495d2ee
feat: Split Toolpad into Core and Studio
bharatkashyap Feb 26, 2024
2c94fda
Upstream merge
bharatkashyap Feb 26, 2024
40b87e1
Merge branch 'master' of github.com:mui/mui-toolpad into docs/toolpad…
bharatkashyap Feb 26, 2024
e76a3c3
fix: markdownlint, studio docs component API
bharatkashyap Feb 26, 2024
b1924f8
fix: port old docs
bharatkashyap Feb 26, 2024
cb808ae
fix: Hide Core from navigation for now
bharatkashyap Feb 27, 2024
5fbf368
Merge branch 'master' of github.com:mui/mui-toolpad into docs/toolpad…
bharatkashyap Feb 27, 2024
9539f0c
fix: Merge
bharatkashyap Feb 27, 2024
c79bfa8
fix: @mui/monorepo
bharatkashyap Feb 27, 2024
680e4a6
Merge branch 'master' of github.com:mui/mui-toolpad into docs/toolpad…
bharatkashyap Feb 27, 2024
2403fcc
fix: path, misc hygiene
bharatkashyap Feb 27, 2024
5e5ed57
fix: match earlier pattern
bharatkashyap Feb 27, 2024
f02f749
fix: Incorrect path
bharatkashyap Feb 27, 2024
0baf4fb
fix: Preserve original
bharatkashyap Feb 27, 2024
23634d7
fix: page structure
bharatkashyap Feb 27, 2024
713a935
test: _redirects using wildcard
bharatkashyap Feb 29, 2024
f6c9ccb
fix: missed renaming
bharatkashyap Feb 29, 2024
05cdb27
fix: missed adding
bharatkashyap Feb 29, 2024
0ea9373
Merge remote-tracking branch 'upstream/master' into docs/toolpad-core
bharatkashyap Feb 29, 2024
b08d5e8
fix: badly resolved merge
bharatkashyap Feb 29, 2024
efe1a62
fix: Use category and ID
bharatkashyap Feb 29, 2024
39a5864
fix: CI
bharatkashyap Feb 29, 2024
863e7be
fix: Jan review 1
bharatkashyap Mar 2, 2024
2180f68
fix: missed
bharatkashyap Mar 3, 2024
28901e6
Merge branch 'master' into docs/toolpad-core
bharatkashyap Mar 3, 2024
a469ea0
Merge branch 'master' of github.com:mui/mui-toolpad into docs/toolpad…
bharatkashyap Mar 4, 2024
d8597a2
Merge branch 'docs/toolpad-core' of github.com:bharatkashyap/mui-tool…
bharatkashyap Mar 4, 2024
b953889
Merge branch 'master' of github.com:mui/mui-toolpad into docs/toolpad…
bharatkashyap Mar 4, 2024
9a73802
fix: Rename static content paths
bharatkashyap Mar 4, 2024
f17fc60
fix: Vale should have caught this
bharatkashyap Mar 4, 2024
9134bc6
fix: API page link redirects
bharatkashyap Mar 4, 2024
09ca26e
fix: Missed in merge
bharatkashyap Mar 4, 2024
2644032
fix: prettier
bharatkashyap Mar 4, 2024
0d1b511
fix: Why Toolpad? missing
bharatkashyap Mar 4, 2024
3406ed0
Merge branch 'master' of github.com:mui/mui-toolpad into docs/toolpad…
bharatkashyap Mar 5, 2024
2209c63
fix: Backwards compat with @mui/material
bharatkashyap Mar 5, 2024
0309f2d
fix: corrupted in merge
bharatkashyap Mar 6, 2024
1bd3de4
fix: Add `/toolpad/core`
bharatkashyap Mar 7, 2024
e89e0da
fix: Remove vale warnings on WIP pages
bharatkashyap Mar 7, 2024
3118d9b
fix: More vale fixes
bharatkashyap Mar 7, 2024
c915668
Merge branch 'master' into docs/toolpad-core
bharatkashyap Mar 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: Missed in merge
  • Loading branch information
bharatkashyap committed Mar 4, 2024
commit 09ca26eae64029fea6a799fd21576fa656669c2c
7 changes: 3 additions & 4 deletions docs/pages/toolpad/authentication.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import * as React from 'react';
import MarkdownDocs from 'docs/src/modules/components/MarkdownDocs';
<<<<<<<< HEAD:docs/pages/toolpad/authentication.js
import * as pageProps from '../../data/toolpad/authentication.md?muiMarkdown';
========
import * as pageProps from '../../../data/toolpad/components/data-grid/data-grid.md?muiMarkdown';
>>>>>>>> 7b71a4a53e369dd7a3caef2b9ab74cbafeede638:docs/pages/toolpad/data-grid.js




export default function Page() {
return <MarkdownDocs disableAd {...pageProps} />;
Expand Down