MadCcc
ffef094c9c
fix: set icon line height 0 ( #37287 )
2022-08-29 19:06:55 +08:00
MadCcc
c0653c8a3c
feat: v5 margin ( #37283 )
...
* feat: v5 margin
* fix: alert icon line-height
2022-08-29 17:09:41 +08:00
lijianan
58a1268356
type: strong type ( #37258 )
2022-08-28 22:29:14 +08:00
MadCcc
ec13e824be
feat: v5 shadow & colorPrimary ( #37254 )
...
* feat: v5 shadow
* chore: color lint
* test: fix test case
2022-08-26 16:05:16 +08:00
lijianan
e2a927ee52
test: migrate part of Notification tests ( #37253 )
...
* test: migrate part of Notification tests
* test: migrate part of Notification tests
* test: migrate part of Notification tests
* test: migrate part of Notification tests
2022-08-26 16:00:38 +08:00
MadCcc
93908debec
feat: v5 radius ( #37146 )
...
* feat: v5 radius
* test: fix test
2022-08-19 10:10:51 +08:00
尾宿君
7bbdd0d282
test: replace notification part test with testing lib ( #36924 )
2022-08-08 22:43:39 +08:00
clean99
1239910f66
test: change act import from utils use act wrap timer and not wrap fireEvent ( #36921 )
...
Co-authored-by: ian.xufeng <ian.xufeng@shopee.com>
2022-08-08 13:31:55 +08:00
MadCcc
1ad0553249
refactor: token update ( #36637 )
...
* refactor: token update
* refactor: token
* chore: error color
* fix: menu danger
2022-07-21 17:00:42 +08:00
MadCcc
cdbfe45df1
feat: generate anchor style for all components ( #36460 )
...
* test: fix lint
* chore: code clean
* doc: anchor color
* chore: style order
2022-07-11 15:35:58 +08:00
MadCcc
b6b4f36523
test: fix lint
2022-07-05 22:38:57 +08:00
MadCcc
f65c73fa2a
Merge branch 'master' into next-merge-master
2022-07-05 22:24:39 +08:00
MadCcc
8e27cf986f
chore: rm component less file ( #36244 )
...
* chore: rm component less file
* refactor: less file
* refactor: rm less
* refactor: rm page-header and comment
* chore: rm less in components
* chore: update dist config
* chore: update image test
* chore: update dekko
* chore: rm lib dekko
* chore: update dist dekko
* chore: udpate bundle size
* test: update snapshot
* test: rm theme test
* test: update snapshot
* test: update snapshot
* chore: copy reset.css
* test: update image test
* chore: copy reset.css to es
* chore: update site script
2022-07-05 21:55:21 +08:00
MadCcc
ab19033876
docs: replace lib with es ( #36367 )
2022-07-04 22:09:54 +08:00
二货机器人
de2992f96f
chore: move path ( #36243 )
...
* chore: base move
* chore: all path
* chore: fix script
2022-06-27 14:25:59 +08:00
zombiej
d4e7ae0e9e
chore: rm useless file
2022-06-22 15:48:17 +08:00
zombiej
07520b44c4
chore: fix merge conflict
2022-06-22 15:31:47 +08:00
zombiej
8749c1ae04
chore: merge master
2022-06-22 15:18:03 +08:00
二货机器人
2c2c631bfd
chore: prettier components ( #36171 )
2022-06-22 14:57:09 +08:00
MadCcc
5639e1a5ba
feat: update token ( #36095 )
...
* feat: update token
* feat: update token
* fix: override ts definition
* fix: rename token
2022-06-17 18:47:47 +08:00
二货机器人
c720965d13
refactor: rename of _InternalPanelDoNotUseOrYouWillBeFired ( #36028 )
2022-06-13 17:55:00 +08:00
二货机器人
ec21769ec0
chore: Notification add PurePanel ( #35948 )
...
* chore: Notification add purePanel
* test: Update snapshot
* test: Update snapshot
2022-06-08 17:01:26 +08:00
二货机器人
b53b4cf620
chore: Add pure component of message ( #35931 )
...
* feat: Add pure component of message
* test: Updare snapshot
2022-06-07 23:29:12 +08:00
PCCCCCCC
1d09d6fe0c
Replace part of the Demo of the notification with the hooks ( #35710 )
...
* docs: modify the part demo to hooks
* docs: modify the part demo to hooks
2022-05-25 10:14:51 +08:00
zombiej
f58efe9b32
chore: merge master
2022-05-23 14:37:16 +08:00
zombiej
cd0ace3d40
chore: merge master
2022-05-21 22:14:15 +08:00
MadCcc
3a388d24b7
refactor: notification full token ( #35656 )
...
* refactor: notification full token
* chore: code clean
* test: fix lint
2022-05-20 17:40:03 +08:00
章鱼
7fd093bd0a
docs: feat components TS demo ( #34742 )
...
* docs: add general components TS demo
* docs: add layout components TS demo
* docs: add navigation components TS demo
* docs: add data entry components TS demo
* chore(deps): add types for qs
* docs: add data display TS demo
* docs: add feedback components TS demo
* docs: add other components TS demo
* chore(deps): add types
* docs: unified demo code style
* docs: fix lint error
* docs: add demo TS type
* docs: fix demo TS type
* test: update snapshot
* docs: fix TS demo
* feat: update Rate character type
* docs: fix lint error
* feat: update Rate character type
* feat: update Rate character type
2022-05-19 09:46:26 +08:00
PCCCCCCC
397fa6172d
Refactor:Component Notification Less to cssinjs ( #35559 )
...
* refactor: complete the basic less refactor
* refactor: complete the Notification part of placement
* refactor: complete the Notification part of RTL
* refactor: add necessary FIXME for Notification
* chore: remove useless code for Notification
* style: remove useless code
* refactor: fix the float style issue
2022-05-17 20:15:34 +08:00
二货机器人
178d8d6f19
chore: Patch Notification tmpl ( #35568 )
...
* chore: init notification style
* chore: comment style
* chore: clean up recv deps
* chore: trigger
2022-05-16 18:02:46 +08:00
afc163
2842524850
chore: sync master into next branch
2022-05-11 16:00:22 +08:00
二货机器人
2341a25d91
feat: refactor useNotification ( #35423 )
...
* more refactor
* chore: motion support
* chore: tmp test
* test: Hooks
* chore: static function
* tmp of it
* all of it
* mv prefix
* chore: clean up
* chore: clean up
* more test case
* test: all base test
* test: all test case
* init
* refactor: rm notification.open instance related code
* follow up
* refactor: singlton
* test: notification test case
* refactor to destroy
* refactor: message base
* test: part test case
* test: more
* test: more
* test: all test
* chore: clean up
* docs: reorder
* chore: fix lint
* test: fix test case
* chore: add act
* chore: back
* chore: fix style
* test: notification test
* test: more and more
* test: fix more test
* test: index
* test: more & more
* test: fix placement
* test: fix coverage
* chore: clean up
* chore: bundle size
* fix: 17
* chore: more
* test: message
* test: more test
* fix: lint
* test: rm class in static
* chore: clean up
* test: coverage
* chore: fix lint
2022-05-11 14:26:18 +08:00
Tom Xu
1719748a29
chore: eslint add consistent-type-imports ( #35419 )
...
* chore: eslint add consistent-type-imports
* fix avatar
* Update Item.tsx
2022-05-07 14:31:54 +08:00
Cooper Veysey
d8ab5a5771
Resolve Ant Design Notification component TypeScript error via adding maxCount as an ArgsProps property ( #35369 )
2022-05-05 14:06:57 +08:00
afc163
0f0e2f9f43
docs: simplify demo code, #30853 ( #35050 )
2022-04-15 16:20:56 +08:00
二货机器人
67ccf39bd3
fix: Notification & message throw createRoot
warning in React 18 ( #35030 )
...
* chore: bump notification version
* test: notification test case
* test: more test case
* test: part message test
* test: rest message test
* test: notification config test
2022-04-14 18:09:19 +08:00
MadCcc
6776bb8916
docs: demo support react18 ( #34843 )
...
* docs: update demo
* chore: add script
* test: fix demo test
* docs: convert demos
* chore: move script
* test: remove react-dom import
* chore: update deps
* docs: update riddle js
* test: fix image test
* docs: fix riddle demo
2022-04-03 23:27:45 +08:00
afc163
1935ece582
fix: notification prevent interaction on elements which under it ( #34716 )
...
* fix: notification prevent interaction on elements which under it
close #34700
* fix test case
2022-03-25 19:38:28 +08:00
MadCcc
76ad890deb
Merge branch 'master' into feature-merge-master
2022-02-15 14:05:33 +08:00
二货机器人
31fb55adf3
chore: btn default provide default cls ( #34013 )
2022-02-11 15:02:59 +08:00
MadCcc
6b1a48d5ed
revert: Revert "Merge branch 'feature' into master" ( #33903 )
...
This reverts commit 40433f357d
, reversing
changes made to 27a498e021
.
2022-01-30 15:21:41 +08:00
黑雨
5a28417c58
feat: notification placement support 'top'/'bottom' ( #33871 )
2022-01-27 17:26:19 +08:00
二货机器人
2df11184f4
test: Demo check popup content ( #33378 )
...
* auto demo
* chore: update demo snapshot
* fix: trigger mock ref logic
* chore: try 2 test case
* chore: more snapshot
* chore: update snapshot
* chore: fix ts
* chore: split test
* test: Update test case
* chore: fix test order
2021-12-23 11:51:10 +08:00
二货机器人
ce006bd44e
docs: Version Robin ( #32830 )
2021-11-12 11:46:42 +08:00
dependabot[bot]
b445baa001
chore(deps-dev): bump stylelint-config-prettier from 8.0.2 to 9.0.2 ( #32451 )
...
* chore(deps-dev): bump stylelint-config-prettier from 8.0.2 to 9.0.2
Bumps [stylelint-config-prettier](https://github.com/prettier/stylelint-config-prettier ) from 8.0.2 to 9.0.2.
- [Release notes](https://github.com/prettier/stylelint-config-prettier/releases )
- [Commits](https://github.com/prettier/stylelint-config-prettier/compare/v8.0.2...v9.0.2 )
---
updated-dependencies:
- dependency-name: stylelint-config-prettier
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* chore: autofix stylelint errors
* chore: autofix stylelint errors
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: afc163 <afc163@gmail.com>
2021-10-13 15:38:59 +08:00
Karott Schu
27c3b51c18
fix: Notification closeIcon don't update ( #32351 ) ( #32359 )
...
* fix: Notification closeIcon don't update (#32351 )
* add test case for Notification closeIcon (#32351 )
Co-authored-by: shuzhiqiang <shuzhiqiang@megalinkps.cn>
2021-10-02 14:14:31 +08:00
二货机器人
e13c4d4131
fix: Less Maximum call stack size exceeded error ( #32063 )
...
* chore: create additional entry
* fix: rm recv call
* chore: Add default.less as index.less
* chore: update entry
* fix: row should also translate
* chore: rename index-default to index and add index-pure instead
* fix: missing transfer customize styl
2021-09-07 16:14:20 +08:00
binyellow
bbb7e968f6
feat: Notification support maxCount ( #31807 )
...
Co-authored-by: branhuang <branhuang@tencent.com>
2021-08-17 10:45:33 +08:00
二货机器人
eb70f00513
feat: ConfigProvider static function support iconPrefixCls
( #30925 )
...
* feat: Static iconPrefixCls
* feat: message & notification support iconPrefixCls
* docs: Update doc
* chore: Force update
* fix: ts def
2021-06-09 15:36:59 +08:00
afc163
f3d5470804
fix: useNotification className should work ( #30588 )
...
close #30576
2021-05-19 17:31:03 +08:00
陈帅
c673cde7de
merge Feature into master ( #29758 )
...
* feat: add onCancel and onEnd option for editable (#29615 )
* feature: add onCancel and onEnd option for editable
* doc: editable
* doc: add EN doc
* optimize: code
Co-authored-by: chenliang <chenliang9@xiaomi.com>
* feat: add parent class for different notification types (#29634 )
close #29417
* refactor: Upload use origin behavior (#29737 )
* refactor: Fallback of events
* test: Fix test case
* fix: Start file update logic
* fix: remove status update
* test: Remove wrapTest
* test: Fix test case
* chore: bump rc-upload
* docs: About desc
* feat: tab support moreIcon (#29744 )
* feat: Tabs support moreIcon
* docs: Tabs support moreIcon
* style: lint
* docs: add english document
* Update components/tabs/index.zh-CN.md
Co-authored-by: xrkffgg <xrkffgg@vip.qq.com>
* Update components/tabs/index.en-US.md
Co-authored-by: xrkffgg <xrkffgg@vip.qq.com>
* Update components/tabs/index.zh-CN.md
* Update components/tabs/index.en-US.md
Co-authored-by: zty <zty.dev@outlook.com>
Co-authored-by: zty <zty.dev@icloud.com>
Co-authored-by: xrkffgg <xrkffgg@vip.qq.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: jueinin <1014397160@qq.com>
Co-authored-by: chenliang <chenliang9@xiaomi.com>
Co-authored-by: 不吃猫的鱼 <michael2ib1989@gmail.com>
Co-authored-by: 二货机器人 <smith3816@gmail.com>
Co-authored-by: Tianyuan Zhang <tianyuan233.zhang@gmail.com>
Co-authored-by: zty <zty.dev@outlook.com>
Co-authored-by: zty <zty.dev@icloud.com>
Co-authored-by: xrkffgg <xrkffgg@vip.qq.com>
2021-03-13 23:46:32 +08:00
Tom Xu
e5d908a078
docs: format api ( #29537 )
2021-03-01 19:20:48 +08:00
afc163
76434a15df
chore( 🆙 ): upgrade devDeps ( #29418 )
...
* chore(🆙 ): upgrade devDeps
* prettier code
* fix dnd demo
* fix react-dnd demo
* fix npm start and demo tsx compile
* fix snapshot
2021-02-23 10:45:11 +08:00
叶枫
10c326ee94
feat: 添加全局静态配置 ( #29285 )
...
* feat: 添加全局静态配置
* chore: change globalConfig
* chore: change globalPrefixCls
* chore: review
* feat: 恢复 message 静态 prefix
* feat: modal
* feat: notification
* fix: prefix
* fix: prefix
* fix: 添加 test
* chore: review
* docs: doc
* chore: en
* chore: test
* fix: notification config set empty
* chore: link
* chore: change name
* chore: doc
* chore: doc
2021-02-09 21:49:15 +08:00
偏右
9946e6c56f
style: fix notification closing style of hooks ( #28660 )
...
close #28143
2021-01-04 16:19:32 +08:00
Chan Qin Liang
263d8ec8e8
Include parenthesis on mixin calls to support less 4.0.0 ( #28465 )
2020-12-22 11:08:12 +08:00
dependabot[bot]
775d1800bb
chore(deps-dev): bump eslint-config-prettier from 6.15.0 to 7.0.0 ( #28253 )
...
* chore(deps-dev): bump eslint-config-prettier from 6.15.0 to 7.0.0
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier ) from 6.15.0 to 7.0.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases )
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md )
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.15.0...v7.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
* chore: fix eslint style
* chore: prettier code style
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: afc163 <afc163@gmail.com>
2020-12-09 17:12:32 +08:00
偏右
e7bed7cff7
perf( 📦 ): upgrade @ant-design/colors and remove rc-trigger from deps ( #27761 )
...
* perf(📦 ): upgrade @ant-design/colors
* move rc-trigger to devDeps
* fix lint
* update snapshot
* update snapshot
Co-authored-by: 二货机器人 <smith3816@gmail.com>
2020-11-14 00:43:12 +08:00
afc163
7f8957eb9a
docs( 📖 ): improve useModal FAQ
2020-11-13 16:51:55 +08:00
einq7
3357fccf0e
docs: format inline code ( #27634 )
2020-11-08 15:04:02 +08:00
骗你是小猫咪
6fba4d1136
test: demo -> ui test ( #24475 )
...
* test: demo -> ui test
* improve comment image width
* use argos-ci
* use by cicleci
* fix circle run
* rebase master
* try pipeline var
* use another branch var
* fix commit id
* ignore image test file
* remove useless report
* fix test coverage
2020-10-23 18:50:46 +08:00
小鹅鹅鹅
ed1b31ba36
style: notification 长单词不换行 显示不全 ( #27285 )
...
fix: pass lint
2020-10-22 15:19:04 +08:00
Tom Xu
d44f404eae
docs: sort api ( #27251 )
...
* chore: improve sort api table scripts
* sort api
* add ignore
* Revert "sort api"
This reverts commit 343505d5f0
.
* sort api
* Update package.json
* sort api
* Delete sort-api.js
* sort api
* sort api
* sort api
* fix
* Update index.zh-CN.md
* fix input-number
* fix input-number
* sort func
* fix
* Method moved to the end
* carousel method
2020-10-21 10:33:43 +08:00
偏右
fb9d2e6738
fix: notification width in small screen ( #27189 )
...
close #27188
2020-10-16 16:07:56 +08:00
Tom Xu
5f2588ffd1
docs: improve api type docs ( #27038 )
2020-10-09 10:08:52 +08:00
二货机器人
3d5f9b0ac5
chore: bump rc-notification ( #26919 )
...
* chore: bump rc-notification
* test: fix on test
* test: Fix config.test
* fix test
* fix message test case
2020-09-28 00:41:16 +08:00
07akioni
9951e583b6
Merge branch 'master' into resolve-conflict-1
2020-07-26 20:14:11 +08:00
偏右
436465bd8a
fix: ⌨️ improve Accessibility by adding role ( #25774 )
...
for Alert/message/notification
2020-07-23 15:00:14 +08:00
07akioni
01cec29a8e
feat: Message hooks API ( #25422 )
...
* chore: comment on usePatchElement
* refactor: conform message & notifaction code logic
* feat: message useMessage, wip
* feat: message.useMessage, it works now
* fix: promise on regular api
* feat: message hooks
* chore: fix lint
* chore: new line
* chore: revert new line
* refactor: prefixCls
* fix: prefixCls
* test: cov
* chore
* chore
* chore
* chore
* docs
* docs: message hooks faq
* test: remove useless config provider
* chore: remove some test codes
* chore
* docs: hooks version
2020-07-15 19:51:56 +08:00
xrkffgg
cbd93324cc
docs: format api message/notification/progress ( #25388 )
2020-07-02 15:33:42 +08:00
xrkffgg
157546480e
fix: Notification align when set width ( #25168 )
2020-06-23 11:40:33 +08:00
xrkffgg
a5f3ac8348
docs: unite boolean in site ( #25058 )
...
* docs: unite boolean in site
* fix demo
* fix boolean
* add
* add
* add
2020-06-17 23:18:14 +08:00
偏右
69db6faebe
✅ Add test cases for Notification ( #24808 )
2020-06-07 21:47:07 +08:00
Arvin Xu
dda650cc7b
docs: Update components cover ( #24744 )
...
* docs: Update components cover
#24629
* docs: Update components cover
2020-06-05 13:50:09 +08:00
xrkffgg
b047add305
fix: adjust notification default place in rtl ( #24632 )
2020-06-01 13:29:40 +08:00
偏右
882cec62d6
docs: 🌈 Add Components overview page ( #24491 )
...
* docs: Add components overview page
* fix detail
* remove ContributorsList form overview page
* fix components url
* improve code style
* remove extra file
* fix detail
* fix lint
* fix lint
* docs: Finish components overview page
* fix lint
* docs: Update cover
* fix lint
* update cover
* update menu
* improve overview page
* refactor code
* fix order
* update title
* add components count
* fix overview page ssr bug
* move less file
* update title margin
Co-authored-by: arvinxx <arvinx@foxmail.com>
2020-05-31 11:48:34 +08:00
xrkffgg
47b3aa2225
docs: add version prompt of message rtl ( #24456 )
2020-05-26 09:08:07 +08:00
偏右
ae8603838a
Merge pull request #24371 from ant-design/master
...
chore: merge master into feature
2020-05-21 23:41:37 +08:00
tdida
c2437a915d
Notification support config prefixCls ( #24295 )
2020-05-21 21:15:53 +08:00
二货机器人
e613861e63
fix: Notification hooks ( #24337 )
...
* test driven
* use ref for the same content
2020-05-21 10:36:18 +08:00
二货机器人
6668d48c54
Merge pull request #23845 from ant-design/master
...
chore: Feature merge master
2020-05-04 11:49:37 +08:00
二货机器人
0f83783709
docs: Update notification onClose desc ( #23831 )
2020-05-03 09:16:33 +08:00
偏右
35e390018c
Merge pull request #23796 from ant-design/master
...
chore: Merge master into feature
2020-05-01 16:35:53 +08:00
xrkffgg
01b98e79d9
docs: optimize site of components 3 ( #23779 )
...
* docs: optimize site of components in rtl 3
* add
2020-04-30 21:04:19 +08:00
xrkffgg
e3e183ea39
docs: add rtl message/notification explanation ( #23770 )
...
* docs: add explanation for message/notification
* fix name
* fix
* add
2020-04-30 10:52:44 +08:00
zefeng
14417f1614
feat(theme): adjust font-size in compact mode ( #23135 )
...
* feat(theme): adjust font-size in compact mode
With compact theme mode, we adjust default font-size from 14px to 12px.
Closes #23015
* patch: update docs min font-size
* patch
* patch
* patch
* patch
* patch
* patch
2020-04-28 11:16:01 +08:00
xrkffgg
fca1367085
feat: add notification rtl config ( #23185 )
...
* feat: add notification rtl config
* test: add test
2020-04-13 15:45:49 +08:00
偏右
d634184b58
🐛 Fix Notification invalid padding-top css ( #22941 )
...
close #22935
2020-04-05 20:57:08 +08:00
Min
c4668f3bf5
Clarify documentation on notifications and context ( #22742 )
2020-03-30 16:17:12 +08:00
Jason Kurian
92c189f246
clarify duration example description ( #21838 )
2020-03-04 08:28:53 +08:00
二货机器人
adb323cec2
chore: icons save bundle size without treeShaking ( #21752 )
...
* alert
* more icons
* another grouping
* all done
2020-03-02 12:09:38 +08:00
偏右
bc8bc190ea
fix: ignore lgtm rule ( #21580 )
...
* fix lgtm
* Update index.tsx
2020-02-25 18:36:18 +08:00
信鑫-King
c17b40ae70
fix: dark background in different container ( #21299 )
...
* fix: comment and input
* fix: add @pagination-item-input-bg
* feat: add @list-customize-card-bg for dark hook component
* feat: add dark hook
* fix: checkbox color
* fix: popover-customize-border-color
* fix: table
* fix: style lint
* fix: debug
* fix: color
* fix: update colors
* fix: demo
* feat: popover container bg use mixins utils
* fix: less dark
* fix: table bg in dark
* fix: fixed table
* fix: lint
* fix: lint
* feat: add @table-expand-icon-bg
* fix: notification bg
* fix: remove dark.md
* fix: dropdown
* fix: table
* fix: data lint
* fix: style
* fix: dark less style
* fix: @steps-background
* fix: add thead dark style
* fix: unused styles
2020-02-24 22:44:29 +08:00
二货机器人
30dca50249
fix: Notification can not stack when first init ( #21531 )
...
* init test case
* use promise for dealy handler
* fix test
2020-02-23 00:02:48 +08:00
二货机器人
8b20fbc96c
docs: Update hooks description ( #21279 )
...
* docs: Update notification faq
* patch faq in Modal
2020-02-07 20:32:00 +08:00
二货机器人
3080611883
feat: Notification support hooks for context ( #21275 )
...
* use promise for getInstance
* passing hooks
* hooks support
* move hooks out of fiel
* adjust style
* update snapshot
* fix test & add test case
* update hooks test
* fix style lint
* update doc
* update demo desc & eslitn rules
* fix lint
* docs add faq
* fix less
2020-02-07 17:55:26 +08:00
ycjcl868
e2251f515b
fix: @theme condition
2019-12-03 15:39:32 +08:00
ycjcl868
d5d2051ec7
fix: components notification
2019-12-02 13:23:30 +08:00
zombiej
d76283f2b9
merge master
2019-12-01 21:46:17 +08:00
zombiej
1d516d7f7f
merge feature
2019-12-01 15:29:53 +08:00