diff options
| author | Joey Hess <joey@kitenet.net> | 2013-07-21 13:51:57 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-07-21 13:51:57 -0400 |
| commit | 0db80d453fad3fbf9ae04a18b7b6051926b2dd3e (patch) | |
| tree | 8394c20b2c63a9cfd4e4c05c18783557c8844dee | |
| parent | 4c88a4d9d8fb62e8e4bea068a2546059bd1fa306 (diff) | |
| download | ikiwiki-0db80d453fad3fbf9ae04a18b7b6051926b2dd3e.tar ikiwiki-0db80d453fad3fbf9ae04a18b7b6051926b2dd3e.tar.gz | |
merge schmonz/fancypodcast
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | doc/todo/fancypodcast.mdwn | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index bc05aa091..81931465a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,13 @@ ikiwiki (3.20130712) UNRELEASED; urgency=low * calendar: Display the popup mouseover when there is only 1 page for a given day, for better UI consistency. + * meta: Can now be used to add an enclosure to a page, which is a fancier + way to do podcasting than just inlining the media files directly; + this way you can write a post about the podcast episode with show notes, + author information, etc. + (schmonz) + * aggregate: Show author in addition to feedname, if different. + (schmonz) -- Joey Hess <joeyh@debian.org> Fri, 19 Jul 2013 18:53:23 -0400 diff --git a/doc/todo/fancypodcast.mdwn b/doc/todo/fancypodcast.mdwn index 79b214049..04d86823c 100644 --- a/doc/todo/fancypodcast.mdwn +++ b/doc/todo/fancypodcast.mdwn @@ -346,3 +346,7 @@ Does this added tag provide any benefits? --[[Joey]] > than the atom namespace bits. --[[schmonz]] >> Sounds ok then. --[[Joey]] + +---- + +[[merged|done]] --[[Joey]] |