summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-10-25 03:30:16 -0400
committerUnknwon <u@gogs.io>2015-10-25 03:30:16 -0400
commitd5fab7f1b993ac389d751bfb87774549c4f3f4c2 (patch)
tree942d3152f612db535ee24f73eee6cebb285cd691
parentc3ba5590c98a32c149c4dfa97bbfed65135d4f3e (diff)
downloadgitea-d5fab7f1b993ac389d751bfb87774549c4f3f4c2.tar.gz
gitea-d5fab7f1b993ac389d751bfb87774549c4f3f4c2.zip
update README
-rw-r--r--README.md17
-rw-r--r--README_ZH.md9
2 files changed, 14 insertions, 12 deletions
diff --git a/README.md b/README.md
index 9d61d852db..d781d2f0a2 100644
--- a/README.md
+++ b/README.md
@@ -51,14 +51,15 @@ The goal of this project is to make the easiest, fastest, and most painless way
## Features
- Activity timeline
-- SSH/HTTP(S) protocol support
-- SMTP/LDAP/reverse proxy authentication support
-- Reverse proxy suburl support
-- Account/Organization(with team)/Repository management
-- Repository/Organization webhooks(including Slack)
+- SSH and HTTP/HTTPS protocols
+- SMTP/LDAP/Reverse proxy authentication
+- Reverse proxy with sub-path
+- Account/Organization/Repository management
+- Repository/Organization webhooks (including Slack)
- Repository Git hooks/deploy keys
-- Add/remove repository collaborators
-- Gravatar and custom source support
+- Repository issues and pull requests
+- Add/Remove repository collaborators
+- Gravatar and custom source
- Mail service
- Administration panel
- CI integration: [Drone](https://github.com/drone/drone)
@@ -116,7 +117,7 @@ There are 5 ways to install Gogs:
## Contributors
-- Ex-team members [@lunny](https://github.com/lunny) and [@fuxiaohei](https://github.com/fuxiaohei).
+- Ex-team members [@lunny](https://github.com/lunny), [@fuxiaohei](https://github.com/fuxiaohei) and [@slene](https://github.com/slene).
- See [contributors page](https://github.com/gogits/gogs/graphs/contributors) for full list of contributors.
- See [TRANSLATORS](conf/locale/TRANSLATORS) for public list of translators.
diff --git a/README_ZH.md b/README_ZH.md
index a11627a057..e99d06d024 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -18,13 +18,14 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
## 功能特性
- 支持活动时间线
-- 支持 SSH/HTTP(S) 协议
-- 支持 SMTP/LDAP/反向代理的用户认证
+- 支持 SSH 以及 HTTP/HTTPS 协议
+- 支持 SMTP、LDAP 和反向代理的用户认证
- 支持反向代理子路径
- 支持用户、组织和仓库管理系统
- 支持仓库和组织级别 Web 钩子(包括 Slack 集成)
- 支持仓库 Git 钩子和部署密钥
-- 支持 添加/删除 仓库协作者
+- 支持仓库工单(Issue)和合并请求(Pull Request)
+- 支持添加和删除仓库协作者
- 支持 Gravatar 以及自定义源
- 支持邮件服务
- 支持后台管理面板
@@ -64,7 +65,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
## 贡献成员
-- 前团队成员 [@lunny](https://github.com/lunny) 和 [@fuxiaohei](https://github.com/fuxiaohei)。
+- 前团队成员 [@lunny](https://github.com/lunny)、[@fuxiaohei](https://github.com/fuxiaohei) 和 [@slene](https://github.com/slene)。
- 您可以通过查看 [贡献者页面](https://github.com/gogits/gogs/graphs/contributors) 获取完整的贡献者列表。
- 您可以通过查看 [TRANSLATORS](conf/locale/TRANSLATORS) 文件获取公开的翻译人员列表。