##// END OF EJS Templates
upstream » kallithea
RSS

Clone from https://kallithea-scm.org/repos/kallithea

Migrate to Mergely 3.3.4....
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
"Bradley M. Kuhn" - - Load All Authors

File last commit:

r4125:aa3b5594 rhodecode-2.2.5-gpl
r4125:aa3b5594 rhodecode-2.2.5-gpl
Show More
LICENSE.md
70 lines | 2.0 KiB | text/x-minidsrc | MarkdownLexer
/ LICENSE.md
History | Annotation | Raw |Copy content |Copy permalink

Third-Party Code Included Herein

Various third-party code under GPLv3-compatible licenses is included as part
of Kallithea.

Bootstrap

Kallithea incorporates parts of the Javascript system called
Bootstrap, which is:

Copyright © 2012 Twitter, Inc.

and licensed under
the Apache License 2.0.

A copy of the Apache License 2.0 is also included in this distribution in its
entirety in the file Apache-License-2.0.txt

Codemirror

Kallithea incorporates parts of the Javascript system called
Codemirror, which is primarily:

Copyright © 2013 by Marijn Haverbeke marijnh@gmail.com

and licensed under the MIT-permissive license, which is
included in this distribution.

Additional files from upstream Codemirror are copyrighted by various authors
and licensed under other permissive licenses. The sub-directories under
.../public/js/mode/ include the copyright and
license notice and information as they appeared in Codemirror's upstream
release.

jQuery

Kallithea incorporates the Javascript system called
jQuery,
herein, and the Corresponding
Source can be found in https://github.com/jquery/jquery at tag 1.10.2
(mirrored at https://kallithea-scm.org/repos/mirror/jquery/files/1.10.2/ ).

It is Copyright 2013 jQuery Foundation and other contributors http://jquery.com/ and is under an
MIT-permissive license.

Mergely

Kallithea incorporates some code from the Javascript system called
Mergely.
Mergely's license, a
copy of which is included in this repository,
is (GPL|LGPL|MPL). Kallithea as GPLv3'd project chooses the GPL arm of that
tri-license.

EOF