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

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

master
Joey Hess 2009-01-02 14:16:13 -05:00
parent 3428cdd9d5 ba47fe4246
commit 42c91cab61
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/bugs/Use_install__40__1__41___instead_of_cp__40__1__41___for_installing_files.mdwn
View File

@ -24,4 +24,6 @@ Here is a patch against ikiwiki-1.51 for using find(1) and install(1) instead of
>> No, apparently FreeBSD `install` does not support `-D`. See [the FreeBSD install manpage](http://www.freebsd.org/cgi/man.cgi?query=install&apropos=0&sektion=0&manpath=FreeBSD+6.2-RELEASE&format=html). --[[JoshTriplett]] >> No, apparently FreeBSD `install` does not support `-D`. See [the FreeBSD install manpage](http://www.freebsd.org/cgi/man.cgi?query=install&apropos=0&sektion=0&manpath=FreeBSD+6.2-RELEASE&format=html). --[[JoshTriplett]]
>> Patch applied; [[bugs/done]]. --[[JoshTriplett]] >> Patch applied. --[[JoshTriplett]]
There are still/again "cp -a"s in the Makefile as of 3.00

2
doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
View File

@ -14,3 +14,5 @@ The `IkiWiki::pagetitle` function does not respect title changes via `meta.title
>> It was actually more complicated than expected. A working prototype is >> It was actually more complicated than expected. A working prototype is
>> now in my `meta` branch, see my userpage for the up-to-date url. >> now in my `meta` branch, see my userpage for the up-to-date url.
>> Thus tagging [[patch]]. --[[intrigeri]] >> Thus tagging [[patch]]. --[[intrigeri]]
>>
>>> Joey, please consider merging my `meta` branch. --[[intrigeri]]

8
doc/plugins/contrib/po.mdwn
View File

@ -86,6 +86,9 @@ Any thoughts on this?
>>> to avoid breaking existing functionality, it implies to hack a bit >>> to avoid breaking existing functionality, it implies to hack a bit
>>> [[plugins/edittemplate]] so that multiple templates can be >>> [[plugins/edittemplate]] so that multiple templates can be
>>> inserted at page creation time. [[--intrigeri]] >>> inserted at page creation time. [[--intrigeri]]
>>>
>>>> I implemented such a warning using the formbuilder_setup hook.
>>>> --[[intrigeri]]
>> >>
>> And also, is there any way to start a translation of a page into a new >> And also, is there any way to start a translation of a page into a new
>> lanauge using the web interface? >> lanauge using the web interface?
@ -139,6 +142,11 @@ Any thoughts on this?
>>>>> to have the links text generation more customizable through >>>>> to have the links text generation more customizable through
>>>>> plugins, I could do both at the same time if we consider this >>>>> plugins, I could do both at the same time if we consider this
>>>>> matter to be important enough. --[[intrigeri]] >>>>> matter to be important enough. --[[intrigeri]]
>>>>>
>>>>>> The translation status in links is now implemented in my
>>>>>> `po`branch. It requires my `meta` branch changes to
>>>>>> work, though. I consider the latter to be mature enough to
>>>>>> be merged. --[[intrigeri]]
>> FWIW, I'm tracking your po branch in ikiwiki master git in the po >> FWIW, I'm tracking your po branch in ikiwiki master git in the po
>> branch. One thing I'd like to try in there is setting up a translated >> branch. One thing I'd like to try in there is setting up a translated