Merge branch 'master' of file:///srv/git/ikiwiki.info
commit
688c58ac90
|
@ -18,3 +18,5 @@ see <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/read
|
||||||
> --[[Joey]]
|
> --[[Joey]]
|
||||||
|
|
||||||
>> Oh, I see why. Try the same branch again... --[[smcv]]
|
>> Oh, I see why. Try the same branch again... --[[smcv]]
|
||||||
|
|
||||||
|
>>> [[done]] --[[Joey]]
|
||||||
|
|
|
@ -332,6 +332,13 @@ ol.form {
|
||||||
li.form {
|
li.form {
|
||||||
padding-bottom: 1em;
|
padding-bottom: 1em;
|
||||||
}
|
}
|
||||||
|
input#openid_identifier {
|
||||||
|
background: url(wikiicons/openidlogin-bg.gif) no-repeat;
|
||||||
|
background-color: #fff;
|
||||||
|
background-position: 0 50%;
|
||||||
|
color: #000;
|
||||||
|
padding-left: 18px;
|
||||||
|
}
|
||||||
input#searchbox {
|
input#searchbox {
|
||||||
background: url(wikiicons/search-bg.gif) no-repeat;
|
background: url(wikiicons/search-bg.gif) no-repeat;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
|
|
|
@ -16,9 +16,10 @@ while (<IN>) {
|
||||||
my ($oldurl)=$info=~/URL: (.*)/m;
|
my ($oldurl)=$info=~/URL: (.*)/m;
|
||||||
if ($oldurl ne $url) {
|
if ($oldurl ne $url) {
|
||||||
system("git remote rm $remote 2>/dev/null");
|
system("git remote rm $remote 2>/dev/null");
|
||||||
system("git", "remote", "add", "-f", $remote, $url);
|
system("git", "remote", "add", $remote, $url);
|
||||||
system("git", "config", "remote.$remote.tagopt",
|
system("git", "config", "remote.$remote.tagopt",
|
||||||
"--no-tags");
|
"--no-tags");
|
||||||
|
system("git", "fetch", $remote);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -116,6 +116,7 @@ var openid = {
|
||||||
' other' +
|
' other' +
|
||||||
'</a>'
|
'</a>'
|
||||||
);
|
);
|
||||||
|
$('#'+this.localsignin_id).hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
$('#openid_form').submit(this.submit);
|
$('#openid_form').submit(this.submit);
|
||||||
|
|
Loading…
Reference in New Issue