Skip to content

Commit e43df0a

Browse files
committed
Merge branch 'v2.10.0'
2 parents 74d08fd + e8c7c4b commit e43df0a

File tree

1,877 files changed

+87685
-105
lines changed

Some content is hidden

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

1,877 files changed

+87685
-105
lines changed

Diff for: LICENSE.txt

+11-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11

2-
ShowDoc遵循Apache2开源协议发布,并提供免费使用。
3-
版权所有Copyright © 2015 by star7th (http://blog.star7th.com/)
4-
All rights reserved。
2+
ShowDoc遵循Apache2开源协议发布。
3+
ShowDoc在遵循Apache2开源协议之上有一条额外版权声明:
4+
showdoc官方(https://www.showdoc.com.cn/)以及作者star7th ( https://github.com/star7th )拥有程序的版权和相应权利,
5+
在保留程序UI界面上的版权信息和链接的前提下,可免费使用或者二次开发
6+
如需更改版权信息或版权链接,需取得官方同意授权。
57

68
Apache Licence是著名的非盈利开源组织Apache采用的协议。
79
该协议和BSD类似,鼓励代码共享和尊重原作者的著作权,
@@ -29,3 +31,9 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
2931
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
3032
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
3133
POSSIBILITY OF SUCH DAMAGE.
34+
35+
Showdoc has an additional copyright notice on compliance with the Apache2 Open Source License:
36+
Showdoc official( https://www.showdoc.com.cn/ )And author star7th( https://github.com/star7th )Have the copyright and corresponding rights of the program,
37+
On the premise of retaining the copyright information and links on the program UI interface, it can be used for free or secondary development
38+
If you need to change copyright information or copyright links, you need to obtain official consent and authorization.
39+

Diff for: README.md

+5-7
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Responsive webpage design can share the project documents to computer or mobile
4343
- #### Permission Manage
4444

4545
- Public and Private Project
46-
46+
4747
Projects on ShowDoc are divided into two categories including Public Project and Private Project. The Public Project can be visited by anyone, the Private Project need to login. The password is set by project owner.
4848

4949
- Project Transfer
@@ -81,9 +81,7 @@ Responsive webpage design can share the project documents to computer or mobile
8181
### About the copyright
8282

8383
ShowDoc is issued complying with Apache2 Open Source License, and it is free.
84-
85-
Copyright © star7th
86-
87-
E-mail: xing7th#gmail.com (change # into @)
88-
89-
All rights reserved.
84+
Showdoc has an additional copyright notice on compliance with the Apache2 Open Source License:
85+
[Showdoc official](https://www.showdoc.com.cn/ 'Showdoc official') And author [star7th](https://github.com/star7th 'star7th') Have the copyright and corresponding rights of the program,
86+
On the premise of retaining the copyright information and links on the program UI interface, it can be used for free or secondary development
87+
If you need to change copyright information or copyright links, you need to obtain official consent and authorization.

Diff for: composer.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
"php": ">=5.3.0",
1919
"qcloud/cos-sdk-v5": "1.*",
2020
"league/oauth2-client": "^2.6",
21-
"jasig/phpcas": "^1.3"
21+
"jasig/phpcas": "^1.3",
22+
"aws/aws-sdk-php": "^3.208",
23+
"gregwar/captcha": "1.*"
2224
},
2325
"config": {
2426
"vendor-dir": "./server/vendor"

0 commit comments

Comments
 (0)