Skip to content

Commit 3498512

Browse files
authored
Merge pull request #805 from Hi-Windom/v0.35
V0.35
2 parents bcbc2d9 + 24db488 commit 3498512

File tree

17 files changed

+247
-259
lines changed

17 files changed

+247
-259
lines changed

.github/CODE_OF_CONDUCT.md

Lines changed: 77 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -1,128 +1,77 @@
1-
# Contributor Covenant Code of Conduct
2-
3-
## Our Pledge
4-
5-
We as members, contributors, and leaders pledge to make participation in our
6-
community a harassment-free experience for everyone, regardless of age, body
7-
size, visible or invisible disability, ethnicity, sex characteristics, gender
8-
identity and expression, level of experience, education, socio-economic status,
9-
nationality, personal appearance, race, religion, or sexual identity
10-
and orientation.
11-
12-
We pledge to act and interact in ways that contribute to an open, welcoming,
13-
diverse, inclusive, and healthy community.
14-
15-
## Our Standards
16-
17-
Examples of behavior that contributes to a positive environment for our
18-
community include:
19-
20-
* Demonstrating empathy and kindness toward other people
21-
* Being respectful of differing opinions, viewpoints, and experiences
22-
* Giving and gracefully accepting constructive feedback
23-
* Accepting responsibility and apologizing to those affected by our mistakes,
24-
and learning from the experience
25-
* Focusing on what is best not just for us as individuals, but for the
26-
overall community
27-
28-
Examples of unacceptable behavior include:
29-
30-
* The use of sexualized language or imagery, and sexual attention or
31-
advances of any kind
32-
* Trolling, insulting or derogatory comments, and personal or political attacks
33-
* Public or private harassment
34-
* Publishing others' private information, such as a physical or email
35-
address, without their explicit permission
36-
* Other conduct which could reasonably be considered inappropriate in a
37-
professional setting
38-
39-
## Enforcement Responsibilities
40-
41-
Community leaders are responsible for clarifying and enforcing our standards of
42-
acceptable behavior and will take appropriate and fair corrective action in
43-
response to any behavior that they deem inappropriate, threatening, offensive,
44-
or harmful.
45-
46-
Community leaders have the right and responsibility to remove, edit, or reject
47-
comments, commits, code, wiki edits, issues, and other contributions that are
48-
not aligned to this Code of Conduct, and will communicate reasons for moderation
49-
decisions when appropriate.
50-
51-
## Scope
52-
53-
This Code of Conduct applies within all community spaces, and also applies when
54-
an individual is officially representing the community in public spaces.
55-
Examples of representing our community include using an official e-mail address,
56-
posting via an official social media account, or acting as an appointed
57-
representative at an online or offline event.
58-
59-
## Enforcement
60-
61-
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62-
reported to the community leaders responsible for enforcement at
63-
os@b3log.org.
64-
All complaints will be reviewed and investigated promptly and fairly.
65-
66-
All community leaders are obligated to respect the privacy and security of the
67-
reporter of any incident.
68-
69-
## Enforcement Guidelines
70-
71-
Community leaders will follow these Community Impact Guidelines in determining
72-
the consequences for any action they deem in violation of this Code of Conduct:
73-
74-
### 1. Correction
75-
76-
**Community Impact**: Use of inappropriate language or other behavior deemed
77-
unprofessional or unwelcome in the community.
78-
79-
**Consequence**: A private, written warning from community leaders, providing
80-
clarity around the nature of the violation and an explanation of why the
81-
behavior was inappropriate. A public apology may be requested.
82-
83-
### 2. Warning
84-
85-
**Community Impact**: A violation through a single incident or series
86-
of actions.
87-
88-
**Consequence**: A warning with consequences for continued behavior. No
89-
interaction with the people involved, including unsolicited interaction with
90-
those enforcing the Code of Conduct, for a specified period of time. This
91-
includes avoiding interactions in community spaces as well as external channels
92-
like social media. Violating these terms may lead to a temporary or
93-
permanent ban.
94-
95-
### 3. Temporary Ban
96-
97-
**Community Impact**: A serious violation of community standards, including
98-
sustained inappropriate behavior.
99-
100-
**Consequence**: A temporary ban from any sort of interaction or public
101-
communication with the community for a specified period of time. No public or
102-
private interaction with the people involved, including unsolicited interaction
103-
with those enforcing the Code of Conduct, is allowed during this period.
104-
Violating these terms may lead to a permanent ban.
105-
106-
### 4. Permanent Ban
107-
108-
**Community Impact**: Demonstrating a pattern of violation of community
109-
standards, including sustained inappropriate behavior, harassment of an
110-
individual, or aggression toward or disparagement of classes of individuals.
111-
112-
**Consequence**: A permanent ban from any sort of public interaction within
113-
the community.
114-
115-
## Attribution
116-
117-
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118-
version 2.0, available at
119-
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
120-
121-
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122-
enforcement ladder](https://github.com/mozilla/diversity).
123-
124-
[homepage]: https://www.contributor-covenant.org
125-
126-
For answers to common questions about this code of conduct, see the FAQ at
127-
https://www.contributor-covenant.org/faq. Translations are available at
128-
https://www.contributor-covenant.org/translations.
1+
# 贡献者公约行为准则
2+
3+
## 我们的承诺
4+
5+
作为成员、贡献者和领导者,我们承诺参与我们的 社区为每个人提供无骚扰的体验,无论年龄、身体如何 大小、可见或不可见的残疾、种族、性别特征、性别 身份和表达、经验水平、教育程度、社会经济地位、 国籍、个人外貌、种族、宗教或性别认同 和方向。
6+
7+
我们承诺以有助于开放、热情、 多元化、包容和健康的社区。
8+
9+
## 我们的标准
10+
11+
有助于为我们创造积极环境的行为示例 社区包括:
12+
13+
* 对他人表现出同理心和善意
14+
* 尊重不同的意见、观点和经验
15+
* 给予并优雅地接受建设性的反馈
16+
* 承担责任并向那些受我们错误影响的人道歉, 并从经验中学习
17+
* 专注于不仅对我们个人最好的事情,而且对 整个社区
18+
19+
不可接受的行为示例包括:
20+
21+
* 使用色情语言或图像,以及性关注或 任何形式的进步
22+
* 挑衅、侮辱或贬损性评论,以及人身或政治攻击
23+
* 公开或私下骚扰
24+
* 发布他人的私人信息,例如实体信息或电子邮件 地址,未经其明确许可
25+
* 其他可合理地认为不适当的行为 专业设置
26+
27+
## 执法责任
28+
29+
社区领袖负责澄清和执行我们的标准 可接受的行为,并将采取适当和公平的纠正措施 对他们认为不适当、威胁、冒犯的任何行为的回应, 或有害。
30+
31+
社区领袖有权利和责任删除、编辑或拒绝 注释、提交、代码、wiki 编辑、问题和其他贡献 不符合本行为准则,并将传达审核原因 在适当的时候做出决定。
32+
33+
## 范围
34+
35+
本行为准则适用于所有社区空间,也适用于以下情况 个人在公共场所正式代表社区。 代表我们社区的例子包括使用官方电子邮件地址, 通过官方社交媒体帐户发布,或作为指定人员 在线或离线活动中的代表。
36+
37+
## 执法
38+
39+
辱骂、骚扰或其他不可接受的行为可[向负责执法的社区领袖报告](mailto:694357845@qq.com)。 所有投诉都将得到及时和公平的审查和调查。
40+
41+
所有社区领袖都有义务尊重社区的隐私和安全。 任何事件的记者。
42+
43+
## 执行准则
44+
45+
社区领袖将遵循这些社区影响指南来确定 他们认为违反本行为准则的任何行为的后果:
46+
47+
### 1. 更正
48+
49+
**社区影响** :使用不当语言或其他被视为行为 在社区中不专业或不受欢迎。
50+
51+
**后果** :来自社区领袖的私人书面警告,提供 明确违规行为的性质,并解释为什么 行为不恰当。可以要求公开道歉。
52+
53+
### 2. 警告
54+
55+
**社群影响** :通过单个事件或系列导致的违规行为 的行动。
56+
57+
**后果** :警告,对持续行为的后果。不 与相关人员的互动,包括主动与相关人员的互动 在特定时间段内执行行为准则的人。这 包括避免在社区空间和外部渠道进行互动 就像社交媒体一样。违反这些条款可能会导致暂时或 永久禁止。
58+
59+
### 3. 临时禁令
60+
61+
**社区影响** :严重违反社区标准,包括 持续的不当行为。
62+
63+
**后果** :暂时禁止任何形式的互动或公开 在指定时间段内与社区沟通。没有公共或 与相关人员的私人互动,包括主动互动 在此期间,允许与执行行为准则的人合作。 违反这些条款可能会导致永久封禁。
64+
65+
### 4. 永久封禁
66+
67+
**社区影响** :展示违反社区的模式 标准,包括持续的不当行为、骚扰 个人,或对个人类别的攻击或贬低。
68+
69+
**后果** :永久禁止任何形式的公共互动 社区。
70+
71+
## 归 因
72+
73+
本行为准则改编自[《贡献者公约》](https://www.contributor-covenant.org/), 版本 2.0,可在 [https://www.contributor-covenant.org/version/2/0/code_of_conduct.html](https://www.contributor-covenant.org/version/2/0/code_of_conduct.html) 上获得。
74+
75+
社区影响指南的灵感来自[Mozilla的行为准则 执法阶梯](https://github.com/mozilla/diversity)
76+
77+
有关本行为准则的常见问题的解答,请参阅 [https://www.contributor-covenant.org/faq](https://www.contributor-covenant.org/faq) 上的常见问题解答。[https://www.contributor-covenant.org/translations](https://www.contributor-covenant.org/translations) 上提供翻译。

.github/README.md

Lines changed: 3 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -52,63 +52,17 @@
5252
</p>
5353

5454
<p align="center">
55-
<a href="https://star-history.com/#Hi-Windom/Sillot&Date">
56-
<picture>
57-
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=Hi-Windom/Sillot&type=Date&theme=dark" />
58-
<source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=Hi-Windom/Sillot&type=Date" />
59-
<img alt="Star History Chart" src="https://api.star-history.com/svg?repos=Hi-Windom/Sillot&type=Date" />
60-
</picture>
61-
</a>
55+
<img alt="Sillot" src="../app/stage/icon.png">
6256
</p>
6357

6458
<p align="center">
6559
<br><br>
66-
<a href="https://github.com/siyuan-note/siyuan">思源(SiYuan)</a> | <a href="README_Sillot.md">汐洛(Sillot)</a>
60+
<a href="./docs/Sillot-android">汐洛安卓</a> | <a href="./docs/Sillot-Gibbet">汐洛绞架</a> | <a href="./docs/compatibility">兼容性</a>
61+
| <a href="./docs/document">文档</a> | <a href="./docs/roadmap">路线图</a>
6762
</p>
6863

69-
## 📚 文档
70-
71-
<p align="center">
72-
<h2>正常访问<a href="https://sillot.db.sc.cn/"> https://sillot.db.sc.cn/ </a></h2>
73-
<h2>代理访问<a href="https://sillot-docs.db.sc.cn/"> https://sillot-docs.db.sc.cn/ </a></h2>
74-
</p>
75-
76-
<p align="center">
77-
<br><br>
78-
<img alt="split" src="./split.png"/>
79-
<br><br><br>
80-
</p>
81-
82-
## 🔭 Roadmap
83-
84-
<p align="center">
85-
<h2><a href="https://github.com/orgs/Hi-Windom/projects/2/views/2">汐洛路线图(Sillot Roadmap)</a></h2>
86-
<h2><a href="https://github.com/orgs/Hi-Windom/projects/3/views/2">汐洛安卓路线图(Sillot Android Roadmap)</a></h2>
87-
<h2><a href="https://github.com/orgs/Hi-Windom/projects/4/views/2">汐洛社区路线图(Sillot Community Roadmap)</a></h2>
88-
<h2><a href="https://github.com/orgs/Hi-Windom/projects/6/views/2">汐洛扩展路线图(Sillot Extentions Roadmap)</a></h2>
89-
</p>
90-
91-
<p align="center">
92-
<br><br>
93-
<img alt="split" src="./split.png"/>
94-
<br><br><br>
95-
</p>
96-
97-
## 🌐 兼容性
98-
99-
<span>
100-
<img src="https://img.shields.io/badge/Chromium 94+-black?logo=Google Chrome&logoColor=white" title="Chromium 94+" height="31"/><img src="https://img.shields.io/badge/Windows 10+-black?logo=Windows 11" title="Windows 10+" height="31"/><img src="https://img.shields.io/badge/Android 12+-black?logo=android" title="Android 12+" height="31"/>
101-
</span>
102-
<img src="../screenshots/sillot/es2022.png"/>
103-
10464
<p align="center">
10565
<br><br>
10666
<img alt="split" src="./split.png"/>
10767
<br><br><br>
10868
</p>
109-
110-
## 🛠️ 贡献者
111-
112-
<a href="https://github.com/Hi-Windom/Sillot/graphs/contributors">
113-
<img src="https://contrib.rocks/image?repo=Hi-Windom/Sillot" />
114-
</a>

.github/README_Sillot.md

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)