urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Joey Hess 2012-05-11 00:19:06 -04:00
parent cb57c3e3e6 870bb10bd8
commit a69c25fde0
10 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/bugs/conditional_preprocess_during_scan.mdwn
View File

@ -1,4 +1,4 @@
[[!template id=gitbranch branch=GiuseppeBilotta/scanif author="Giuseppe Bilotta"]]
[[!template id=gitbranch branch=GiuseppeBilotta/scanif author="[[GiuseppeBilotta]]"]]
When a directive that should be run during scan preprocessing is inside
an if directive, it doesn't get called because the if preprocessing does

1
doc/ikiwikiusers.mdwn
View File

@ -172,7 +172,6 @@ Personal sites and blogs
* [Richardson Family Wiki](http://the4richardsons.com) A wiki, blog or some such nonsense for the family home page or something or other... I will eventually move the rest of my sites to ikiwiki. The source of the site is in git.
* [The personal website of Andrew Back](http://carrierdetect.com)
* [SolderPad Documentation](http://docs.solderpad.com)
* various sub-domains at kisikew.org ([example](https://portal.kisikew.org/))
* [Paul Elms](http://paul.elms.pro) Personal site and blog in russian.
* [James' Tech Notes](http://jamestechnotes.com) My technical notes, blog, wiki, personal site.
* [Salient Dream](http://www.salientdream.com/) - All Things Strange.

2
doc/plugins/trail/discussion.mdwn
View File

@ -31,7 +31,7 @@ or trail member has actually been edited.
For it to be useful for `trail`, the `prebuild` hook has to run
after both pagespecs and sorting work. The other use case
I've seen for a similar hook was for Guiseppe Bilotta to
I've seen for a similar hook was for Giuseppe Bilotta to
sort an inline-of-inlines by mtime of newest post, but that
can't be the same hook, because it has to run after pagespecs
work, but before sorting.

2
doc/sandbox.mdwn
View File

@ -10,7 +10,7 @@ Hello, ikiwiki.
## number 2
### number 3
This is the [[SandBox]], a page anyone can edit to try out ikiwiki
This is the SandBox, a page anyone can edit to try out ikiwiki
(version [[!version ]]).
[[!toc levels=1 startlevel=2 ]]

8
doc/tips/ikiwiki_via_gopher/discussion.mdwn 100644
View File

@ -0,0 +1,8 @@
Joey, do you have an ikiwiki served up on gopher, as an example, I can take a look at?
I find this prospect interesting.
I have a gopherhole, but no wiki in it.
I was wondering, myself, if I symlinked a dirfull of dokuwiki pages in my gopherhole what that might be like...hmmmm.
I might try that.
tony baldwin | http://tonybaldwin.me | gopher://tonybaldwin.me

1
doc/todo/Using_page_titles_in_internal_links.mdwn 100644
View File

@ -0,0 +1 @@
It would be really nice if, should a page happen to have a title metavariable then links to that page which do not explicitly state a title would use it. -- Daniel Silverstone

2
doc/todo/feed_enhancements_for_inline_pages.mdwn
View File

@ -1,4 +1,4 @@
[[!template id=gitbranch branch=GiuseppeBilotta/inlinestuff author="Giuseppe Bilotta"]]
[[!template id=gitbranch branch=GiuseppeBilotta/inlinestuff author="[[GiuseppeBilotta]]"]]
I rearranged my patchset once again, to clearly identify the origin and
motivation of each patch, which is explained in the following.

16
doc/todo/linkbase.mdwn 100644
View File

@ -0,0 +1,16 @@
[[!template id=gitbranch branch=GiuseppeBilotta/linkbase author="[[GiuseppeBilotta]]"]]
This patches enables the user to specify additional paths (“link bases”)
that can be used by ikiwiki when trying to resolve links. The list of
link bases is built as follows:
* the page itself (as ikiwiki currently does)
* all link bases specified for this page
* all link bases specified for pagespecs matched by this page
To specify the link bases, the only way made available presently by the
patchset is a linkbase plugin that works similarly to the shortcut
plugin (link bases are specified in a linkbases.mdwn file at the
document root). However, are ways are potentially possible.
This is still work in progress. Comments and suggestions are welcome.

6
doc/users/GiuseppeBilotta.mdwn 100644
View File

@ -0,0 +1,6 @@
Custom patches to IkiWiki can be found in select branches of
<http://git.oblomov.eu>.
Patches proposed/discussed:
[[!map pages="link(users/GiuseppeBilotta) and (todo/* or bugs/*) and
link(branches) and !link(todo/done)"]]

5
doc/users/wiebel.mdwn 100644
View File

@ -0,0 +1,5 @@
Started my [Homepage](http://wiebel.scorpius.uberspace.de/) with ikiwiki added some plugins like:
* [hlinclude](https://wiebel.scorpius.uberspace.de/space/hlinclude/) -> addition to highlight to render a files content and provide it as a download, example can be seen at [favlinks](https://wiebel.scorpius.uberspace.de/code/favlink/), sadly it seem to be unable to render itself, meh
* [favlinks](https://wiebel.scorpius.uberspace.de/code/favlink/) -> to include favicons off linked Pages