Mercurial > kallithea
annotate LICENSE.md @ 4125:aa3b55946089 rhodecode-2.2.5-gpl
Migrate to Mergely 3.3.4.
RhodeCode 2.2.5 distributed Mergely 3.3.4 with some of the changes that
Mergely 3.3.3 in RhodeCode 1.7.2 also had. That do however not seem to be
changes we want for Kallithea this way and we take the 3.3.4 files as they are.
I've also included the Mergely license file, as downloaded from:
http://www.mergely.com/license.php
That LICENSE file is kept in HTML just as it was downloaded from their
website. While it's a bit annoying to keep the license file in HTML, this is
the way it came from upstream so we'll leave it that way.
Since the Javascript code is used with other GPLv3 Javascript, we are using the
GPL option of Mergely's tri-license.
Finally, note that previously, this was incorrectly called "mergerly", so the
opportunity is taken here to correct the name. That required changes to
diff_2way.html.
As commands::
$ wget -N --output-document LICENSE-MERGELY.html http://www.mergely.com/license.php
$ hg add LICENSE-MERGELY.html
$ hg mv rhodecode/public/css/mergerly.css rhodecode/public/css/mergely.css
$ hg mv rhodecode/public/js/mergerly.js rhodecode/public/js/mergely.js
$ sed -i 's,mergerly\.,mergely,g' rhodecode/templates/files/diff_2way.html
$ ( cd /tmp; \
wget -N http://www.mergely.com/releases/mergely-3.3.4.zip; \
unzip mergely-3.3.4.zip )
$ sha256sum /tmp/mergely-3.3.4.zip
87415d30494bbe829c248881aa7cdc0303f7e70b458a5f687615564d4498cc82 mergely-3.3.4.zip
$ cp /tmp/mergely-3.3.4/lib/mergely.js rhodecode/public/js/mergely.js
$ cp /tmp/mergely-3.3.4/lib/mergely.css rhodecode/public/css/mergely.css
$ sed -i -e '/^ \* Version/a\ *\n * NOTE by bkuhn@sfconservancy.org for Kallithea:\n * Mergely license appears at http://www.mergely.com/license.php and in LICENSE-MERGELY.html' rhodecode/public/js/mergely.js rhodecode/public/css/mergely.css
author | "Bradley M. Kuhn" <bkuhn@ebb.org> |
---|---|
date | Mon, 26 May 2014 20:21:00 -0400 |
parents | 34a887bd21ae |
children | f8bb2cf6bdaf |
rev | line source |
---|---|
4118
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
1 Third-Party Code Included Herein |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
2 ================================ |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
3 |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
4 Various third-party code under GPLv3-compatible licenses is included as part |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
5 of Kallithea. |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
6 |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
7 |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
8 |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
9 Bootstrap |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
10 --------- |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
11 |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
12 Kallithea incorporates parts of the Javascript system called |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
13 [Bootstrap](http://getbootstrap.com/), which is: |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
14 |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
15 Copyright © 2012 Twitter, Inc. |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
16 |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
17 and licensed under |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
18 [the Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
19 |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
20 A copy of the Apache License 2.0 is also included in this distribution in its |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
21 entirety in the file Apache-License-2.0.txt |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
22 |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
23 |
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
24 |
4121
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
25 Codemirror |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
26 ---------- |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
27 |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
28 Kallithea incorporates parts of the Javascript system called |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
29 [Codemirror](http://codemirror.net/), which is primarily: |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
30 |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
31 Copyright © 2013 by Marijn Haverbeke <marijnh@gmail.com> |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
32 |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
33 and licensed under the MIT-permissive license, which is |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
34 [included in this distribution](MIT-Permissive-License.txt). |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
35 |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
36 Additional files from upstream Codemirror are copyrighted by various authors |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
37 and licensed under other permissive licenses. The sub-directories under |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
38 [.../public/js/mode/](rhodecode/public/js/mode) include the copyright and |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
39 license notice and information as they appeared in Codemirror's upstream |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
40 release. |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
41 |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
42 |
8c543e371e39
Update LICENSE.md to include license information about Codemirror 3.15
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4118
diff
changeset
|
43 |
4124
34a887bd21ae
Update LICENSE.md to include license information about jQueery 1.10.2
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4121
diff
changeset
|
44 jQuery |
34a887bd21ae
Update LICENSE.md to include license information about jQueery 1.10.2
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4121
diff
changeset
|
45 ------ |
34a887bd21ae
Update LICENSE.md to include license information about jQueery 1.10.2
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4121
diff
changeset
|
46 |
34a887bd21ae
Update LICENSE.md to include license information about jQueery 1.10.2
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4121
diff
changeset
|
47 Kallithea incorporates the Javascript system called |
34a887bd21ae
Update LICENSE.md to include license information about jQueery 1.10.2
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4121
diff
changeset
|
48 [jQuery](http://jquery.org/), |
34a887bd21ae
Update LICENSE.md to include license information about jQueery 1.10.2
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4121
diff
changeset
|
49 [herein](rhodecode/public/js/jquery-1.10.2.min.js), and the Corresponding |
34a887bd21ae
Update LICENSE.md to include license information about jQueery 1.10.2
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4121
diff
changeset
|
50 Source can be found in https://github.com/jquery/jquery at tag 1.10.2 |
34a887bd21ae
Update LICENSE.md to include license information about jQueery 1.10.2
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4121
diff
changeset
|
51 (mirrored at https://kallithea-scm.org/repos/mirror/jquery/files/1.10.2/ ). |
34a887bd21ae
Update LICENSE.md to include license information about jQueery 1.10.2
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4121
diff
changeset
|
52 |
34a887bd21ae
Update LICENSE.md to include license information about jQueery 1.10.2
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4121
diff
changeset
|
53 It is Copyright 2013 jQuery Foundation and other contributors http://jquery.com/ and is under an |
34a887bd21ae
Update LICENSE.md to include license information about jQueery 1.10.2
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4121
diff
changeset
|
54 [MIT-permissive license](MIT-Permissive-License.txt). |
34a887bd21ae
Update LICENSE.md to include license information about jQueery 1.10.2
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4121
diff
changeset
|
55 |
34a887bd21ae
Update LICENSE.md to include license information about jQueery 1.10.2
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4121
diff
changeset
|
56 |
34a887bd21ae
Update LICENSE.md to include license information about jQueery 1.10.2
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4121
diff
changeset
|
57 |
4125
aa3b55946089
Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4124
diff
changeset
|
58 Mergely |
aa3b55946089
Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4124
diff
changeset
|
59 ------- |
aa3b55946089
Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4124
diff
changeset
|
60 |
aa3b55946089
Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4124
diff
changeset
|
61 Kallithea incorporates some code from the Javascript system called |
aa3b55946089
Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4124
diff
changeset
|
62 [Mergely](http://http://www.mergely.com/). |
aa3b55946089
Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4124
diff
changeset
|
63 [Mergely's license](http://www.mergely.com/license.php), a |
aa3b55946089
Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4124
diff
changeset
|
64 [copy of which is included in this repository](LICENSE-MERGELY.html), |
aa3b55946089
Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4124
diff
changeset
|
65 is (GPL|LGPL|MPL). Kallithea as GPLv3'd project chooses the GPL arm of that |
aa3b55946089
Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4124
diff
changeset
|
66 tri-license. |
aa3b55946089
Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4124
diff
changeset
|
67 |
aa3b55946089
Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4124
diff
changeset
|
68 |
aa3b55946089
Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
4124
diff
changeset
|
69 |
4118
fd2dff0588bc
Introduce LICENSE.md to include license information about Bootstrap 3.0.0
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
diff
changeset
|
70 EOF |