aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorchrysn <chrysn@fsfe.org>2013-08-21 14:35:03 +0200
committerchrysn <chrysn@fsfe.org>2013-08-21 14:35:03 +0200
commit3b53e11288b584a4c793cd2f3370c3dae881eb50 (patch)
tree4e8ee82fbdd42bacea5043c3a1c5884479ecfc9e /doc
parentd01df28abb8e92d1abac33802b179d912fcb029d (diff)
downloadikiwiki-3b53e11288b584a4c793cd2f3370c3dae881eb50.tar
ikiwiki-3b53e11288b584a4c793cd2f3370c3dae881eb50.tar.gz
moved my patch branches from github to self-hosted
Diffstat (limited to 'doc')
-rw-r--r--doc/bugs/linkmap_displays_underscore_escapes.mdwn5
-rw-r--r--doc/git.mdwn2
-rw-r--r--doc/todo/inline_postform_autotitles.mdwn10
3 files changed, 8 insertions, 9 deletions
diff --git a/doc/bugs/linkmap_displays_underscore_escapes.mdwn b/doc/bugs/linkmap_displays_underscore_escapes.mdwn
index f74ca5119..66bffc159 100644
--- a/doc/bugs/linkmap_displays_underscore_escapes.mdwn
+++ b/doc/bugs/linkmap_displays_underscore_escapes.mdwn
@@ -1,3 +1,5 @@
+[[!template id=gitbranch branch=chrysn/linkmapenhancement author="[[chrysn]]"]]
+
[[ikiwiki/directive/linkmap]]s display the file name instead of the pagetitle, showing unsightly underscore escapes and underscores instead of blanks to users.
the attached [[!taglink patch]] fixes this; from its commit message:
@@ -15,4 +17,5 @@ the attached [[!taglink patch]] fixes this; from its commit message:
the output will look much better (at least in my wikis) with the "[[bugs/pagetitle function does not respect meta titles]]" issue fixed.
-the patch is stored in [[the patch.pl]] as created by git-format-patch. (btw, what's the preferred way to send patches, apart from creating a git branch somewhere?)
+the patch is stored in [[the patch.pl]] as created by git-format-patch, and can
+be pulled from the abovementioned branch.
diff --git a/doc/git.mdwn b/doc/git.mdwn
index 71f7eb54b..1532b3c01 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -43,7 +43,7 @@ think about merging them. This is recommended. :-)
* [[ikiplugins|DavidBremner]] `git://pivot.cs.unb.ca/git/ikiplugins.git`
* [[jonas|JonasSmedegaard]] `git://source.jones.dk/ikiwiki-upstream`
* [[arpitjain]] `git://github.com/arpitjain11/ikiwiki.git`
-* [[chrysn]] `git://github.com/github076986099/ikiwiki.git`
+* [[chrysn]] `git://prometheus.amsuess.com/ikiwiki`
* [[simonraven]] `git://github.com/kjikaqawej/ikiwiki-simon.git`
* [[schmonz]] `git://github.com/schmonz/ikiwiki.git`
* [[will]] `http://www.cse.unsw.edu.au/~willu/ikiwiki.git`
diff --git a/doc/todo/inline_postform_autotitles.mdwn b/doc/todo/inline_postform_autotitles.mdwn
index 39713eb5f..3767631f7 100644
--- a/doc/todo/inline_postform_autotitles.mdwn
+++ b/doc/todo/inline_postform_autotitles.mdwn
@@ -1,5 +1,5 @@
[[!tag wishlist patch plugins/inline]]
-[[!template id=gitbranch branch=chrysn/patches author="[[chrysn]]"]]
+[[!template id=gitbranch branch=chrysn/inlineautotitles author="[[chrysn]]"]]
for postforms in inlines of pages which follow a certain scheme, it might not
be required to set the title for each individual post, but to automatically set
@@ -8,7 +8,7 @@ this can either be based on timestamp formatting, or use the already existing
munging mechanism, which appends numbers to page titles in case that page
already exists.
-two patches ([1], [2]) set inline up for that, adding an additional `autotitle`
+two patches (b568eb25, 34bc82f2) set inline up for that, adding an additional `autotitle`
parameter. if that is given, the regular input of the inline postform will be
replaced with a hidden input of that text. in addition, the empty title is
permitted (both for autotitle and regular titles, as they go in the same GET
@@ -42,7 +42,7 @@ common uses of percent as in "reach 10% market share", but might in others as
in "the 10%-rule").
both can be circumvented by using another GET parameter for autotexts, as
-implemented in [3].
+implemented in 40dc10a4.
> this patch still does not work perfectly; especially, it should make a
> distinction between "autotitle is set but equal ''" (in which case it
> should create a page named `1.mdwn`, and "autotitle is not set, and title is
@@ -61,7 +61,3 @@ having a pre-filled input field instead of an unchangable hidden input might be
cool (eg for creating an entry with yesterday's date), but would be a bit of a
problem with static pages. javascript could help with the date part, but name
munging would be yet another thing.
-
-[1]: http://github.com/github076986099/ikiwiki/commit/b568eb257a3ef5ff49a84ac00a3a7465b643c1e1
-[2]: http://github.com/github076986099/ikiwiki/commit/34bc82f232be141edf036d35e8ef5aa289415072
-[3]: http://github.com/github076986099/ikiwiki/commit/40dc10a4ec7809e401b4497c2abccfba30f7a2af