Commit Graph

35 Commits (master)

Author SHA1 Message Date
Joey Hess 2c2934138c
git: Pass --no-rebase when pulling
To avoid git warning messages about pull.rebase.

I don't think it would make sense to want to rebase changes pulled from
origin when updating the checkout used to build a site. So it seems ok to
just use --no-rebase and not worry about honoring any pull.rebase setting.
2023-07-19 12:53:01 -04:00
Joey Hess 4a5cab56d0
hack to support media:content
This is ugly, but XML::Feed does not support the tag.
2022-08-29 19:14:17 -04:00
Joey Hess 7591cf7776
aggregate enclosures
aggregate: When a feed has an enclosure that is an image, audio, or video,
include the enclosure in the generated page.

The enclosure is hotlinked from the original feed, not copied.

My use case is to include a mastodon rss feed in amoung other rss feeds for
users who don't use mastodon. It could also be used to aggregate together
podcasts, etc.

Other enclosure types than image, audio, video, could be added, perhaps
a generic one? But these are the main ones.

The template uses 50% width for image and video, because often
attachments are in a high resolution, which will default to being
perhaps too wide for the page, or taking up a lot of vertical space. By
making it take up at most half the page width, that is avoided, while
also leaving room for any sidebar.

Sponsored-by: Shae Erisson on Patreon
2021-12-25 12:59:27 -04:00
Joey Hess b4b27508a2
releasing package ikiwiki version 3.20200202.3 2020-02-02 16:23:50 -04:00
Simon McVittie d5fb38bd0f Update changelog with schmonz's changes 2019-09-29 17:48:25 +01:00
Joey Hess c22b239892
Updated German program translation from Sebastian Kuhnert. 2019-06-06 17:17:58 -04:00
Joey Hess 441078462c
Updated German basewiki and directives translation from Sebastian Kuhnert. 2019-06-05 12:09:08 -04:00
Simon McVittie 25c69da42c Prepare 3.20190228 for future release 2019-02-26 23:01:54 +00:00
Simon McVittie 824cf7db1b po: Always filter .po files
The input to filter hooks is meant to be the content of a source file
on disk. If we only filter once per (page, destpage) pair, and a page
is inlined into the same destpage more than once, then the second
occurrence will render as the result of htmlizing .po source as if
it was Markdown (or whatever the type of the corresponding master page
is), which is never going to end well.

The alreadyfiltered mechanism was added in commit 1e874b3f to avoid
preprocessing loops, but I'm not sure where it could lead to a loop:
filter hooks are only called from IkiWiki::filter, which is only called
on page content from disk or on proposed content being previewed.
According to <https://bugs.debian.org/911356#41>, deleting the
alreadyfiltered mechanism resolves the problem, as well as simplifying
the code.

Closes: #911356
Tested-by: intrigeri
2019-02-24 17:23:34 +00:00
Simon McVittie abaaee4af3 Prepare new release
Signed-off-by: Simon McVittie <smcv@debian.org>
2019-02-07 11:08:41 +00:00
Simon McVittie 53cbfb4b5a close 2019-02-03 17:10:45 +00:00
Simon McVittie 1094c6ecbf Mark as applied
Signed-off-by: Simon McVittie <smcv@debian.org>
2019-02-03 16:55:14 +00:00
Amitai Schleier d7777f12df Add a missing changelog entry. 2019-02-03 10:34:43 -06:00
Simon McVittie 58fed0178c Update changelog
Signed-off-by: Simon McVittie <smcv@debian.org>
2019-02-03 16:27:38 +00:00
Simon McVittie f12815571a Update changelog 2019-01-31 20:37:07 +00:00
Joey Hess 5d44bf4b5c
fix permalink to comments
This commit was sponsored by Thomas May.
2019-01-21 11:57:23 -04:00
Joey Hess 4f0b10c13d
rename postvote to postlink
This better explains what it contains, which is a wikilink to the page
to go to after posting the vote. And postlink is more consistent a name
with posttrail.
2018-11-26 13:23:50 -04:00
Joey Hess 97d921ca67
poll: Added postvote and posttrail options for better multi-page polls.
Modern web users probably expect the poll to move on automatically to the
next question, and this allows for that behavior.

Note that bestlink() runs at vote time, which avoids needing to make the
page containing the poll depend on the page that sets up a trail, as the
current trail at vote time will be used.

This commit was sponsored by Eric Drechsel on Patreon.
2018-11-26 13:14:21 -04:00
Joey Hess 0ec2c55ac0
aggregate: Fix aggregation of posts without a title
When an aggregated post lacked a title, the code first prepended the
$feed->{dir} to it, and only then checked if it had zero length. So,
that check could never succeed and it was possible to end up with
$page="dir/", and writing to that would of course fail.

(Same problem could also occur when the whole title got sanitized away by the
wiki_file_regexp.)

Fixed by simply checking earlier if $page is empty.

Based on a patch by Alexandre Oliva which got lost in a maze of email
folders all alike for over two years despite him mentioning it to me at
least once in person.
2018-10-28 19:00:32 -04:00
Simon McVittie 629b32dfc1 Update changelog 2018-05-16 13:12:20 +01:00
Simon McVittie 9c23006d31 3.20180311 2018-03-11 15:54:34 +00:00
Simon McVittie d58b25eb93 Update changelog 2018-03-09 09:18:24 +00:00
Simon McVittie 4b0b5f9cfb 3.20180228
Signed-off-by: Simon McVittie <smcv@debian.org>
2018-02-28 10:41:06 +00:00
Simon McVittie 53a67d0503 changelog: Mention packaging changes imported from Debian
Signed-off-by: Simon McVittie <smcv@debian.org>
2018-02-28 10:40:42 +00:00
Simon McVittie 54f6ca83c5 rst: Use Python 3 instead of Python 2
Signed-off-by: Simon McVittie <smcv@debian.org>
2018-02-28 10:40:41 +00:00
Simon McVittie fa7e766168 Update changelog
Signed-off-by: Simon McVittie <smcv@debian.org>
2018-02-28 10:04:26 +00:00
Simon McVittie b32480f0f9 build: Ensure that pm_to_blib finishes before rewriting shebang lines
Otherwise, rewriting shebang lines can race with pm_to_blib,
potentially resulting in files being corrupt or empty.
2018-01-29 22:35:29 +00:00
Simon McVittie efcbeaa09a build: Use if/then instead of `||` so that the `-e` flag works 2018-01-29 22:35:29 +00:00
Simon McVittie 3aacac3b46 build: `set -e` before each `for` loop, so that errors are reliably trapped 2018-01-29 22:35:29 +00:00
Simon McVittie f46e429d96 mdwn: Restore historical behaviour
The Discount package in Debian historically enabled fenced code blocks,
PHP Markdown Extra-style definition lists, and an expanded character
set for tag names. Since Discount 2.2.0 those are runtime settings, so
enable them. Unfortunately Text::Markdown::Discount doesn't yet expose
the necessary constants:
https://rt.cpan.org/Public/Bug/Display.html?id=124188

The IDANCHOR option was historically also enabled in Debian, but is not
enabled here because ikiwiki does not enable the TOC option, and
IDANCHOR does nothing without TOC.

Closes: #888055
2018-01-29 22:35:29 +00:00
Simon McVittie a147f5349d Don't send relative redirect URLs when behind a reverse proxy 2018-01-08 10:56:12 +00:00
Joey Hess ade66c541e
releasing package ikiwiki version 3.20180105 2018-01-05 13:42:29 -04:00
Joey Hess 1e3ca5dc88
set last release's distribution to upstream; dch -r will copy that value
to not imply that this changelog has anything to do with debian unstable
2018-01-05 13:39:03 -04:00
Joey Hess 02b76497a2
flip changelog symlink 2018-01-05 13:38:40 -04:00
joey dae0f48e91 * Work on firming up the plugin interface:
- Plugins should not need to load IkiWiki::Render to get commonly
    used functions, so moved some functions from there to IkiWiki.
  - Picked out the set of functions and variables that most plugins
    use, documented them, and made IkiWiki export them by default,
    like a proper perl module should.
  - Use the other functions at your own risk.
  - This is not quite complete, I still have to decide whether to
    export some other things.
* Changed all plugins included in ikiwiki to not use "IkiWiki::" when
  referring to stuff now exported by the IkiWiki module.
* Anyone with a third-party ikiwiki plugin is strongly enrouraged
  to make like changes to it and avoid use of non-exported symboles from
  "IkiWiki::".
* Link debian/changelog and debian/news to NEWS and CHANGELOG.
* Support hyperestradier version 1.4.2, which adds a new required phraseform
  setting.
2006-09-09 22:50:27 +00:00