Files
@ ffd45b185016
Branch filter:
Location: kallithea/rhodecode/templates/changeset/changeset_range.html - annotation
ffd45b185016
5.9 KiB
text/html
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.
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 | d4a7b6c82efe 28524453bb76 28524453bb76 28524453bb76 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 28524453bb76 28524453bb76 28524453bb76 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 28524453bb76 28524453bb76 28524453bb76 eacd33e0c5b3 28524453bb76 28524453bb76 28524453bb76 072a37c44f58 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 b4f401524060 ffd45b185016 82e604d3fc46 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 87664e60bbc0 643e4a540ddd c25cc1c7c65f 643e4a540ddd 643e4a540ddd 643e4a540ddd 87664e60bbc0 87664e60bbc0 9f37281195a2 87664e60bbc0 87664e60bbc0 f26acc1b27e2 643e4a540ddd 643e4a540ddd 643e4a540ddd b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b86229c66c67 b86229c66c67 b86229c66c67 b86229c66c67 b86229c66c67 b86229c66c67 b4f401524060 b4f401524060 b4f401524060 b4f401524060 f91d3f9b7230 28524453bb76 d4a7b6c82efe d4a7b6c82efe d4a7b6c82efe f91d3f9b7230 d4a7b6c82efe 3555c56694b5 86c544532840 3555c56694b5 3555c56694b5 3555c56694b5 3555c56694b5 3555c56694b5 3555c56694b5 3555c56694b5 3555c56694b5 3555c56694b5 3555c56694b5 93de03499097 3555c56694b5 3555c56694b5 3555c56694b5 3555c56694b5 3555c56694b5 ec6354949623 3555c56694b5 3555c56694b5 0cecc22285ef 0cecc22285ef 0cecc22285ef 0cecc22285ef 0cecc22285ef 9937afa7f093 9937afa7f093 d5e42c00f3c1 d4a7b6c82efe d4a7b6c82efe f91d3f9b7230 d4a7b6c82efe d4a7b6c82efe d4a7b6c82efe f91d3f9b7230 d4a7b6c82efe d4a7b6c82efe f91d3f9b7230 d4a7b6c82efe d4a7b6c82efe d4a7b6c82efe d4a7b6c82efe d4a7b6c82efe d4a7b6c82efe d4a7b6c82efe d4a7b6c82efe d4a7b6c82efe f91d3f9b7230 28524453bb76 f91d3f9b7230 | ## -*- coding: utf-8 -*-
<%inherit file="/base/base.html"/>
<%def name="title()">
${_('%s Changesets') % c.repo_name} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} > r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}
%if c.rhodecode_name:
· ${c.rhodecode_name}
%endif
</%def>
<%def name="breadcrumbs_links()">
${_('Changesets')} -
r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)}
<i class="icon-arrow-right"></i>
r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}
</%def>
<%def name="page_nav()">
${self.menu('repositories')}
</%def>
<%def name="main()">
${self.repo_context_bar('changelog')}
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
<div class="table">
<div id="body" class="diffblock">
<div class="code-header" style="height: 26px">
<div>
r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)}
<i class="icon-arrow-right"></i>
r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}
<a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref=c.cs_ranges[-1].raw_id)}" class="btn btn-small"><i class="icon-loop"></i> Compare Revisions</a>
</div>
</div>
</div>
<div id="changeset_compare_view_content">
<div class="container">
<table class="compare_view_commits noborder">
%for cnt,cs in enumerate(c.cs_ranges):
<tr>
<td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>
<td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</td>
<td><div class="author">${h.person(cs.author)}</div></td>
<td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
<td>
%if c.statuses:
<div title="${h.tooltip(_('Changeset status'))}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cnt])}" /></div>
%endif
</td>
<td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>
</tr>
%endfor
</table>
</div>
<div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
<div class="cs_files">
%for cs in c.cs_ranges:
<div class="cur_cs">${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
%for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems():
<div class="cs_${change}">
<div class="node">
${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}
</div>
<div class="changes">${h.fancy_file_stats(stats)}</div>
</div>
%endfor
%endfor
</div>
</div>
</div>
<%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
<%namespace name="diff_block" file="/changeset/diff_block.html"/>
%for cs in c.cs_ranges:
##${comment.comment_inline_form(cs)}
## diff block
<div class="h3">
<a class="tooltip" title="${h.tooltip(cs.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}</a>
<div class="gravatar">
<img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),20)}"/>
</div>
<div class="right">
<span class="logtags">
%if len(cs.parents)>1:
<span class="merge">${_('merge')}</span>
%endif
%if h.is_hg(c.rhodecode_repo):
%for book in cs.bookmarks:
<span class="booktag" title="${_('Bookmark %s') % book}">
${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
</span>
%endfor
%endif
%for tag in cs.tags:
<span class="tagtag" title="${_('Tag %s') % tag}">
${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
%endfor
%if cs.branch:
<span class="branchtag" title="${_('Branch %s') % cs.branch}">
${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
</span>
%endif
</span>
</div>
</div>
${diff_block.diff_block(c.changes[cs.raw_id])}
%endfor
<script type="text/javascript">
YUE.onDOMReady(function(){
YUE.on(YUQ('.diff-menu-activate'),'click',function(e){
var act = e.currentTarget.nextElementSibling;
if(YUD.hasClass(act,'active')){
YUD.removeClass(act,'active');
YUD.setStyle(act,'display','none');
}else{
YUD.addClass(act,'active');
YUD.setStyle(act,'display','');
}
});
})
</script>
</div>
</%def>
|