Mercurial > hg-stable
changeset 10278:6134adc1c431
Merge with stable
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 23 Jan 2010 16:55:46 +0100 |
parents | 6109a02c682b (current diff) 17c6d5eab25d (diff) |
children | 21b3346ce3c7 |
files | mercurial/templates/coal/map mercurial/templates/gitweb/graph.tmpl mercurial/templates/monoblue/graph.tmpl mercurial/templates/paper/graph.tmpl mercurial/templates/spartan/graph.tmpl mercurial/templates/spartan/map tests/test-hgweb-commands.out tests/test-hgweb-empty.out |
diffstat | 8 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templates/coal/map Fri Jan 22 17:15:58 2010 +0100 +++ b/mercurial/templates/coal/map Sat Jan 23 16:55:46 2010 +0100 @@ -181,7 +181,7 @@ <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td> <td>{description}</td> <td>{contact|obfuscate}</td> - <td class="age">{lastchange|age} ago</td> + <td class="age">{lastchange|age}</td> <td class="indexlinks">{archives%indexarchiveentry}</td> </tr>\n' indexarchiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}"> ↓{type|escape}</a>'
--- a/mercurial/templates/gitweb/graph.tmpl Fri Jan 22 17:15:58 2010 +0100 +++ b/mercurial/templates/gitweb/graph.tmpl Sat Jan 23 16:55:46 2010 +0100 @@ -63,7 +63,7 @@ var revlink = '<li style="_STYLE"><span class="desc">'; revlink += '<a class="list" href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID"><b>_DESC</b></a>'; revlink += '</span> _TAGS'; -revlink += '<span class="info">_DATE ago, by _USER</span></li>'; +revlink += '<span class="info">_DATE, by _USER</span></li>'; graph.vertex = function(x, y, color, parity, cur) {
--- a/mercurial/templates/monoblue/graph.tmpl Fri Jan 22 17:15:58 2010 +0100 +++ b/mercurial/templates/monoblue/graph.tmpl Sat Jan 23 16:55:46 2010 +0100 @@ -60,7 +60,7 @@ var revlink = '<li style="_STYLE"><span class="desc">'; revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>'; - revlink += '</span>_TAGS<span class="info">_DATE ago, by _USER</span></li>'; + revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>'; graph.vertex = function(x, y, color, parity, cur) {
--- a/mercurial/templates/paper/graph.tmpl Fri Jan 22 17:15:58 2010 +0100 +++ b/mercurial/templates/paper/graph.tmpl Sat Jan 23 16:55:46 2010 +0100 @@ -71,7 +71,7 @@ var revlink = '<li style="_STYLE"><span class="desc">'; revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>'; -revlink += '</span>_TAGS<span class="info">_DATE ago, by _USER</span></li>'; +revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>'; graph.vertex = function(x, y, color, parity, cur) {
--- a/mercurial/templates/spartan/graph.tmpl Fri Jan 22 17:15:58 2010 +0100 +++ b/mercurial/templates/spartan/graph.tmpl Sat Jan 23 16:55:46 2010 +0100 @@ -55,7 +55,7 @@ var revlink = '<li style="_STYLE"><span class="desc">'; revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>'; -revlink += '</span><span class="info">_DATE ago, by _USER</span></li>'; +revlink += '</span><span class="info">_DATE, by _USER</span></li>'; graph.vertex = function(x, y, color, parity, cur) {
--- a/mercurial/templates/spartan/map Fri Jan 22 17:15:58 2010 +0100 +++ b/mercurial/templates/spartan/map Sat Jan 23 16:55:46 2010 +0100 @@ -168,7 +168,7 @@ <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td> <td>{description}</td> <td>{contact|obfuscate}</td> - <td class="age">{lastchange|age} ago</td> + <td class="age">{lastchange|age}</td> <td class="indexlinks"> <a href="{url}rss-log">RSS</a> <a href="{url}atom-log">Atom</a>
--- a/tests/test-hgweb-commands.out Fri Jan 22 17:15:58 2010 +0100 +++ b/tests/test-hgweb-commands.out Sat Jan 23 16:55:46 2010 +0100 @@ -775,7 +775,7 @@ var revlink = '<li style="_STYLE"><span class="desc">'; revlink += '<a class="list" href="/rev/_NODEID?style=gitweb" title="_NODEID"><b>_DESC</b></a>'; revlink += '</span> _TAGS'; -revlink += '<span class="info">_DATE ago, by _USER</span></li>'; +revlink += '<span class="info">_DATE, by _USER</span></li>'; graph.vertex = function(x, y, color, parity, cur) {
--- a/tests/test-hgweb-empty.out Fri Jan 22 17:15:58 2010 +0100 +++ b/tests/test-hgweb-empty.out Sat Jan 23 16:55:46 2010 +0100 @@ -235,7 +235,7 @@ var revlink = '<li style="_STYLE"><span class="desc">'; revlink += '<a href="/rev/_NODEID" title="_NODEID">_DESC</a>'; -revlink += '</span>_TAGS<span class="info">_DATE ago, by _USER</span></li>'; +revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>'; graph.vertex = function(x, y, color, parity, cur) {