##// END OF EJS Templates
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

File last commit:

r4116:ffd45b18 rhodecode-2.2.5-gpl
r4125:aa3b5594 rhodecode-2.2.5-gpl
Show More
tags_data.html
45 lines | 1.8 KiB | text/html | HtmlLexer
added sorting to bookmarks tags and branches
r1782 %if c.repo_tags:
White-space cleanup
r1888 <div id="table_wrap" class="yui-skin-sam">
added sorting to bookmarks tags and branches
r1782 <table id="tags_data">
<thead>
Mads Kiilerich
html: don't use tabs
r3197 <tr>
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
r4116 <th class="left">Raw name</th> ##notranslation
added sorting to bookmarks tags and branches
r1782 <th class="left">${_('Name')}</th>
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
r4116 <th class="left">Raw date</th> ##notranslation
added sorting to bookmarks tags and branches
r1782 <th class="left">${_('Date')}</th>
<th class="left">${_('Author')}</th>
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
r4116 <th class="left">Raw rev</th> ##notranslation
added sorting to bookmarks tags and branches
r1782 <th class="left">${_('Revision')}</th>
Enabled compare engine for tags...
r3010 <th class="left">${_('Compare')}</th>
Mads Kiilerich
html: don't use tabs
r3197 </tr>
added sorting to bookmarks tags and branches
r1782 </thead>
Mads Kiilerich
html: don't use tabs
r3197 %for cnt,tag in enumerate(c.repo_tags.items()):
<tr class="parity${cnt%2}">
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
r4116 <td>${tag[0]}</td>
Fixes for raw_id, needed for git...
r636 <td>
<span class="logtags">
<span class="tagtag">${h.link_to(tag[0],
Implements #304...
r1770 h.url('files_home',repo_name=c.repo_name,revision=tag[1].raw_id))}
</span>
Fixes for raw_id, needed for git...
r636 </span>
Implements #304...
r1770 </td>
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
r4116 <td>${tag[1]._timestamp}</td>
Added h.tooltip to all places that tooltip_title is used....
r2427 <td><span class="tooltip" title="${h.tooltip(h.age(tag[1].date))}">${h.fmt_date(tag[1].date)}</span></td>
Mads Kiilerich
html: don't use tabs
r3197 <td title="${tag[1].author}">${h.person(tag[1].author)}</td>
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
r4116 <td>${tag[1].revision}</td>
Mads Kiilerich
html: don't use tabs
r3197 <td>
Implements #304...
r1770 <div>
<pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=tag[1].raw_id)}">r${tag[1].revision}:${h.short_id(tag[1].raw_id)}</a></pre>
</div>
</td>
Enabled compare engine for tags...
r3010 <td>
<input class="branch-compare" type="radio" name="compare_org" value="${tag[0]}"/>
<input class="branch-compare" type="radio" name="compare_other" value="${tag[0]}"/>
White space cleanup
r3029 </td>
Mads Kiilerich
html: don't use tabs
r3197 </tr>
%endfor
renamed project to rhodecode
r547 </table>
added sorting to bookmarks tags and branches
r1782 </div>
renamed project to rhodecode
r547 %else:
Mads Kiilerich
html: don't use tabs
r3197 ${_('There are no tags yet')}
White-space cleanup
r1888 %endif