annotate LICENSE-MERGELY.html @ 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
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4125
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
1 <!DOCTYPE html>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
2 <html lang="en">
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
3 <!--[if IE]>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
4 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
5 <![endif]-->
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
6 <head>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
7 <meta charset="utf-8" /><title>Mergely License</title>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
8 <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
9 <meta name="description" content="Mergely license requirements for open source software and commercial software" />
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
10 <meta name="keywords" content="diff,merge,compare,compare documents,js diff,javascript diff,comparison,online diff,difference,file,text,unix,patch,algorithm,saas,longest common subsequence,diff online" />
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
11 <meta name="author" content="Jamie Peabody" />
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
12 <meta name="author" content="Jamie Peabody" />
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
13 <link rel="shortcut icon" href="http://www.mergely.com/favicon.ico" />
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
14 <link href='http://fonts.googleapis.com/css?family=Noto+Sans:400,700' rel='stylesheet' type='text/css' />
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
15 <link href='fonts/berlin-sans-fb-demi.css' rel='stylesheet' type='text/css' />
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
16 <link href='style/mergely.css' rel='stylesheet' type='text/css' />
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
17 <link href='/Mergely/lib/mergely.css' rel='stylesheet' type='text/css' />
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
18 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
19 <script type="text/javascript">
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
20 var _gaq = _gaq || [];
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
21 _gaq.push(['_setAccount', 'UA-85576-5']);
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
22 _gaq.push(['_trackPageview']);
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
23 (function() {
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
24 var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
25 ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
26 var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
27 })();
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
28 </script>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
29 </head>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
30 <body>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
31 <div id="page">
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
32 <div id="content">
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
33 <div id="header">
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
34 <h1><span>Mergely License - Closed Distribution License</span></h1>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
35 <div id="options">
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
36 <a href="/editor" class="button">Online Diff</a>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
37 <a href="/download" class="button">Download</a>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
38 </div>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
39 <nav>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
40 <ul>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
41 <li><a href="/">Home</a></li> <li><a href="/doc">Documentation</a></li> <li><a href="/about">About Mergely</a></li> <li><a href="/license">License</a></li> <li><a href="#footer">Contact</a></li> </ul>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
42 </nav>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
43 </div>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
44
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
45 <div id="main">
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
46 <h1>Mergely License</h1>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
47 <p>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
48 All Mergely code is Copyright 2014 by Jamie Peabody.
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
49 Mergely is distributed under the
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
50 <a href="http://www.gnu.org/licenses/gpl.html">GPL</a>,
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
51 <a href="http://www.gnu.org/licenses/lgpl.html">LGPL</a>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
52 and
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
53 <a href="http://www.mozilla.org/MPL/MPL-1.1.html">MPL</a> open source licenses.
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
54 This triple <b>copyleft</b> licensing model avoids incompatibility with other open
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
55 source licenses. These open source licenses are specially indicated for:
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
56 <ul>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
57 <li>Integrating Mergely into Open Source software;</li>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
58 <li>Personal and educational use of Mergely;</li>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
59 <li>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
60 Integrating Mergely in commercial software, taking care of satisfying
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
61 the Open Source licenses terms, while not able or interested on supporting
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
62 Mergely and its development.
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
63 </li>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
64 </ul>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
65 </p>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
66 <h2>Mergely Commercial License - Closed Distribution License - CDL</h2>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
67 <p>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
68 You may contact <a href="mailto:jamie.peabody@gmail.com">Jamie Peabody</a> to enquire about
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
69 obtaining a CDL license.
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
70 </p>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
71 <p>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
72 This license offers a very flexible way to integrate Mergely in your commercial
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
73 application. These are the main advantages it offers over an Open Source license:
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
74 </p>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
75 <p>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
76 Modifications and enhancements do not need to be released under an Open
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
77 Source license; There is no need to distribute any Open Source license terms
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
78 along with your product and no reference to it have to be done; You do not have
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
79 to mention any reference to Mergely in your product; Mergely source code does not
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
80 have to be distributed with your product; You can remove any file from Mergely
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
81 when integrating it with your product.
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
82 </p>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
83 <p>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
84 The CDL is a lifetime license valid for all previous releases of Mergely published
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
85 prior to the year of purchase, and any releases in the following year. Please select
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
86 the license option that best fit your needs above. It includes 1 year of
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
87 <b>personal e-mail support</b>.
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
88 </p>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
89 <h2>Third party codes</h2>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
90 <p>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
91 Mergely utilizes <b>CodeMirror</b>, a third-party library released under an
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
92 <a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
93 license. Also used is <b>jQuery</b> and is released under the
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
94 <a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a> or
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
95 <a href="http://www.gnu.org/licenses/gpl.html">GPL</a> Version 2 license.
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
96 </p>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
97 </div>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
98
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
99 <div id="footer">
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
100 <a href="/download" class="download">Download</a>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
101 <ul>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
102 <li id="google-plus"><a target="_blank" href="http://groups.google.com/group/mergely">http://groups.google.com/group/mergely</a></li>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
103 <li id="github"><a target="_blank" href="https://github.com/wickedest/Mergely">https://github.com/wickedest/Mergely</a></li>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
104 <li id="email"><a target="_blank" href="mailto:jamie.peabody@gmail.com">jamie.peabody@gmail.com</a></li>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
105 </ul>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
106 </div>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
107 </div>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
108 <div id="copyright">By <b>Jamie Peabody</b></div>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
109 </div>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
110 </body>
aa3b55946089 Migrate to Mergely 3.3.4.
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
diff changeset
111 </html>