Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/doc/bugs/cannot_login.mdwn b/doc/bugs/cannot_login.mdwn
index c363f07aa2f4913882f323cda80ba0b7d3e15760..c2c4d91c039ec75647d2b6878141dd25b5546590 100644 (file)
--- a/doc/bugs/cannot_login.mdwn
+++ b/doc/bugs/cannot_login.mdwn
@@ -40,3 +40,23 @@ Update: now I can't login to the ikiwiki.info site anymore, getting
 the same errors as on the git-annex site.
 
 Update2: it seems this is specific to the HTTP/HTTPS switch. If I use HTTPS, things work fine, but not with plain HTTP. So I'm moving this to the branchable wiki, as I am not having that problem on other ikiwiki sites. Maybe the bug specific to ikiwiki is the lack of clarity in figuring out wth is going on here... See <http://www.branchable.com/bugs/login_failures_without_https>
+
+> This seems to be a concacentation of multiple unrelated problems with
+> different stuff, which is not a good bug report technique. Then to add to
+> the fun, you filed the same bug on branchable too. Sigh!
+> 
+> The `time_bad_sig` problem with the perl openid library is a problem I am
+> aware of but it's not clear if the problem is clock skew, or a protocol
+> problem. At least one user to report it seemed to get it due to a http
+> proxy. I'm pretty sure it could also happen if multiple openid logins
+> were attempted at the same time (the `consumer_secret` which is stored
+> server-side is used). The problem is not specific to ikiwiki.
+> 
+> Ikiwiki says "login failed, perhaps you need to turn on cookies?" when
+> the user successfully logged in, but their cookie does not indicate why
+> they were logging in to begin with, so ikiwiki does not know what action
+> to continue to. One way to get this when cookies are enabled is to
+> re-post a login form after already using it, by eg using the back button
+> to go back to a previous login form and try to reuse it.
+> 
+> --[[Joey]]

diff --git a/doc/todo/merge_bootstrap_branch.mdwn b/doc/todo/merge_bootstrap_branch.mdwn
new file mode 100644 (file)
index 0000000..a928e14
--- /dev/null
+++ b/doc/todo/merge_bootstrap_branch.mdwn
@@ -0,0 +1,16 @@
+I've prepared a bootstrap branch based on
+<https://github.com/gsliepen/ikistrap>. 
+
+Main impediment to merging it is jquery; bootstrap probably needs
+a newer version than the 1.6.2 included in ikiwiki and upgrading
+it would need testing the parts of ikiwiki that use jquery.
+
+It also needs to include bootstrap 4 in ikiwiki, rather than pulling
+it from the CDN, probably. Although depending on a debian package
+would be nicer, if bootstrap 4 got packaged in Debian.
+
+Note that the template changes are not entirely optimial, but I
+did them in a way that makes the diff pretty clear that nothing changes
+except when the bootstrap theme is enabled.
+
+--[[Joey]]

diff --git a/templates/revert.tmpl b/templates/revert.tmpl
index 0de32811b7a88250e62b72b05eddf1e5d655467a..b5122b15f524eae31f5293132c459ce189ad72ba 100644 (file)
--- a/templates/revert.tmpl
+++ b/templates/revert.tmpl
@@ -19,3 +19,4 @@
 <pre>
 <TMPL_VAR diff>
 </pre>
+</div>