Mercurial > kallithea
comparison rhodecode/templates/changeset/diff_block.html @ 4116:ffd45b185016 rhodecode-2.2.5-gpl
Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
This imports changes between changesets 21af6c4eab3d and 6177597791c2 in
RhodeCode's original repository, including only changes to Python files and HTML.
RhodeCode clearly licensed its changes to these files under GPLv3
in their /LICENSE file, which states the following:
The Python code and integrated HTML are licensed under the GPLv3 license.
(See:
https://code.rhodecode.com/rhodecode/files/v2.2.5/LICENSE
or
http://web.archive.org/web/20140512193334/https://code.rhodecode.com/rhodecode/files/f3b123159901f15426d18e3dc395e8369f70ebe0/LICENSE
for an online copy of that LICENSE file)
Conservancy reviewed these changes and confirmed that they can be licensed as
a whole to the Kallithea project under GPLv3-only.
While some of the contents committed herein are clearly licensed
GPLv3-or-later, on the whole we must assume the are GPLv3-only, since the
statement above from RhodeCode indicates that they intend GPLv3-only as their
license, per GPLv3ยง14 and other relevant sections of GPLv3.
| author | Bradley M. Kuhn <bkuhn@sfconservancy.org> |
|---|---|
| date | Wed, 02 Jul 2014 19:03:13 -0400 |
| parents | a1bc4af25ec5 |
| children |
comparison
equal
deleted
inserted
replaced
| 4115:8b7294a804a0 | 4116:ffd45b185016 |
|---|---|
| 16 <div class="changeset_file"> | 16 <div class="changeset_file"> |
| 17 ${h.link_to_if(change!='D',h.safe_unicode(path),h.url('files_home',repo_name=c.repo_name, | 17 ${h.link_to_if(change!='D',h.safe_unicode(path),h.url('files_home',repo_name=c.repo_name, |
| 18 revision=cs2,f_path=h.safe_unicode(path)))} | 18 revision=cs2,f_path=h.safe_unicode(path)))} |
| 19 </div> | 19 </div> |
| 20 <div class="diff-actions"> | 20 <div class="diff-actions"> |
| 21 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full diff for this file'))}"><img class="icon" src="${h.url('/images/icons/page_white_go.png')}"/></a> | 21 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full diff for this file'))}"> |
| 22 <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full side-by-side diff for this file'))}"><img class="icon" src="${h.url('/images/icons/application_double.png')}"/></a> | 22 <img class="icon" src="${h.url('/images/icons/page_white_go.png')}"/> |
| 23 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='raw')}" class="tooltip" title="${h.tooltip(_('Raw diff'))}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a> | 23 </a> |
| 24 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}"><img class="icon" src="${h.url('/images/icons/page_save.png')}"/></a> | 24 <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full side-by-side diff for this file'))}"> |
| 25 <img class="icon" src="${h.url('/images/icons/application_double.png')}"/> | |
| 26 </a> | |
| 27 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='raw')}" class="tooltip" title="${h.tooltip(_('Raw diff'))}"> | |
| 28 <img class="icon" src="${h.url('/images/icons/page_white.png')}"/> | |
| 29 </a> | |
| 30 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}"> | |
| 31 <img class="icon" src="${h.url('/images/icons/page_save.png')}"/> | |
| 32 </a> | |
| 25 ${c.ignorews_url(request.GET, h.FID(cs2,path))} | 33 ${c.ignorews_url(request.GET, h.FID(cs2,path))} |
| 26 ${c.context_url(request.GET, h.FID(cs2,path))} | 34 ${c.context_url(request.GET, h.FID(cs2,path))} |
| 27 </div> | 35 </div> |
| 28 <span style="float:right;margin-top:-3px"> | 36 <span style="float:right;margin-top:-3px"> |
| 29 <label> | 37 <label> |
| 49 <div id="${h.FID('',filenode_path)}" class="diffblock margined comm"> | 57 <div id="${h.FID('',filenode_path)}" class="diffblock margined comm"> |
| 50 <div class="code-header"> | 58 <div class="code-header"> |
| 51 <div class="changeset_header"> | 59 <div class="changeset_header"> |
| 52 <div class="changeset_file"> | 60 <div class="changeset_file"> |
| 53 ${h.safe_unicode(filenode_path)} | | 61 ${h.safe_unicode(filenode_path)} | |
| 54 <a class="spantag" href="${h.url('files_home', repo_name=c.other_repo.repo_name, f_path=filenode_path, revision=c.org_ref)}" title="${_('Show file at latest version in this repo')}">${c.org_ref_type}@${h.short_id(c.org_ref) if c.org_ref_type=='rev' else c.org_ref}</a> -> | 62 <a class="spantag" href="${h.url('files_home', repo_name=c.other_repo.repo_name, f_path=filenode_path, revision=c.org_ref)}" title="${_('Show file at latest version in this repo')}">${c.org_ref_type}@${h.short_id(c.org_ref) if c.org_ref_type=='rev' else c.org_ref}</a> |
| 63 <i class="icon-arrow-right" style="font-size: 12px;color:#336699"></i> | |
| 55 <a class="spantag" href="${h.url('files_home', repo_name=c.repo_name, f_path=filenode_path, revision=c.other_ref)}" title="${_('Show file at initial version in this repo')}">${c.other_ref_type}@${h.short_id(c.other_ref) if c.other_ref_type=='rev' else c.other_ref}</a> | 64 <a class="spantag" href="${h.url('files_home', repo_name=c.repo_name, f_path=filenode_path, revision=c.other_ref)}" title="${_('Show file at initial version in this repo')}">${c.other_ref_type}@${h.short_id(c.other_ref) if c.other_ref_type=='rev' else c.other_ref}</a> |
| 56 </div> | 65 </div> |
| 66 <div class="diff-actions"> | |
| 67 %if c.other_repo.repo_name == c.repo_name: | |
| 68 <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode_path),diff2=c.other_ref,diff1=c.org_ref,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full side-by-side diff for this file'))}"> | |
| 69 <img class="icon" src="${h.url('/images/icons/application_double.png')}"/> | |
| 70 </a> | |
| 71 %endif | |
| 72 </div> | |
| 57 </div> | 73 </div> |
| 58 </div> | 74 </div> |
| 59 <div class="code-body"> | 75 <div class="code-body"> |
| 60 <div class="full_f_path" path="${h.safe_unicode(filenode_path)}"></div> | 76 <div class="full_f_path" path="${h.safe_unicode(filenode_path)}"></div> |
| 61 ${diff|n} | 77 ${diff|n} |