From c70e687de29acd4faff56882233ccdfc63e0560c Mon Sep 17 00:00:00 2001 From: zema1 Date: Thu, 30 Nov 2017 09:42:16 +0800 Subject: [PATCH] update readme and license --- LICENSE | 28 ++++++---------------------- README-CN.md | 27 ++++++++++++--------------- README.md | 30 ++++++++++++++---------------- 3 files changed, 32 insertions(+), 53 deletions(-) diff --git a/LICENSE b/LICENSE index 7e404885..833370c1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,6 @@ -The Star And Thank Author License (SATA) +The MIT License (MIT) -Copyright (c) - -Project Url: https://github.com/QingdaoU/OnlineJudge +Copyright (c) 2017-present OnineJudge Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -11,27 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -And wait, the most important, you shall star/+1/like the project(s) in project url -section above first, and then thank the author(s) in Copyright section. - -Here are some suggested ways: - - - Email the authors a thank-you letter, and make friends with him/her/them. - - Report bugs or issues. - - Tell friends what a wonderful project this is. - - And, sure, you can just express thanks in your mind without telling the world. - -Contributors of this project by forking have the option to add his/her name and -forked project url at copyright and project url sections, but shall not delete -or modify anything else in these two sections. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README-CN.md b/README-CN.md index 49438764..3e5b4c40 100644 --- a/README-CN.md +++ b/README-CN.md @@ -1,26 +1,25 @@ # OnlineJudge 2.0 -[![vue](https://img.shields.io/badge/python-3.6.2-blue.svg?style=flat-square)](https://www.python.org/downloads/release/python-362/) -[![vuex](https://img.shields.io/badge/django-1.11.4-blue.svg?style=flat-square)](https://www.djangoproject.com/) -[![echarts](https://img.shields.io/badge/django_rest_framework-3.4.0-blue.svg?style=flat-square)](http://www.django-rest-framework.org/) +[![Python](https://img.shields.io/badge/python-3.6.2-blue.svg?style=flat-square)](https://www.python.org/downloads/release/python-362/) +[![Django](https://img.shields.io/badge/django-1.11.4-blue.svg?style=flat-square)](https://www.djangoproject.com/) +[![Django Rest Framework](https://img.shields.io/badge/django_rest_framework-3.4.0-blue.svg?style=flat-square)](http://www.django-rest-framework.org/) [![Build Status](https://travis-ci.org/QingdaoU/OnlineJudge.svg?branch=2.0)](https://travis-ci.org/QingdaoU/OnlineJudge) -> #### 基于Python和Vue的在线评测系统。[Demo](http://v2.qduoj.com) +> #### 基于 Python 和 Vue 的在线评测系统。 [Demo](http://v2.qduoj.com) [English Document](https://github.com/QingdaoU/OnlineJudge/blob/2.0/README.md) ## 概览 -+ 基于docker，真正一键部署 ++ 基于 Docker，真正一键部署 + 前后端分离，模块化编程，微服务 + ACM/OI 两种比赛模式、实时/非实时评判 任意选择 + 丰富的可视化图表，一图胜千言 -+ 支持Template Problem，可以添加函数题甚至填空题 ++ 支持 Template Problem，可以添加函数题甚至填空题 + 更细致的权限划分，超级管理员和普通管理员各司其职 -+ 多语言支持：`C`, `C++`, `Java`, `Python`，题目可以选择使用的语言 -+ Markdown & MathJax支持 -+ 比赛用户IP限制(CIDR ranges) - ++ 多语言支持：`C`, `C++`, `Java`, `Python2`, `Python3`，题目可以选择使用的语言 ++ Markdown & MathJax 支持 ++ 比赛用户IP限制 (CIDR ranges) 主要模块均已开源: @@ -55,8 +54,8 @@ Rankings 中可以控制图表和菜单的显隐 ![user-home](https://user-images.githubusercontent.com/20637881/33365521-7842d808-d523-11e7-84c1-2e2aa0079f32.png) - ### 后台管理 + ![admin-users](https://user-images.githubusercontent.com/20637881/33372516-42c34fda-d539-11e7-9f4e-5109477f83be.png) ![judge-server](https://user-images.githubusercontent.com/20637881/33372517-42faef9e-d539-11e7-9f17-df9be3583900.png) @@ -68,12 +67,10 @@ Rankings 中可以控制图表和菜单的显隐 ## 特别感谢 + 所有为本项目做出贡献的人 -+ [heb1c](#) 同学为我们提供了很多意见和建议 ++ [heb1c](https://github.com/hebicheng) 同学为我们提供了很多意见和建议 -如果您觉得这个项目还不错，就给个star吧 ：) +如果您觉得这个项目还不错，就star一下吧 ：) ## 许可 The [MIT](http://opensource.org/licenses/MIT) License - -Copyright 2015-present, Online Judge \ No newline at end of file diff --git a/README.md b/README.md index ef034531..85496dfb 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,34 @@ # OnlineJudge 2.0 -[![vue](https://img.shields.io/badge/python-3.6.2-blue.svg?style=flat-square)](https://www.python.org/downloads/release/python-362/) -[![vuex](https://img.shields.io/badge/django-1.11.4-blue.svg?style=flat-square)](https://www.djangoproject.com/) -[![echarts](https://img.shields.io/badge/django_rest_framework-3.4.0-blue.svg?style=flat-square)](http://www.django-rest-framework.org/) +[![Python](https://img.shields.io/badge/python-3.6.2-blue.svg?style=flat-square)](https://www.python.org/downloads/release/python-362/) +[![Django](https://img.shields.io/badge/django-1.11.4-blue.svg?style=flat-square)](https://www.djangoproject.com/) +[![Django Rest Framework](https://img.shields.io/badge/django_rest_framework-3.4.0-blue.svg?style=flat-square)](http://www.django-rest-framework.org/) [![Build Status](https://travis-ci.org/QingdaoU/OnlineJudge.svg?branch=2.0)](https://travis-ci.org/QingdaoU/OnlineJudge) -> #### A onlinejudge system based on Python and Vue, [Demo](http://v2.qduoj.com) +> #### A onlinejudge system based on Python and Vue. [Demo](http://v2.qduoj.com) [中文文档](https://github.com/QingdaoU/OnlineJudge/blob/2.0/README-CN.md) ## Overview -+ Based on docker, one-click deployment -+ Separated backend and frontend, modularization programming -+ ACM/OI rule_type, real-time rank or not, choose as you like ++ Based on Docker, one-click deployment ++ Separated backend and frontend, modular programming ++ ACM/OI rule type, real-time rank or not, choose what you like + Amazing charting and visualization + Template-Problem support + More reasonable permission control + Multi-language support: `C`, `C++`, `Java`, `Python2`, `Python3` -+ Easy use markdown editor && Nice codemirror editor -+ Contest Participants IP limit(CIDR) ++ Markdown & MathJax support ++ Contest participants IP limit(CIDR) The main modules are open source: + Backend(Django): [https://github.com/QingdaoU/OnlineJudge](https://github.com/QingdaoU/OnlineJudge) + Frontend(Vue): [https://github.com/QingdaoU/OnlineJudgeFE](https://github.com/QingdaoU/OnlineJudgeFE) -+ Judger Sandbox(seccomp): [https://github.com/QingdaoU/Judger](https://github.com/QingdaoU/Judger) ++ Judger Sandbox(Seccomp): [https://github.com/QingdaoU/Judger](https://github.com/QingdaoU/Judger) + JudgeServer(A wrapper for Judger): [https://github.com/QingdaoU/JudgeServer](https://github.com/QingdaoU/JudgeServer) -## Install +## Installation Follow me: [https://github.com/QingdaoU/OnlineJudgeDeploy/tree/2.0](https://github.com/QingdaoU/OnlineJudgeDeploy/tree/2.0) @@ -54,7 +54,7 @@ You can control the menu and chart status in rankings ![user-home](https://user-images.githubusercontent.com/20637881/33365521-7842d808-d523-11e7-84c1-2e2aa0079f32.png) -### Backend: +### Admin: ![admin-users](https://user-images.githubusercontent.com/20637881/33372516-42c34fda-d539-11e7-9f4e-5109477f83be.png) @@ -66,12 +66,10 @@ You can control the menu and chart status in rankings ## Special Thanks -+ I'd appreciate a github star if you find this great ++ I'd appreciate a github star if you find this helpful + Thanks to all the people that have contributed to the project -+ A special thanks to [heb1c]() who gave us a lot of suggestions ++ A special thanks to [heb1c](https://github.com/hebicheng) who gave us a lot of suggestions ## License The [MIT](http://opensource.org/licenses/MIT) License - -Copyright 2015-present, Online Judge \ No newline at end of file