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-29 13:43:37 -04:00
parent 41aee34274 8eb8755aeb
commit 73136f100f
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/forum/Anyone_mirroring_ikiwiki_inline_feed_to_identi.ca__63__/comment_3_317f1202a3da1bfc845d4becbac4bba8._comment 100644
View File

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="Franek"
ip="92.74.26.119"
subject="kind of solved, but another problem comes up"
date="2012-05-26T19:31:19Z"
content="""
The templates atompage.tmpl and/or atomitem.tmpl appear to be what would have to be altered to satisfy identi.ca. I did that on my system, just hard-coding a <uri> element into <author> for testing. In one respect, it worked: identi.ca does not complain about the missing author uri any more. In another, it did not, another error comes up now: \"Internal server error\" and something like \"could not add feed\".
I do not know where to go from this very unspecific error message. I guess I am going to try something like twitterfeed.com, for now.
"""]]

5
doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
View File

@ -80,6 +80,11 @@ and decided this time it was really needed to implement this feature.
>>>>>> Ping? I've merged 3.20110321 in my `mirrorlist` branch and
>>>>>> checked it still works properly. --[[intrigeri]]
>>>>>>> Joey: ping? I've rebased my `mirrorlist` branch on top of
>>>>>>> 3.20120419, and checked it still works properly. I really
>>>>>>> would like to see this functionality merged in time
>>>>>>> for Wheezy. --[[intrigeri]]
>>>>> concerning goto/cgiurl, what about having that as the default in
>>>>> mirrorlist, but keeping ``nousedirs|file:///home/intrigeri/wiki`` and
>>>>> ``usedirs|http://example.com/wiki`` valid for cgi-less cases?