From 2d60e55303fbabe70b42ee31703a8d4aca2d8460 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 9 May 2010 16:44:47 +0100 Subject: gitremotes: don't fetch the new remote until we've turned off tags --- gitremotes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitremotes b/gitremotes index 6c03011a8..5cafad1b8 100755 --- a/gitremotes +++ b/gitremotes @@ -16,9 +16,10 @@ while () { my ($oldurl)=$info=~/URL: (.*)/m; if ($oldurl ne $url) { 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", "--no-tags"); + system("git", "fetch", $remote); } } } -- cgit v1.2.3 From b5aa42d3e0f54649c8e5d3842ad0025279ba38a5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 9 May 2010 12:56:42 -0400 Subject: remerged --- doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn index f9f086793..9bd8938c5 100644 --- a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn +++ b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn @@ -18,3 +18,5 @@ see --[[Joey]] >> Oh, I see why. Try the same branch again... --[[smcv]] + +>>> [[done]] --[[Joey]] -- cgit v1.2.3 From a855fa1d1846fd1c72254130e8cbcaa0f98bd200 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 10 May 2010 15:56:57 -0400 Subject: bring back input#openid_url styling Still used on prefs page. --- doc/style.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/style.css b/doc/style.css index 6832194b2..cb02f812a 100644 --- a/doc/style.css +++ b/doc/style.css @@ -332,6 +332,13 @@ ol.form { li.form { padding-bottom: 1em; } +input#openid_url { + background: url(wikiicons/openidlogin-bg.gif) no-repeat; + background-color: #fff; + background-position: 0 50%; + color: #000; + padding-left: 18px; +} input#searchbox { background: url(wikiicons/search-bg.gif) no-repeat; background-color: #fff; -- cgit v1.2.3 From c305303b42649bc0276ea43ef7dbb27117ba151b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 10 May 2010 16:04:28 -0400 Subject: hide local signin when nothing is selected --- underlays/openid-selector/ikiwiki/openid/openid-jquery.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js index 4eaa613d9..f22f5776a 100644 --- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js +++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js @@ -116,6 +116,7 @@ var openid = { ' other' + '' ); + $('#'+this.localsignin_id).hide(); } $('#openid_form').submit(this.submit); @@ -123,7 +124,7 @@ var openid = { var box_id = this.readCookie(); if (box_id) { this.signin(box_id, true); - } + } }, getBoxHTML: function(provider, box_size) { var label=""; -- cgit v1.2.3 From 378cae14bbd540aa1cd6b165bee408c0add169c3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 10 May 2010 16:12:55 -0400 Subject: openid_url was renamed to openid_identifier --- doc/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/style.css b/doc/style.css index cb02f812a..4ea77573a 100644 --- a/doc/style.css +++ b/doc/style.css @@ -332,7 +332,7 @@ ol.form { li.form { padding-bottom: 1em; } -input#openid_url { +input#openid_identifier { background: url(wikiicons/openidlogin-bg.gif) no-repeat; background-color: #fff; background-position: 0 50%; -- cgit v1.2.3