Mercurial > kallithea
view LICENSE-MERGELY.html @ 7230:d24051ce961c
issues: support generic regex replacements in issue_url and issue_prefix
Issue reference linking is pretty limited:
- the issue_url is a literal with only three special tokens {id},
{repo} and {repo_name}. There is no way to let the URL be dependent on
other elements of the input issue reference.
- The value for {id} is somewhat oddly determined by the concatenation of
all parenthesized groups in the issue_pat regular expression
- the link text of the resulting link is limited to the contents of the
literal issue_prefix with the determined {id}. It is not possible to
retain the input issue reference verbatim, nor to let the link text be
dependent on other elements of the input issue reference.
This commit makes the issue reference linking more flexible:
- issue_prefix is replaced by the more generic issue_sub(stitution), which
is a string that may contain backreferences to regex groups specified in
issue_pat. This string, with backreferences resolved, is used as the
link text of urlified issue references.
- if issue_sub is empty, the entire text matched by issue_pat is used as
the link text.
- like issue_sub, also issue_url can contain backreferences to regex groups.
- {id} is no longer treated as a special token, as it can be solved by
generic backreferences ('\g<id>' assuming issue pattern contains something
like '(P<id>\d+)'. {repo} and {repo_name} are still supported, because
their value is provided externally and not normally part of the
issue pattern.
Documentation and ini file template is updated as well.
author | Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> |
---|---|
date | Sat, 10 Mar 2018 22:01:59 +0100 |
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>