Skip to content

merge master #9

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.

Sign up for GitHub

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

Merged
merged 504 commits into from
Mar 10, 2020
Merged

merge master #9

Changes from 2 commits
Commits
Show all changes
504 commits
Select commit Hold shift + click to select a range
3dc7a9d
Merge remote-tracking branch 'upstream/master'
Leaf217 Feb 23, 2020
86cc734
Merge branch 'master' of github.com:Leaf217/swan-docs
Leaf217 Feb 23, 2020
5b86430
云函数添加获取用户openid 或 swanid 信息示例
sunbai321 Feb 24, 2020
f610299
gengxin
Feb 24, 2020
7d14bf4
组件修改
Feb 24, 2020
0e5bd4e
Merge branch 'master' of https://github.com/swan-team/swan-docs
sunbai321 Feb 24, 2020
f6d1d06
api扩展组件更改
Feb 24, 2020
7dd4377
更新
Feb 24, 2020
e5356e2
web删除
Feb 24, 2020
e2f65ac
更新
Feb 24, 2020
5673f7d
更新
Feb 24, 2020
d38c720
更新
Feb 24, 2020
908a41c
Merge pull request #938 from sunbai01/master
wenlixiu Feb 24, 2020
6f0ef4c
Merge pull request #937 from Leaf217/master
wenlixiu Feb 24, 2020
996ffc4
Merge branch 'master' of https://github.com/swan-team/swan-docs
Feb 24, 2020
741eb30
fix: 修改代码片段预览地址js文件为空的问题
rabbit77 Feb 24, 2020
31b9de0
Merge branch 'master' of https://github.com/swan-team/swan-docs into …
Mixiuu Feb 24, 2020
83eec4e
层级优化
Feb 24, 2020
bb082f0
左侧导航优化 & web化示例适配
Feb 24, 2020
d935cbf
Merge remote-tracking branch 'upstream/master'
Feb 24, 2020
5cb069f
关注组件示例demo优化
Mixiuu Feb 24, 2020
ac2f163
添加获取全局data示例
sunbai321 Feb 25, 2020
d8a5f3f
Merge pull request #942 from Mixiuu/xiaochengxu00-22820
wenlixiu Feb 25, 2020
ecce4c4
Merge pull request #941 from wlfsmile/master
wenlixiu Feb 25, 2020
ea6b5d8
Merge pull request #940 from rabbit77/patch-42
wenlixiu Feb 25, 2020
197b4a2
添加云函数初始化定义方法
sunbai321 Feb 25, 2020
907408d
Merge branch 'master' of https://github.com/swan-team/swan-docs
Feb 25, 2020
7f49ce4
数据库where形式添加不同写法【2】
sunbai321 Feb 25, 2020
59c3413
更新版本分布
Feb 25, 2020
a7de7a6
collection.skip添加分批取数据的例子
sunbai321 Feb 25, 2020
03e8717
文档新增相关链接
Feb 25, 2020
6091c20
command.set添加对象示例【2】
sunbai321 Feb 25, 2020
3cfb0c1
command.remove添加批量删除数据示例
sunbai321 Feb 25, 2020
5acea8a
Merge branch 'master' of https://github.com/swan-team/swan-docs
sunbai321 Feb 25, 2020
68200d8
Merge pull request #944 from wlfsmile/master
wenlixiu Feb 25, 2020
8d06984
Merge branch 'master' of https://github.com/swan-team/swan-docs
Feb 25, 2020
c5cd8bb
bugfix(fileSystem): temp目录大小限制介绍修改
huanhuana Feb 25, 2020
8439537
bugfix(fileSystem): temp目录大小限制介绍修改
huanhuana Feb 25, 2020
cc120a6
Merge branch 'master' of https://github.com/huanhuana/swan-docs
huanhuana Feb 25, 2020
b0ca57e
bugfix(fileSystem): temp目录大小限制介绍修改
huanhuana Feb 25, 2020
17e7a9a
内容修改
Feb 25, 2020
a099307
格式修改
Feb 25, 2020
f616fa4
gnegxin
Feb 25, 2020
fe8ed4e
Update log_Session-Key.md
wenlixiu Feb 25, 2020
2206418
feat($第三方平台): 添加核心页面与关键词文档
Oaks907 Feb 25, 2020
35ecd05
Merge pull request #945 from huanhuana/master
wenlixiu Feb 25, 2020
e800055
UE验收意见修改
Feb 25, 2020
7794408
Merge branch 'master' of https://github.com/swan-team/swan-docs
Feb 25, 2020
0481b4e
Merge branch 'master' of https://github.com/swan-team/swan-docs
sunbai321 Feb 25, 2020
60b052b
Merge branch 'master' of https://github.com/swan-team/swan-docs
sunbai321 Feb 25, 2020
b366826
修改版本信息
sunbai321 Feb 25, 2020
15ac0ea
Merge pull request #943 from sunbai01/master
wenlixiu Feb 25, 2020
ba7e55e
标题内代码块样式修改
Feb 25, 2020
135bae7
Merge pull request #947 from wlfsmile/master
wenlixiu Feb 25, 2020
c9e48d5
增加 chooseImage 的 web 化降级支持文档
Feb 25, 2020
0c9dffd
fix: 文档初始加载禁止prefetch
Feb 26, 2020
c642874
更新工具/版本分布
Feb 26, 2020
20ead79
Merge pull request #946 from Oaks907/TP_20200225_BRANCH
wenlixiu Feb 26, 2020
1801502
新增核心页面与关键词
Feb 26, 2020
300872e
导航修改
Feb 26, 2020
d9c273b
fix: 文档模拟器适配
Feb 26, 2020
d6f3f95
Merge pull request #949 from wlfsmile/master
wenlixiu Feb 26, 2020
337e405
Merge pull request #948 from swan-team/web
wenlixiu Feb 26, 2020
99d654b
更新
Feb 26, 2020
b243ca3
Merge branch 'master' of https://github.com/swan-team/swan-docs
Feb 26, 2020
83105f3
头部二级导航border样式修改
Feb 26, 2020
7d5774d
Merge pull request #950 from wlfsmile/master
wenlixiu Feb 26, 2020
868b3f1
gengxin
Feb 26, 2020
6afd4b7
fix: 文档链接错误
Feb 26, 2020
4111283
增加 video 组件的降级支持文档
Feb 26, 2020
a3445fd
添加三个示例
sunbai321 Feb 27, 2020
37a20aa
Merge pull request #952 from sunbai01/master
wenlixiu Feb 27, 2020
8a1b15c
添加Web态chooseAddress API说明
wangshuonpu Feb 27, 2020
408c263
Merge remote-tracking branch 'upstream/master'
Feb 27, 2020
fb776cb
Update diff.md
lok6666 Feb 27, 2020
d522aa7
Merge pull request #955 from lok6666/patch-12
wenlixiu Feb 27, 2020
1bd7acf
更新版本分布/工具日志
Feb 27, 2020
9f99dae
Merge branch 'master' of https://github.com/swan-team/swan-docs
Feb 27, 2020
3b09ef9
Merge pull request #954 from wlfsmile/master
wenlixiu Feb 27, 2020
50393ee
Merge branch 'master' of https://github.com/swan-team/swan-docs
Feb 27, 2020
f8ab7b0
Merge pull request #951 from sqliang/web
wenlixiu Feb 27, 2020
292152f
Merge branch 'web' of https://github.com/swan-team/swan-docs into web
wangshuonpu Feb 27, 2020
056da2e
Merge pull request #956 from swan-team/master
Sharonzd Feb 27, 2020
76198da
Merge branch 'web' of https://github.com/swan-team/swan-docs into web
wangshuonpu Feb 27, 2020
478a6b8
Merge pull request #957 from efe-blue/web
wenlixiu Feb 27, 2020
b7eb35a
文档侧边栏更新缩进
Feb 27, 2020
4617ae5
增加 chooseImage 的 web 化降级支持文档
Feb 25, 2020
1295442
修改 chooseImage 的 tip
Feb 27, 2020
3ad6c6b
Merge pull request #958 from wlfsmile/master
wenlixiu Feb 27, 2020
f9821a8
Update swan-getFileSystemManager.md
lok6666 Feb 27, 2020
a4e0d58
Merge pull request #959 from lok6666/patch-14
wenlixiu Feb 27, 2020
6ad4c2b
移动 chooseAddress 中的 Web 态说明的位置
wangshuonpu Feb 27, 2020
4f1c185
更新
Feb 27, 2020
5c2d536
更新 chooseAddress 中的 Web 态说明的格式
wangshuonpu Feb 27, 2020
f8d397b
下掉web化示例
sunbai321 Feb 27, 2020
e25efa7
介绍部分优化
Feb 28, 2020
abd9ca6
Update auditinginfo_settled.md
LYUyang-JK Feb 28, 2020
5d1aaae
Update auditinginfo_settled.md
LYUyang-JK Feb 28, 2020
b974881
更新设计文档
Feb 28, 2020
52e2a74
Merge pull request #961 from sunbai01/master
wenlixiu Feb 28, 2020
9caa18c
Merge pull request #963 from LYUyang-JK/patch-37
wenlixiu Feb 28, 2020
5bbf588
Merge pull request #962 from LYUyang-JK/patch-36
wenlixiu Feb 28, 2020
4c5cedb
Merge branch 'master' of https://github.com/swan-team/swan-docs
Feb 28, 2020
560c565
fix: 命令行错误
Feb 28, 2020
4a8e323
Merge pull request #964 from wlfsmile/master
wenlixiu Feb 28, 2020
715ded4
web新增
sunbai321 Feb 28, 2020
3e1c34b
Merge pull request #965 from sunbai01/master
wenlixiu Feb 28, 2020
f8389ee
增加openshare API path参数的说明
Leaf217 Feb 28, 2020
fa2fb7c
增加openshare API path参数的说明
Leaf217 Feb 28, 2020
d07e156
【去掉web化示例】
sunbai321 Feb 28, 2020
59f1f59
Merge pull request #967 from sunbai01/master
wenlixiu Feb 28, 2020
c449055
Merge pull request #966 from Leaf217/master
wenlixiu Feb 28, 2020
205481f
添加 video 组件的 web 化自动播放 Tip 文档 & 优化 video 组件的 web 化文档现有问题
Feb 28, 2020
b97056c
补充 swan.reLaunch 在 Web 态中的说明
Feb 28, 2020
5c1875a
补充 Page.onHide 在 Web 态中的说明
Feb 28, 2020
d4f02c4
补充 App.onHide 在 Web 态中的说明
Feb 28, 2020
9d51fe1
补充分包在 Web 态中的说明
Feb 28, 2020
74f6a54
补充 onShareAppMessage 在 Web 态中的说明
Feb 28, 2020
2f391ec
Update tabs.md
gt-leibin Feb 29, 2020
1c987df
优化 web 化 video 组件问题修改
Mar 1, 2020
de5d32b
添加 video 组件的 web 化自动播放 Tip 文档 & 优化 video 组件的 web 化文档现有问题
Feb 28, 2020
8584614
Merge branch 'web' of https://github.com/sqliang/swan-docs into web
Mar 1, 2020
f23f647
文档导航支持实时监听
Mar 2, 2020
ca295e7
Merge pull request #971 from labs00/patch-1
wenlixiu Mar 2, 2020
d64bc0f
Merge pull request #973 from sqliang/web
wenlixiu Mar 2, 2020
b70ba18
Merge remote-tracking branch 'upstream/master'
Mar 2, 2020
e3e8004
Merge pull request #975 from wlfsmile/master
wenlixiu Mar 2, 2020
371f126
文档支持二维码组件
Mar 2, 2020
237edde
文档支持二维码组件
Mar 2, 2020
eb10dfb
隐藏付渠道能力
Mar 2, 2020
bd7b7fb
Merge remote-tracking branch 'upstream/master'
Mar 2, 2020
0bfc915
Merge pull request #976 from wlfsmile/master
wenlixiu Mar 2, 2020
4965973
添加camera、ar-camera、open-data、web-view、textarea、input的web化说明
Mar 2, 2020
ff0f9c2
修改 video 组件 web 化方面相关表述问题
Mar 2, 2020
a394f20
Merge remote-tracking branch 'upstream/web' into web
Mar 2, 2020
4909302
打开订阅api注释
huanhuana Mar 2, 2020
7acd90d
getRecorderManager相关方法补充Web态下说明
Mar 2, 2020
5f1c36d
Merge pull request #979 from huanhuana/master
wenlixiu Mar 2, 2020
8990722
add canvasPutImageData web md
Mar 2, 2020
b9c9d4f
Merge branch 'web' of https://github.com/swan-team/swan-docs into web
Mar 2, 2020
9dc1c0b
优化 video 组件 web 态文档表述问题
Mar 2, 2020
78ad1e5
Merge remote-tracking branch 'upstream/web' into web
Mar 2, 2020
3543736
Revert "add canvasPutImageData web md"
Mar 2, 2020
eb5ded6
add canvasPutImageData of Web
Mar 2, 2020
08bda3a
api添加web化示例
sunbai321 Mar 2, 2020
56e5d3a
docs: network socket login openSetting getSetting添加web化说明
Mar 2, 2020
1a33aae
Merge pull request #983 from sunbai01/master
wenlixiu Mar 3, 2020
7ffed49
规范getRecorderManager补充web态说明格式
Mar 3, 2020
e76c9e4
规范getRecorderManager说明web态格式
Mar 3, 2020
8f743e2
Merge branch 'web' of https://github.com/swan-team/swan-docs into web
wangshuonpu Mar 3, 2020
9d25a71
订阅消息二维码链接更换 & 代码拆分文案修复
sunbai321 Mar 3, 2020
c1a7ef2
补充web-view说明，修改部分表格格式
Mar 3, 2020
3bce951
注释二维码
sunbai321 Mar 3, 2020
d230f81
docs: 添加openShare shareFile onShareAppMessage web化说明
Mar 3, 2020
3772d0c
docs: 添加openShare shareFile onShareAppMessage web化说明
Mar 3, 2020
b7b9662
merge origin
Mar 3, 2020
a6c103b
getNetworkType web说明调整
Mar 3, 2020
291ac5e
修改web化
sunbai321 Mar 3, 2020
0742aa3
Merge pull request #960 from efe-blue/web
Sharonzd Mar 3, 2020
0cfc7cc
Merge pull request #985 from sunbai01/master
wenlixiu Mar 3, 2020
f3a3276
调整getRecorderManager在Web态环境说明
Mar 3, 2020
1784a4d
优化video组件web态文档中的Tip1说明问题
Mar 3, 2020
904de90
Merge remote-tracking branch 'upstream/web' into web
Mar 3, 2020
76124c0
去除getRecorderManager对开发者建议相关语句
Mar 3, 2020
227e523
Merge pull request #981 from sqliang/web
wangshuonpu Mar 3, 2020
f14680c
Merge pull request #980 from jmingye/web
wangshuonpu Mar 3, 2020
f6384f4
web化文档调整
Mar 3, 2020
dbb4adc
文案调整
Mar 3, 2020
8663486
文案调整
Mar 3, 2020
28bc305
Merge pull request #978 from jqwang521/web
wangshuonpu Mar 3, 2020
e1ab63a
Merge pull request #984 from juruo221/web
wangshuonpu Mar 3, 2020
f3cfc3e
Merge pull request #982 from Sharonzd/web
wangshuonpu Mar 3, 2020
b800840
修改 Web 态中 Page.onShow、Page.onHide 的说明
Mar 3, 2020
de3616c
修改 Web 态中 onShareAppMessage 的说明
Mar 3, 2020
72d8eb3
修改 Web 态中 App.onShow、App.onHide 的说明
Mar 3, 2020
bb3ac0e
移除 Web 态中对分包的说明
Mar 3, 2020
8cc6762
Merge pull request #970 from andrew703/web
wangshuonpu Mar 3, 2020
099bf05
填加8个示例
sunbai321 Mar 4, 2020
5aabd48
Merge master in web and fix conflict
Mar 4, 2020
0358240
Merge pull request #987 from swan-team/web
wenlixiu Mar 4, 2020
1db4176
Merge pull request #986 from sunbai01/master
wenlixiu Mar 4, 2020
0004e53
更新package.json && 侧导航取消滚动效果
Mar 4, 2020
0750bbc
更新readme
Mar 4, 2020
c75fee2
更新changlog
Mar 4, 2020
9106134
UE意见修改
Mar 4, 2020
c2ae5bf
Merge pull request #988 from wlfsmile/master
wenlixiu Mar 4, 2020
2da92e7
Merge branch 'master' of https://github.com/swan-team/swan-docs
Mar 4, 2020
d5af4f1
docs: openSetting 错误文案调整
Mar 4, 2020
bce6eaa
格式修改
Mar 4, 2020
a0810ac
openSetting 错误码提到代码实例前面
Mar 4, 2020
1fc1515
新增 web 化的 ai 接口相关说明
Mar 4, 2020
9351523
修改 web 化为 web 态
Mar 4, 2020
c5154d8
开放接口升级
huanhuana Mar 4, 2020
9a62395
添加 live-player 组件的 web 化文档
Mar 4, 2020
75738cc
Merge remote-tracking branch 'upstream/web' into web
Mar 4, 2020
a87ba44
Merge pull request #989 from juruo221/web
Sharonzd Mar 4, 2020
e84eb5a
Merge branch 'master' into next-web
Mar 4, 2020
9b8ae83
Revert "Merge pull request #978 from jqwang521/web"
Mar 4, 2020
1437487
Revert "更新 chooseAddress 中的 Web 态说明的格式"
Mar 4, 2020
c2ac38f
Revert "移动 chooseAddress 中的 Web 态说明的位置"
Mar 4, 2020
562a917
Revert "Merge pull request #957 from efe-blue/web"
Mar 4, 2020
6389a95
补充上之前 revert 的 commit 中的input 和 textarea 相关改动
Mar 4, 2020
2e68b08
过滤部署开发机的文件
Mar 4, 2020
4708724
Merge pull request #992 from swan-team/web
wangshuonpu Mar 4, 2020
5a6ec0c
Merge pull request #991 from sqliang/web
Sharonzd Mar 5, 2020
2f4b504
补充 web 化之前 revert 调的open-data改动
Mar 5, 2020
8bf4372
Merge remote-tracking branch 'upstream/web' into web
Mar 5, 2020
1830aed
Revert "新增 web 化的 ai 接口相关说明"
Mar 5, 2020
4652eff
Merge pull request #994 from Sharonzd/web
wangshuonpu Mar 5, 2020
0299ce0
更新工具changlog
Mar 5, 2020
278f328
Update rank_robots.md
LYUyang-JK Mar 5, 2020
d487300
代码格式更新
Mar 5, 2020
6e1d4b6
Merge pull request #996 from LYUyang-JK/patch-38
wenlixiu Mar 5, 2020
687666f
Update type.md
LYUyang-JK Mar 5, 2020
8e2fee0
格式更新
Mar 5, 2020
3f6b740
格式更新
Mar 5, 2020
0136904
Merge pull request #997 from LYUyang-JK/patch-39
wenlixiu Mar 5, 2020
8a9636c
Merge pull request #998 from swan-team/web
wenlixiu Mar 5, 2020
ac3a81a
Merge branch 'master' of https://github.com/swan-team/swan-docs
Mar 5, 2020
d3f675a
开放接口升级
huanhuana Mar 5, 2020
ec27e2a
Merge pull request #999 from huanhuana/master
wenlixiu Mar 5, 2020
0cbf11f
修改品牌 web 化 -> web 态
Mar 5, 2020
40a9fd5
Merge pull request #1001 from Sharonzd/web
wangshuonpu Mar 5, 2020
c2d30f5
Merge pull request #1002 from swan-team/web
wenlixiu Mar 5, 2020
1d7765d
feat($第三方平台): 规范access_token的说明
Oaks907 Mar 5, 2020
7149035
Update history.md
wenlixiu Mar 5, 2020
8b8edda
Update uplog_tool_rc.md
wenlixiu Mar 5, 2020
e13e84d
更换二维码
sunbai321 Mar 6, 2020
fb1df47
Merge pull request #1003 from sunbai01/master
wenlixiu Mar 6, 2020
a2a9002
新增bug/tip/打开开发者工具/设计指南 组件
Mar 6, 2020
a7ed1d8
Merge pull request #1005 from wlfsmile/master
wenlixiu Mar 6, 2020
9319092
Update file_system_package.md
gt-leibin Mar 8, 2020
d37dca6
替换添加手机联系人的二维码图片
sunbai321 Mar 8, 2020
b6baaa4
swan.getImageInfo代码片段放错，更换
sunbai321 Mar 8, 2020
4cef932
修复 live-player 组件格式存在的问题
Mar 8, 2020
0636835
Merge pull request #1009 from sqliang/master
wenlixiu Mar 9, 2020
3791093
Merge pull request #1008 from sunbai01/master
wenlixiu Mar 9, 2020
c475b6b
Merge pull request #1006 from labs00/patch-2
wenlixiu Mar 9, 2020
302cca3
Merge pull request #1004 from Oaks907/TP_20200305_BRANCH
wenlixiu Mar 9, 2020
5c75cd7
文档内容区样式优化
Mar 9, 2020
aa381bc
Merge remote-tracking branch 'upstream/master'
Mar 9, 2020
edcf5a5
文档内容区样式优化
Mar 9, 2020
91fa83f
文档内容区样式优化
Mar 9, 2020
1cbd427
新增3个示例
sunbai321 Mar 9, 2020
721d12d
文档内容区样式优化
Mar 9, 2020
b07e39e
pm需求更新
Mar 9, 2020
e358d20
Merge branch 'master' of https://github.com/swan-team/swan-docs
Mar 9, 2020
16039ee
Merge pull request #1011 from wlfsmile/master
wenlixiu Mar 9, 2020
d739787
Merge pull request #1010 from sunbai01/master
wenlixiu Mar 9, 2020
573cea7
Merge branch 'master' of https://github.com/swan-team/swan-docs
Mar 9, 2020
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

These merge commits were added into this branch cleanly.

There are no new changes to show.