Skip to content

Commit 2177f1c

Browse files
committedJul 7, 2016
Merge remote-tracking branch 'origin/dev' into jsfm-feature-0.14
2 parents 856cb80 + 91a5c44 commit 2177f1c

File tree

528 files changed

+41237
-5631
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

528 files changed

+41237
-5631
lines changed
 

‎.github/ISSUE_TEMPLATE.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
(Please ***REMOVE*** the following description before submiting)
2+
13
0. It's ***RECOMMENDED*** to [submit PR](https://github.com/alibaba/weex/pulls) for typo, new demo or tiny bugfix.
24
0. If this's a ***BUG***, pls provide: course repetition, error/crash log, device model, OS version, App version (playground or other apps).
35
0. If this's a ***FEATURE***, pls provide: details, pseudo codes if necessary.
46

57
---
68

9+
(请在***提交***前删除这段描述)
10+
711
0. 我们***推荐***小问题直接[提 PR](https://github.com/alibaba/weex/pulls),如错别字、新 demo 或 bugfix。
812
0. 如果是 ***Bug***,请提供:复现步骤(推荐有截图)、error/crash log、设备型号、OS 版本、App 版本(playground 版本或自己的 app)。
9-
0. 如果是***新需求***,请提供:详细描述、应用场景、适当的伪代码(如有)。
13+
0. 如果是***新需求***,请提供:详细描述、应用场景、适当的伪代码(如有)。

‎.github/PULL_REQUEST_TEMPLATE.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
(Please ***REMOVE*** the following description before submiting)
2+
13
It's ***RECOMMENDED*** to submit typo fix, new demo and tiny bugfix to `dev` branch. New feature and other modifications can be submitted to "domain" branch including `ios`, `android`, `jsfm`, `html5`.
24

35
See [Branch Strategy](https://github.com/alibaba/weex/blob/dev/CONTRIBUTING.md#branch-management) for more detail.
46

57
---
68

9+
(请在***提交***前删除这段描述)
10+
711
错别字修改、新 demo、较小的 bugfix 都可以直接提到 `dev` 分支;新需求以及任何你不确定影响面的改动,请提交到对应“领域”的分支(`ios``android``jsfm``html5`)。
812

913
查看完整的[分支策略 (英文)](https://github.com/alibaba/weex/blob/dev/CONTRIBUTING.md#branch-management)

0 commit comments

Comments
 (0)
Please sign in to comment.