view LICENSE-MERGELY.html @ 6030:5dfaa9f1fdb2

templates: disable special mako error handler - ironically this gives better stack traces Errors in templates could give truncated stack traces pointing at the mako error handler: ... File '.../kallithea/kallithea/controllers/files.py', line 202 in index return render('files/files.html') File '.../kallithea-venv/lib/python2.7/site-packages/pylons/templating.py', line 244 in render_mako cache_type=cache_type, cache_expire=cache_expire) File '.../kallithea-venv/lib/python2.7/site-packages/pylons/templating.py', line 219 in cached_template return render_func() File '.../kallithea-venv/lib/python2.7/site-packages/pylons/templating.py', line 241 in render_template return literal(template.render_unicode(**globs)) File '.../kallithea-venv/lib/python2.7/site-packages/mako/template.py', line 452 in render_unicode as_unicode=True) File '.../kallithea-venv/lib/python2.7/site-packages/mako/runtime.py', line 803 in _render **_kwargs_for_callable(callable_, data)) File '.../kallithea-venv/lib/python2.7/site-packages/mako/runtime.py', line 835 in _render_context _exec_template(inherit, lclcontext, args=args, kwargs=kwargs) File '.../kallithea-venv/lib/python2.7/site-packages/mako/runtime.py', line 855 in _exec_template _render_error(template, context, compat.exception_as()) File '.../kallithea-venv/lib/python2.7/site-packages/mako/runtime.py', line 864 in _render_error result = template.error_handler(context, error) File '.../kallithea-venv/lib/python2.7/site-packages/pylons/error.py', line 22 in handle_mako_error raise (exc, None, sys.exc_info()[2]) AttributeError: 'tuple' object has no attribute 'node' Without the mako error handler we get a full and useful stack trace - including calls in generated but readable .html.py files. File '.../kallithea/kallithea/controllers/files.py', line 202 in index return render('files/files.html') File '.../kallithea-venv/lib/python2.7/site-packages/pylons/templating.py', line 244 in render_mako cache_type=cache_type, cache_expire=cache_expire) File '.../kallithea-venv/lib/python2.7/site-packages/pylons/templating.py', line 219 in cached_template return render_func() File '.../kallithea-venv/lib/python2.7/site-packages/pylons/templating.py', line 241 in render_template return literal(template.render_unicode(**globs)) File '.../kallithea-venv/lib/python2.7/site-packages/mako/template.py', line 452 in render_unicode as_unicode=True) File '.../kallithea-venv/lib/python2.7/site-packages/mako/runtime.py', line 803 in _render **_kwargs_for_callable(callable_, data)) File '.../kallithea-venv/lib/python2.7/site-packages/mako/runtime.py', line 835 in _render_context _exec_template(inherit, lclcontext, args=args, kwargs=kwargs) File '.../kallithea-venv/lib/python2.7/site-packages/mako/runtime.py', line 860 in _exec_template callable_(context, *args, **kwargs) File '.../data/templates/base/root.html.py', line 219 in render_body __M_writer(escape(next.body())) File '.../data/templates/base/base.html.py', line 57 in render_body __M_writer(escape(next.main())) File '.../data/templates/files/files.html.py', line 121 in render_main runtime._include_file(context, u'files_ypjax.html', _template_uri) File '.../kallithea-venv/lib/python2.7/site-packages/mako/runtime.py', line 730 in _include_file callable_(ctx, **_kwargs_for_include(callable_, context._data, **kwargs)) File '.../data/templates/files/files_ypjax.html.py', line 57 in render_body runtime._include_file(context, u'files_source.html', _template_uri) File '.../kallithea-venv/lib/python2.7/site-packages/mako/runtime.py', line 730 in _include_file callable_(ctx, **_kwargs_for_include(callable_, context._data, **kwargs)) File '.../data/templates/files/files_source.html.py', line 117 in render_body __M_writer(escape(h.pygmentize_annotation(c.repo_name,c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight"))) File '.../kallithea/kallithea/lib/helpers.py', line 360 in pygmentize_annotation return literal(markup_whitespace(annotate_highlight(filenode, url_func(repo_name), **kwargs))) File '.../kallithea/kallithea/lib/annotate.py', line 57 in annotate_highlight highlighted = highlight(filenode.content, lexer, formatter) File '.../kallithea-venv/lib/python2.7/site-packages/pygments/__init__.py', line 87 in highlight return format(lex(code, lexer), formatter, outfile) File '.../kallithea-venv/lib/python2.7/site-packages/pygments/__init__.py', line 66 in format formatter.format(tokens, realoutfile) File '.../kallithea-venv/lib/python2.7/site-packages/pygments/formatter.py', line 95 in format return self.format_unencoded(tokensource, outfile) File '.../kallithea-venv/lib/python2.7/site-packages/pygments/formatters/html.py', line 850 in format_unencoded for t, piece in source: File '.../kallithea/kallithea/lib/annotate.py', line 168 in _wrap_tablelinenos for el in self.filenode.annotate)) File '.../kallithea/kallithea/lib/annotate.py', line 167 in <genexpr> annotate = ''.join((self.annotate_from_changeset(el[2]()) File '.../kallithea/kallithea/lib/vcs/backends/hg/changeset.py', line 273 in get_file_annotate sha = hex(annotate_data[0].node())
author Mads Kiilerich <madski@unity3d.com>
date Thu, 28 Jul 2016 16:28:34 +0200
parents aa3b55946089
children
line wrap: on
line source

<!DOCTYPE html>
<html lang="en">
<!--[if IE]>
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<![endif]-->
<head>
	<meta charset="utf-8" /><title>Mergely License</title>
	<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
	<meta name="description" content="Mergely license requirements for open source software and commercial software" />
	<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" />
	<meta name="author" content="Jamie Peabody" />
	<meta name="author" content="Jamie Peabody" />
	<link rel="shortcut icon" href="http://www.mergely.com/favicon.ico" />
    <link href='http://fonts.googleapis.com/css?family=Noto+Sans:400,700' rel='stylesheet' type='text/css' />
    <link href='fonts/berlin-sans-fb-demi.css' rel='stylesheet' type='text/css' />
    <link href='style/mergely.css' rel='stylesheet' type='text/css' />
    <link href='/Mergely/lib/mergely.css' rel='stylesheet' type='text/css' />
	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
	<script type="text/javascript">
		var _gaq = _gaq || [];
		_gaq.push(['_setAccount', 'UA-85576-5']);
		_gaq.push(['_trackPageview']);
		(function() {
			var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
			ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
		})();
	</script>
</head>
<body>
    <div id="page">
        <div id="content">
            <div id="header">
                <h1><span>Mergely License - Closed Distribution License</span></h1>
                <div id="options">
                    <a href="/editor" class="button">Online Diff</a>
                    <a href="/download" class="button">Download</a>
                </div>
                <nav>
                    <ul>
                        <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>
                </nav>
            </div>

            <div id="main">
				<h1>Mergely License</h1>
				<p>
					All Mergely code is Copyright 2014 by Jamie Peabody.
					Mergely is distributed under the 
					<a href="http://www.gnu.org/licenses/gpl.html">GPL</a>, 
					<a href="http://www.gnu.org/licenses/lgpl.html">LGPL</a>
					and 
					<a href="http://www.mozilla.org/MPL/MPL-1.1.html">MPL</a> open source licenses. 
					This triple <b>copyleft</b> licensing model avoids incompatibility with other open 
					source licenses. These open source licenses are specially indicated for:
					<ul>
						<li>Integrating Mergely into Open Source software;</li>
						<li>Personal and educational use of Mergely;</li>
						<li>
							Integrating Mergely in commercial software, taking care of satisfying 
							the Open Source licenses terms, while not able or interested on supporting 
							Mergely and its development.
						</li>
					</ul>
				</p>
				<h2>Mergely Commercial License - Closed Distribution License - CDL</h2>
				<p>
					You may contact <a href="mailto:jamie.peabody@gmail.com">Jamie Peabody</a> to enquire about
					obtaining a CDL license.
				</p>
				<p>
					This license offers a very flexible way to integrate Mergely in your commercial 
					application. These are the main advantages it offers over an Open Source license:
				</p>
				<p>
					Modifications and enhancements do not need to be released under an Open 
					Source license; There is no need to distribute any Open Source license terms 
					along with your product and no reference to it have to be done; You do not have
					to mention any reference to Mergely in your product; Mergely source code does not
					have to be distributed with your product; You can remove any file from Mergely 
					when integrating it with your product.
				</p>
				<p>
					The CDL is a lifetime license valid for all previous releases of Mergely published 
                    prior to the year of purchase, and any releases in the following year. Please select 
                    the license option that best fit your needs above. It includes 1 year of 
                    <b>personal e-mail support</b>.
				</p>
				<h2>Third party codes</h2>
				<p>
					Mergely utilizes <b>CodeMirror</b>, a third-party library released under an 
					<a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a>
					license.  Also used is <b>jQuery</b> and is released under the 
					<a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a> or 
					<a href="http://www.gnu.org/licenses/gpl.html">GPL</a> Version 2 license.
				</p>
            </div>
            
            <div id="footer">
                <a href="/download" class="download">Download</a>
                <ul>
                    <li id="google-plus"><a target="_blank" href="http://groups.google.com/group/mergely">http://groups.google.com/group/mergely</a></li>
                    <li id="github"><a target="_blank" href="https://github.com/wickedest/Mergely">https://github.com/wickedest/Mergely</a></li>
                    <li id="email"><a target="_blank" href="mailto:jamie.peabody@gmail.com">jamie.peabody@gmail.com</a></li>
                </ul>
            </div>
        </div>
        <div id="copyright">By <b>Jamie Peabody</b></div>
    </div>
</body>
</html>