Skip to content

Commit 6d1b5fd

Browse files
authored
Merge branch 'master' into Redirect-user-and-org-go-gitea#9531
2 parents 7d3849f + e35a2b6 commit 6d1b5fd

File tree

397 files changed

+12501
-13257
lines changed

Some content is hidden

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

397 files changed

+12501
-13257
lines changed

options/license/AAL

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
Attribution Assurance License Copyright (c) 2002 by AUTHOR PROFESSIONAL IDENTIFICATION
2-
* URL "PROMOTIONAL SLOGAN FOR AUTHOR'S PROFESSIONAL PRACTICE"
1+
Attribution Assurance License
32

4-
All Rights Reserved ATTRIBUTION ASSURANCE LICENSE (adapted from the original
5-
BSD license)
3+
Copyright (c) 2002 by AUTHOR PROFESSIONAL IDENTIFICATION * URL "PROMOTIONAL
4+
SLOGAN FOR AUTHOR'S PROFESSIONAL PRACTICE"
5+
6+
All Rights Reserved
7+
8+
ATTRIBUTION ASSURANCE LICENSE (adapted from the original BSD license)
69

710
Redistribution and use in source and binary forms, with or without modification,
811
are permitted provided that the conditions below are met. These conditions
@@ -20,11 +23,9 @@ program or a program dependent thereon is launched, a prominent display (e.g.,
2023
splash screen or banner text) of the Author's attribution information, which
2124
includes:
2225

23-
(a) Name ("AUTHOR"),
24-
25-
(b) Professional identification ("PROFESSIONAL IDENTIFICATION"), and
26-
27-
(c) URL ("URL").
26+
(a) Name ("AUTHOR"),
27+
(b) Professional identification ("PROFESSIONAL IDENTIFICATION"), and
28+
(c) URL ("URL").
2829

2930
3. Neither the name nor any trademark of the Author may be used to endorse
3031
or promote products derived from this software without specific prior written

options/license/AFL-1.1

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
Academic Free License
2+
Version 1.1
23

3-
Version 1.1 The Academic Free License applies to any original work of authorship
4-
(the "Original Work") whose owner (the "Licensor") has placed the following
5-
notice immediately following the copyright notice for the Original Work:
4+
The Academic Free License applies to any original work of authorship (the
5+
"Original Work") whose owner (the "Licensor") has placed the following notice
6+
immediately following the copyright notice for the Original Work:
67

7-
"Licensed under the Academic Free License version 1.1."
8+
"Licensed under the Academic Free License version 1.1."
89

910
Grant of License. Licensor hereby grants to any person obtaining a copy of
1011
the Original Work ("You") a world-wide, royalty-free, non-exclusive, perpetual,
@@ -73,7 +74,6 @@ for Patent Action" clause infringes any patent claims that are essential to
7374
use that software.
7475

7576
This license is Copyright (C) 2002 Lawrence E. Rosen. All rights reserved.
76-
7777
Permission is hereby granted to copy and distribute this license without modification.
7878
This license may not be modified without the express written permission of
7979
its copyright owner.

options/license/AFL-1.2

+18-16
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
Academic Free License
2+
Version 1.2
23

3-
Version 1.2 This Academic Free License applies to any original work of authorship
4-
(the "Original Work") whose owner (the "Licensor") has placed the following
5-
notice immediately following the copyright notice for the Original Work:
4+
This Academic Free License applies to any original work of authorship (the
5+
"Original Work") whose owner (the "Licensor") has placed the
6+
following notice immediately following the copyright notice for the Original
7+
Work:
68

7-
Licensed under the Academic Free License version 1.2
9+
Licensed under the Academic Free License version 1.2
810

911
Grant of License. Licensor hereby grants to any person obtaining a copy of
1012
the Original Work ("You") a world-wide, royalty-free, non-exclusive, perpetual,
@@ -13,7 +15,8 @@ distribute and/or sell copies of the Original Work and derivative works thereof,
1315
and (2) under patent claims owned or controlled by the Licensor that are embodied
1416
in the Original Work as furnished by the Licensor, to make, use, sell and
1517
offer for sale the Original Work and derivative works thereof, subject to
16-
the following conditions.
18+
the
19+
following conditions.
1720

1821
Attribution Rights. You must retain, in the Source Code of any Derivative
1922
Works that You create, all copyright, patent or trademark notices from the
@@ -52,16 +55,16 @@ do not allow the exclusion or limitation of incidental or consequential damages,
5255
so this exclusion and limitation may not apply to You.
5356

5457
License to Source Code. The term "Source Code" means the preferred form of
55-
the Original Work for making modifications to it and all available documentation
56-
describing how to modify the Original Work. Licensor hereby agrees to provide
57-
a machine-readable copy of the Source Code of the Original Work along with
58-
each copy of the Original Work that Licensor distributes. Licensor reserves
59-
the right to satisfy this obligation by placing a machine-readable copy of
60-
the Source Code in an information repository reasonably calculated to permit
61-
inexpensive and convenient access by You for as long as Licensor continues
62-
to distribute the Original Work, and by publishing the address of that information
63-
repository in a notice immediately following the copyright notice that applies
64-
to the Original Work.
58+
the Original Work for making modifications to it and all available
59+
documentation describing how to modify the Original Work. Licensor hereby
60+
agrees to provide a machine-readable copy of the Source Code of the Original
61+
Work along with each copy of the Original Work that Licensor distributes.
62+
Licensor reserves the right to satisfy this obligation by placing a machine-readable
63+
copy of the Source Code in an information repository reasonably calculated
64+
to permit inexpensive and convenient access by You for as long as Licensor
65+
continues to distribute the Original Work, and by publishing the address of
66+
that information repository in a notice immediately following the copyright
67+
notice that applies to the Original Work.
6568

6669
Mutual Termination for Patent Action. This License shall terminate automatically
6770
and You may no longer exercise any of the rights granted to You by this License
@@ -75,7 +78,6 @@ or conditioned by this License or by law, and Licensor promises not to interfere
7578
with or be responsible for such uses by You.
7679

7780
This license is Copyright (C) 2002 Lawrence E. Rosen. All rights reserved.
78-
7981
Permission is hereby granted to copy and distribute this license without modification.
8082
This license may not be modified without the express written permission of
8183
its copyright owner.

options/license/AFL-2.0

+39-43
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
The Academic Free License
2+
v. 2.0
23

3-
v. 2.0 This Academic Free License (the "License") applies to any original
4-
work of authorship (the "Original Work") whose owner (the "Licensor") has
5-
placed the following notice immediately following the copyright notice for
6-
the Original Work:
4+
This Academic Free License (the "License") applies to any original work of
5+
authorship (the "Original Work") whose owner (the "Licensor") has placed the
6+
following notice immediately following the copyright notice for the Original
7+
Work:
78

8-
Licensed under the Academic Free License version 2.0
9+
Licensed under the Academic Free License version 2.0
910

1011
1) Grant of Copyright License. Licensor hereby grants You a world-wide, royalty-free,
1112
non-exclusive, perpetual, sublicenseable license to do the following:
1213

13-
a) to reproduce the Original Work in copies;
14-
14+
a) to reproduce the Original Work in copies;
1515
b) to prepare derivative works ("Derivative Works") based upon the Original
1616
Work;
17-
1817
c) to distribute copies of the Original Work and Derivative Works to the public;
19-
20-
d) to perform the Original Work publicly; and
21-
22-
e) to display the Original Work publicly.
18+
d) to perform the Original Work publicly; and
19+
e) to display the Original Work publicly.
2320

2421
2) Grant of Patent License. Licensor hereby grants You a world-wide, royalty-free,
2522
non-exclusive, perpetual, sublicenseable license, under patent claims owned
@@ -29,7 +26,7 @@ Derivative Works.
2926

3027
3) Grant of Source Code License. The term "Source Code" means the preferred
3128
form of the Original Work for making modifications to it and all available
32-
documentation describing how to modify the Original Work. Licensor hereby
29+
documentation describing how to modify the Original Work. Licensor hereby
3330
agrees to provide a machine-readable copy of the Source Code of the Original
3431
Work along with each copy of the Original Work that Licensor distributes.
3532
Licensor reserves the right to satisfy this obligation by placing a machine-readable
@@ -42,23 +39,23 @@ notice that applies to the Original Work.
4239
4) Exclusions From License Grant. Neither the names of Licensor, nor the names
4340
of any contributors to the Original Work, nor any of their trademarks or service
4441
marks, may be used to endorse or promote products derived from this Original
45-
Work without express prior written permission of the Licensor. Nothing in
42+
Work without express prior written permission of the Licensor. Nothing in
4643
this License shall be deemed to grant any rights to trademarks, copyrights,
4744
patents, trade secrets or any other intellectual property of Licensor except
48-
as expressly stated herein. No patent license is granted to make, use, sell
45+
as expressly stated herein. No patent license is granted to make, use, sell
4946
or offer to sell embodiments of any patent claims other than the licensed
50-
claims defined in Section 2. No right is granted to the trademarks of Licensor
51-
even if such marks are included in the Original Work. Nothing in this License
47+
claims defined in Section 2. No right is granted to the trademarks of Licensor
48+
even if such marks are included in the Original Work. Nothing in this License
5249
shall be interpreted to prohibit Licensor from licensing under different terms
5350
from this License any Original Work that Licensor otherwise would have a right
5451
to license.
5552

56-
5) This section intentionally omitted.
53+
5) This section intentionally omitted.
5754

5855
6) Attribution Rights. You must retain, in the Source Code of any Derivative
5956
Works that You create, all copyright, patent or trademark notices from the
6057
Source Code of the Original Work, as well as any notices of licensing and
61-
any descriptive text identified therein as an "Attribution Notice." You must
58+
any descriptive text identified therein as an "Attribution Notice." You must
6259
cause the Source Code for any Derivative Works that You create to carry a
6360
prominent Attribution Notice reasonably calculated to inform recipients that
6461
You have modified the Original Work.
@@ -67,11 +64,11 @@ You have modified the Original Work.
6764
the copyright in and to the Original Work and the patent rights granted herein
6865
by Licensor are owned by the Licensor or are sublicensed to You under the
6966
terms of this License with the permission of the contributor(s) of those copyrights
70-
and patent rights. Except as expressly stated in the immediately proceeding
67+
and patent rights. Except as expressly stated in the immediately proceeding
7168
sentence, the Original Work is provided under this License on an "AS IS" BASIS
7269
and WITHOUT WARRANTY, either express or implied, including, without limitation,
7370
the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR
74-
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU.
71+
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU.
7572
This DISCLAIMER OF WARRANTY constitutes an essential part of this License.
7673
No license to Original Work is granted hereunder except under this disclaimer.
7774

@@ -81,23 +78,23 @@ Licensor be liable to any person for any direct, indirect, special, incidental,
8178
or consequential damages of any character arising as a result of this License
8279
or the use of the Original Work including, without limitation, damages for
8380
loss of goodwill, work stoppage, computer failure or malfunction, or any and
84-
all other commercial damages or losses. This limitation of liability shall
81+
all other commercial damages or losses. This limitation of liability shall
8582
not apply to liability for death or personal injury resulting from Licensor's
86-
negligence to the extent applicable law prohibits such limitation. Some jurisdictions
83+
negligence to the extent applicable law prohibits such limitation. Some jurisdictions
8784
do not allow the exclusion or limitation of incidental or consequential damages,
8885
so this exclusion and limitation may not apply to You.
8986

90-
9) Acceptance and Termination. If You distribute copies of the Original Work
87+
9) Acceptance and Termination. If You distribute copies of the Original Work
9188
or a Derivative Work, You must make a reasonable effort under the circumstances
92-
to obtain the express assent of recipients to the terms of this License. Nothing
93-
else but this License (or another written agreement between Licensor and You)
94-
grants You permission to create Derivative Works based upon the Original Work
95-
or to exercise any of the rights granted in Section 1 herein, and any attempt
96-
to do so except under the terms of this License (or another written agreement
97-
between Licensor and You) is expressly prohibited by U.S. copyright law, the
98-
equivalent laws of other countries, and by international treaty. Therefore,
99-
by exercising any of the rights granted to You in Section 1 herein, You indicate
100-
Your acceptance of this License and all of its terms and conditions.
89+
to obtain the express assent of recipients to the terms of this License.
90+
Nothing else but this License (or another written agreement between Licensor
91+
and You) grants You permission to create Derivative Works based upon the Original
92+
Work or to exercise any of the rights granted in Section 1 herein, and any
93+
attempt to do so except under the terms of this License (or another written
94+
agreement between Licensor and You) is expressly prohibited by U.S. copyright
95+
law, the equivalent laws of other countries, and by international treaty.
96+
Therefore, by exercising any of the rights granted to You in Section 1 herein,
97+
You indicate Your acceptance of this License and all of its terms and conditions.
10198

10299
10) Termination for Patent Action. This License shall terminate automatically
103100
and You may no longer exercise any of the rights granted to You by this License
@@ -110,31 +107,31 @@ other software or hardware).
110107
11) Jurisdiction, Venue and Governing Law. Any action or suit relating to
111108
this License may be brought only in the courts of a jurisdiction wherein the
112109
Licensor resides or in which Licensor conducts its primary business, and under
113-
the laws of that jurisdiction excluding its conflict-of-law provisions. The
110+
the laws of that jurisdiction excluding its conflict-of-law provisions. The
114111
application of the United Nations Convention on Contracts for the International
115-
Sale of Goods is expressly excluded. Any use of the Original Work outside
112+
Sale of Goods is expressly excluded. Any use of the Original Work outside
116113
the scope of this License or after its termination shall be subject to the
117114
requirements and penalties of the U.S. Copyright Act, 17 U.S.C. ¤ 101 et seq.,
118-
the equivalent laws of other countries, and international treaty. This section
115+
the equivalent laws of other countries, and international treaty. This section
119116
shall survive the termination of this License.
120117

121118
12) Attorneys Fees. In any action to enforce the terms of this License or
122119
seeking damages relating thereto, the prevailing party shall be entitled to
123120
recover its costs and expenses, including, without limitation, reasonable
124121
attorneys' fees and costs incurred in connection with such action, including
125-
any appeal of such action. This section shall survive the termination of this
126-
License.
122+
any appeal of such action. This section shall survive the termination of
123+
this License.
127124

128125
13) Miscellaneous. This License represents the complete agreement concerning
129-
the subject matter hereof. If any provision of this License is held to be
126+
the subject matter hereof. If any provision of this License is held to be
130127
unenforceable, such provision shall be reformed only to the extent necessary
131128
to make it enforceable.
132129

133130
14) Definition of "You" in This License. "You" throughout this License, whether
134131
in upper or lower case, means an individual or a legal entity exercising rights
135-
under, and complying with all of the terms of, this License. For legal entities,
132+
under, and complying with all of the terms of, this License. For legal entities,
136133
"You" includes any entity that controls, is controlled by, or is under common
137-
control with you. For purposes of this definition, "control" means (i) the
134+
control with you. For purposes of this definition, "control" means (i) the
138135
power, direct or indirect, to cause the direction or management of such entity,
139136
whether by contract or otherwise, or (ii) ownership of fifty percent (50%)
140137
or more of the outstanding shares, or (iii) beneficial ownership of such entity.
@@ -143,8 +140,7 @@ or more of the outstanding shares, or (iii) beneficial ownership of such entity.
143140
restricted or conditioned by this License or by law, and Licensor promises
144141
not to interfere with or be responsible for such uses by You.
145142

146-
This license is Copyright (C) 2003 Lawrence E. Rosen. All rights reserved.
147-
143+
This license is Copyright (C) 2003 Lawrence E. Rosen. All rights reserved.
148144
Permission is hereby granted to copy and distribute this license without modification.
149145
This license may not be modified without the express written permission of
150146
its copyright owner.

options/license/AFL-2.1

+9-13
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
The Academic Free License
2+
v.2.1
23

3-
v.2.1 This Academic Free License (the "License") applies to any original work
4-
of authorship (the "Original Work") whose owner (the "Licensor") has placed
5-
the following notice immediately following the copyright notice for the Original
4+
This Academic Free License (the "License") applies to any original work of
5+
authorship (the "Original Work") whose owner (the "Licensor") has placed the
6+
following notice immediately following the copyright notice for the Original
67
Work:
78

8-
Licensed under the Academic Free License version 2.1
9+
Licensed under the Academic Free License version 2.1
910

1011
1) Grant of Copyright License. Licensor hereby grants You a world-wide, royalty-free,
1112
non-exclusive, perpetual, sublicenseable license to do the following:
1213

13-
a) to reproduce the Original Work in copies;
14-
14+
a) to reproduce the Original Work in copies;
1515
b) to prepare derivative works ("Derivative Works") based upon the Original
1616
Work;
17-
1817
c) to distribute copies of the Original Work and Derivative Works to the public;
19-
20-
d) to perform the Original Work publicly; and
21-
22-
e) to display the Original Work publicly.
18+
d) to perform the Original Work publicly; and
19+
e) to display the Original Work publicly.
2320

2421
2) Grant of Patent License. Licensor hereby grants You a world-wide, royalty-free,
2522
non-exclusive, perpetual, sublicenseable license, under patent claims owned
@@ -53,7 +50,7 @@ shall be interpreted to prohibit Licensor from licensing under different terms
5350
from this License any Original Work that Licensor otherwise would have a right
5451
to license.
5552

56-
5) This section intentionally omitted.
53+
5) This section intentionally omitted.
5754

5855
6) Attribution Rights. You must retain, in the Source Code of any Derivative
5956
Works that You create, all copyright, patent or trademark notices from the
@@ -144,7 +141,6 @@ restricted or conditioned by this License or by law, and Licensor promises
144141
not to interfere with or be responsible for such uses by You.
145142

146143
This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights reserved.
147-
148144
Permission is hereby granted to copy and distribute this license without modification.
149145
This license may not be modified without the express written permission of
150146
its copyright owner.

0 commit comments

Comments
 (0)