Commit Graph

500 Commits (1b79ccc71bf4486b3b2d831c8e2e209af81fb582)

Author SHA1 Message Date
Simon McVittie a1fda0b516 Standardize on --long-option instead of -long-option
[[forum/refresh_and_setup]] indicates some confusion between --setup
and -setup. Both work, but it's clearer if we stick to one in
documentation and code.

A 2012 commit to [[plugins/theme]] claims that "-setup" is required
and "--setup" won't work, but I cannot find any evidence in ikiwiki's
source code that this has ever been the case.
2015-03-01 16:15:01 +00:00
n0gOoi3 6b7a2657ae Use $(MAKE) in po, as elsewhere in the build.
(cherry picked from commit 26a6c611fe9a32efa437efd07c698116d22b3a31)
2014-12-27 17:27:03 -05:00
Joey Hess d858ce3e93 Add missing build-depends on libcgi-formbuilder-perl, needed for t/relativity.t 2014-10-20 12:28:54 -04:00
Simon McVittie 7f5c2cfa5a Merge branch 'ready/templatebody' 2014-09-15 21:52:03 +01:00
Joey Hess 6057107d71 update 2014-08-31 14:19:17 -07:00
Joey Hess 29f9c2b5ba add build deps needed by some tests in the test suite 2014-08-15 13:02:14 -04:00
Simon McVittie a9fc30b19c Track whether we're in the scan or render phase
In the scan phase, it's too early to match pagespecs or sort pages;
in the render phase, both of those are OK.

It would be possible to add phases later, renumbering them if necessary
to maintain numerical order.
2014-03-05 10:42:19 +00:00
Joey Hess 8e458bd659 update 2014-01-25 17:08:51 -04:00
Joey Hess f27d7b7a59 prep release 2014-01-02 12:42:32 -04:00
Joey Hess cca084b8ad releasing package ikiwiki version 3.20130904.1 2013-09-04 10:19:37 -04:00
Joey Hess f034dbff79 releasing version 3.20130711 2013-07-10 22:04:36 -04:00
Joey Hess 24a57423b8 releasing version 3.20130710 2013-07-10 18:39:18 -04:00
Joey Hess 7dea816ddf releasing version 3.20130518 2013-05-18 16:41:31 -04:00
Joey Hess 82650b74f4 releasing version 3.20130504 2013-05-05 00:04:18 -04:00
Joey Hess 02d855a393 releasing version 3.20130212 2013-02-12 23:58:51 -04:00
Amitai Schlair a5fb27acb8 Bump test count for previous. 2013-02-02 14:19:50 -05:00
Joey Hess bcec11601f releasing version 3.20121212 2012-12-11 13:03:19 -04:00
Joey Hess bb07dc3f21 releasing version 3.20121016 2012-10-16 15:24:18 -04:00
Joey Hess 80fa5c82a5 releasing version 3.20120725 2012-08-25 11:08:57 -04:00
Joey Hess bfc9dc93c9 releasing version 3.20120629 2012-06-29 13:43:09 -04:00
Joey Hess b4ee745dfe releasing version 3.20120516 2012-05-16 20:13:21 -04:00
Giuseppe Bilotta cb57c3e3e6 po/Makefile: missing one semicolon still 2012-05-09 12:28:14 -04:00
Giuseppe Bilotta ac908010f3 Fix po Makefile
In the complex 'if' chain when merging ikiwiki.pot with .po files, make
sure line-endings, shell-muting and semi-colons don't cause the shell to
bomb out with syntax errors and commands not found.
2012-05-05 08:12:06 -04:00
Joey Hess f3821f161b work without gettext commands
Seems in certian cases (which I cannot entirely reproduce), gettext
commands run during build even from a clean tree. Make these nonfatal.
2012-04-27 14:22:39 -04:00
Joey Hess e09eeb2436 releasing version 3.20120419 2012-04-19 15:41:53 -04:00
Joey Hess 8d46f83756 releasing version 3.20120203 2012-03-19 14:44:17 -04:00
Joey Hess 0a9bb3edc2 releasing version 3.20120202 2012-02-02 22:42:46 -04:00
Joey Hess e50aa9c465 releasing version 3.20120115 2012-01-15 16:44:58 -04:00
Joey Hess 01a1a20aad releasing version 3.20120115 2012-01-15 16:27:32 -04:00
Joey Hess 5e3e329063 releasing version 3.20111229 2011-12-29 12:08:59 -04:00
Joey Hess 3b40790041 releasing version 3.20111107 2011-11-30 16:52:30 -04:00
Joey Hess 5fd076e630 releasing version 3.20111106 2011-11-06 16:35:53 -04:00
Joey Hess 97caf03fa0 releasing version 3.20110905 2011-09-05 15:17:15 -04:00
Joey Hess f2529edcab Fix typo in Danish translation of shortcuts page that caused expoentional regexp blowup.
Complex regular subexpression recursion limit (32766) exceeded at
/home/joey/src/ikiwiki/IkiWiki.pm line 1532.

This doesn't fix the blowup potential itself, it just fixes the typo. :)

A sample page that causes the blowup is attached below for future
reference. The first directive is not terminated. Contributing are the
additional quotes around the following directives, which mean that they can
each be processed as a parameter to the first directive, or as an
individual directive. In resolving this ambiguity, the regexp blows up.
Happily, perl contains the explosion , so I don't think there is an exploit
here.

"[[!shortcut name=wiktionary url=\"https://secure.wikimedia.org/wiktionary/en/"
"[[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]"
"[[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]"
"[[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]"
"[[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]"
"[[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]"
"[[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]"
"[[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]"
"[[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]"
"[[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]"
"[[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]"
"[[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]"
"[[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]"
"[[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]"
"[[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]"
"[[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]"
"[[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]"
"[[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]"
"[[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]"
"[[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]"
"[[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]"
"[[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]"
"[[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]"
"[[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]"
"[[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]"
"[[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]"
"[[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]"
"[[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]"
"[[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]"
"[[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]"
"[[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]"
"[[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]"
"[[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]"
"[[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]"
"[[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]"
2011-07-26 17:29:36 +02:00
Joey Hess 98d2356ad0 releasing version 3.20110715 2011-07-15 18:57:24 -04:00
Joey Hess 4ce2490e01 releasing version 3.20110711 2011-07-11 18:41:30 -04:00
Joey Hess b5eb811fae releasing version 3.20110431 2011-06-03 16:00:25 -04:00
Jonas Smedegaard e818ad1c04 Update danish l10n of underlays.
(cherry picked from commit f893d11e8275ef31a79679aeb7d8ecb3fecc89cf)
2011-05-19 13:43:36 -04:00
Joey Hess f1671eeb8b revert massive l10n refersh
This reverts commit 5a82bc5e87
and commit 55dc246168.

That turns out to not be the way l10n of underlays is handled, instead
these changes are being made to the l10n branch, and the Danish
underlay translation update will be copied into master from that
branch.

This is necessary to avoid tying that branch up in a state where
it is horribly diverged from master and cannot be updated anymore.
2011-05-19 13:29:19 -04:00
Philippe Batailler 63dc670e87 Typo
(cherry picked from commit bde361bb052de7cb4455eb20f3d03fa163d38bc8)
2011-05-19 12:51:04 -04:00
Joey Hess 18322db430 Merge remote-tracking branch 'jonas/master' 2011-05-06 14:31:59 -04:00
Jonas Smedegaard 55dc246168 Update danish l10n of underlays. 2011-05-05 22:35:52 +02:00
Jonas Smedegaard 5a82bc5e87 Refresh gettext files of underlays. 2011-05-05 20:16:40 +02:00
Joey Hess 4a27adfa72 Danish translation update. Closes: #625721 2011-05-05 13:02:31 -04:00
Joey Hess e02b903054 releasing version 3.20110430 2011-04-30 17:27:18 -04:00
Joey Hess 232c8a6dfc releasing version 3.20110328 2011-03-28 12:30:57 -04:00
Joey Hess 5c2ba98bcc releasing version 3.20110321 2011-03-21 15:01:19 -04:00
Joey Hess c58e0a97bf releasing version 3.20110225 2011-02-25 19:59:06 -04:00
Joey Hess 07ec137238 -bug 2011-02-01 20:55:09 -04:00
Joey Hess 2c8cb980bb releasing version 3.20110124 2011-01-24 17:11:53 -04:00