Skip to content
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

chore: Merge feature branch to master branch #521

Merged
merged 96 commits into from
Mar 22, 2024
Merged
Changes from 1 commit
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
d93d099
chore(deps-dev): bump rc-tabs from 12.15.0 to 14.0.0
dependabot[bot] Jan 27, 2024
168bc04
improve(design): Remove resetStyle for all components
dengfuping Jan 29, 2024
5bc4443
chore(deps-dev): bump rc-table from 7.36.1 to 7.38.1
dependabot[bot] Jan 30, 2024
ca8490d
Merge pull request #457 from oceanbase/master
dengfuping Feb 2, 2024
62a7ee0
Merge pull request #450 from oceanbase/dengfuping-design
dengfuping Feb 2, 2024
b8cc880
Merge pull request #453 from oceanbase/dependabot/npm_and_yarn/rc-tab…
dengfuping Feb 2, 2024
58b8c0f
Merge pull request #439 from oceanbase/dependabot/npm_and_yarn/rc-tab…
dengfuping Feb 2, 2024
47bb029
chore(deps): target-branch change to feature and ignore ahooks upgrade
dengfuping Feb 5, 2024
9b6e459
Merge pull request #458 from oceanbase/feature-dengfuping
dengfuping Feb 5, 2024
ada947a
improve(design): style order should behind of antd to cover it
dengfuping Feb 5, 2024
f5c04c3
Merge pull request #464 from oceanbase/dengfuping-design-style-priority
dengfuping Feb 6, 2024
787f974
feat(design): New design for Empty
dengfuping Feb 6, 2024
359359c
Merge pull request #465 from oceanbase/dengfuping-design-feature
dengfuping Feb 6, 2024
2069fa7
fix(design): Simple Empty image and description style should be correct
dengfuping Feb 6, 2024
28af419
Merge pull request #466 from oceanbase/dengfuping-design-feature
dengfuping Feb 6, 2024
8a5b120
feat(design): Customize ConfigProvider renderEmpty for all components
dengfuping Feb 6, 2024
030ab08
Merge pull request #467 from oceanbase/dengfuping-design-feature
dengfuping Feb 6, 2024
b29e217
[Feature Branch] chore(deps): Upgrade deps (#468)
dengfuping Feb 6, 2024
f473d9c
[Feature Branch] chore(deps): Upgrade antd v5.13 => v5.14 (#475)
dengfuping Feb 18, 2024
a51be6a
[Feature Branch] 🔥 feat(design): New design for Result (#476)
dengfuping Feb 18, 2024
ff8d222
[Feature Branch] bump @qixian.cs/github-contributors-list
dependabot[bot] Feb 18, 2024
3866c3a
[Feature Branch] bump rc-drawer from 7.0.0 to 7.1.0
dependabot[bot] Feb 18, 2024
aae6e5e
[Feature Branch] bump @vercel/analytics from 1.1.3 to 1.2.0
dependabot[bot] Feb 18, 2024
f39e070
[Feature Branch] bump vanilla-jsoneditor from 0.21.5 to 0.21.6
dependabot[bot] Feb 18, 2024
14cb838
[Feature Branch] bump react-router-dom from 6.22.0 to 6.22.1
dependabot[bot] Feb 18, 2024
2d400be
Merge pull request #482 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Feb 19, 2024
c3010d4
Merge pull request #481 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Feb 19, 2024
b2dc689
Merge pull request #480 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Feb 19, 2024
d74af3e
Merge pull request #479 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Feb 19, 2024
8c65b65
Merge pull request #478 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Feb 19, 2024
e14d72b
improve(design): Update neutral color palette
dengfuping Feb 19, 2024
7c48beb
[Feature Branch] bump postcss from 8.4.34 to 8.4.35
dependabot[bot] Feb 19, 2024
ad48c91
[Feature Branch] bump husky from 8.0.3 to 9.0.11
dependabot[bot] Feb 19, 2024
8f8c302
[Feature Branch] bump @vercel/analytics from 1.2.0 to 1.2.1
dependabot[bot] Feb 19, 2024
26c37a3
[Feature Branch] bump @types/react from 18.2.54 to 18.2.56
dependabot[bot] Feb 19, 2024
2d140e8
Merge pull request #489 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Feb 20, 2024
1edd84d
Merge pull request #488 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Feb 20, 2024
295e32a
Merge pull request #485 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Feb 20, 2024
eb9d240
Merge pull request #486 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Feb 20, 2024
ab86794
[Feature Branch] bump @types/node from 20.11.16 to 20.11.19
dependabot[bot] Feb 20, 2024
0e62128
Merge pull request #487 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Feb 20, 2024
51f7cf5
Merge pull request #484 from oceanbase/dengfuping-feature-design
dengfuping Feb 23, 2024
aba167d
improve(design): Spin default indicator change to gray animation
dengfuping Feb 23, 2024
14bbf27
Merge pull request #491 from oceanbase/dengfuping-design-spin
dengfuping Feb 23, 2024
6c51412
improve(ui): PageContainer loading change to vertical align
dengfuping Feb 23, 2024
ff9ecc4
[Feature Branch] bump eslint-plugin-jest from 27.6.3 to 27.9.0
dependabot[bot] Feb 26, 2024
16b0d42
[Feature Branch] bump query-string from 8.2.0 to 9.0.0
dependabot[bot] Feb 26, 2024
8167fb5
[Feature Branch] bump @vercel/analytics from 1.2.1 to 1.2.2
dependabot[bot] Feb 26, 2024
a47fef7
[Feature Branch] bump @types/react from 18.2.56 to 18.2.62
dependabot[bot] Mar 4, 2024
7aad3df
Merge pull request #498 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Mar 5, 2024
cbd09bb
Merge pull request #496 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Mar 5, 2024
6e71fc0
Merge pull request #492 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Mar 5, 2024
97c9225
[Feature Branch] bump @umijs/test from 4.1.1 to 4.1.2
dependabot[bot] Mar 5, 2024
aac3af7
Merge pull request #493 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Mar 5, 2024
0cab973
feat(icons): Add EllipsisCircleFilled icon
dengfuping Mar 5, 2024
9581041
chore: Merge feature branch and fix conflicts
dengfuping Mar 5, 2024
c268500
Merge pull request #499 from oceanbase/dengfuping-feature-design
dengfuping Mar 5, 2024
a142b65
improve(design): default color, default icon and warning icon for Bad…
dengfuping Mar 5, 2024
d492f4c
Merge pull request #500 from oceanbase/dengfuping-feature-design-badge
dengfuping Mar 5, 2024
b1ab1e1
Merge pull request #494 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Mar 5, 2024
7754858
feat(ui): Add PageLoading component
dengfuping Feb 27, 2024
2c2e76a
Merge pull request #497 from oceanbase/dengfuping-design-spin
dengfuping Mar 5, 2024
243ed91
improve(design): Empty image and style
dengfuping Mar 8, 2024
a066733
fix(test): Upgrade deps and update snapshots
dengfuping Mar 8, 2024
99e253b
Merge pull request #502 from oceanbase/dengfuping-feature-design
dengfuping Mar 8, 2024
f398077
improve(design): Result image, style and demo
dengfuping Mar 11, 2024
64c02eb
Merge pull request #503 from oceanbase/dengfuping-feature-design
dengfuping Mar 11, 2024
f39d653
[Feature Branch] improve(test): Migrate from jest to vitest (#483)
dengfuping Mar 11, 2024
7108641
Merge pull request #505 from oceanbase/master
dengfuping Mar 11, 2024
b2ef80f
[Feature Branch] bump vanilla-jsoneditor from 0.21.6 to 0.22.0
dependabot[bot] Mar 11, 2024
3884d33
[Feature Branch] bump @rc-component/trigger from 1.18.3 to 2.0.0
dependabot[bot] Mar 11, 2024
37ad36f
Merge pull request #507 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Mar 12, 2024
1b4fe8d
Merge pull request #506 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Mar 12, 2024
f1f57a2
Merge pull request #509 from oceanbase/master
dengfuping Mar 12, 2024
99b9d92
fix(design): Result 500 image and content border-radius
dengfuping Mar 14, 2024
51bccec
Merge pull request #510 from oceanbase/dengfuping-feature-design
dengfuping Mar 14, 2024
8825d5e
improve(codemod): rgb(250,250,250) => colorBgLayout for style-to-toke…
dengfuping Mar 14, 2024
ec8c12f
Merge pull request #511 from oceanbase/dengfuping-feature-design
dengfuping Mar 14, 2024
13b91ab
improve(design): Update Spin animation json
dengfuping Mar 15, 2024
f8642f3
Merge pull request #512 from oceanbase/dengfuping-feature-design
dengfuping Mar 15, 2024
58a34d3
[Feature Branch] bump antd from 5.15.2 to 5.15.3
dependabot[bot] Mar 18, 2024
976fde3
[Feature Branch] bump vanilla-jsoneditor from 0.22.0 to 0.23.0
dependabot[bot] Mar 18, 2024
8bd8ba7
improve(design): hide Table empty when loading
dengfuping Mar 20, 2024
fb38101
Merge pull request #518 from oceanbase/dengfuping-feature-design
dengfuping Mar 20, 2024
6963bde
Merge pull request #517 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Mar 20, 2024
da1a191
Merge pull request #515 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Mar 20, 2024
a393e2c
[Feature Branch] bump @ant-design/icons from 5.3.1 to 5.3.4
dependabot[bot] Mar 20, 2024
848e99f
[Feature Branch] bump @ant-design/pro-layout from 7.17.19 to 7.17.20
dependabot[bot] Mar 20, 2024
5bdeb23
[Feature Branch] bump vitest from 1.3.1 to 1.4.0
dependabot[bot] Mar 20, 2024
4c74068
Merge pull request #516 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Mar 20, 2024
1dfa625
Merge pull request #514 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Mar 20, 2024
3cf4018
Merge pull request #513 from oceanbase/dependabot/npm_and_yarn/featur…
dengfuping Mar 20, 2024
e212aff
feat(codemod): Add more color map to token for style-to-token and les…
dengfuping Mar 22, 2024
a989cbe
Merge pull request #519 from oceanbase/dengfuping-feature-design
dengfuping Mar 22, 2024
b551716
chore(docs): Add changelog for @oceanbase/[email protected], @oceanbase/ui…
dengfuping Mar 22, 2024
a6634d9
Merge pull request #520 from oceanbase/dengfuping-feature-changelog
dengfuping Mar 22, 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
Merge pull request #509 from oceanbase/master
[Feature Branch] chore: Merge master branch
dengfuping authored Mar 12, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit f1f57a263ab1133c73a16d7aacf3a8c31e8efbdb

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.