Commit Graph

907 Commits (f40fec811d49e3ae14f6042ef8c304979a486df2)

Author SHA1 Message Date
joey 58318b3ef9 * Allow -cgi -wrapper to be passed on the command line to generate a
wrapper.
* Fix some taint issues with generating wrappers using the command line.
2007-08-28 21:14:03 +00:00
joey 9c5f4761d8 * Support for looking in multiple directories for underlay files.
* Plugins can add new directories to the search path with the add_underlay
  function.
* Split out smiley underlay files into a separate underlay, so if the plugin
  isn't used, the wiki isn't bloated with all those files.
2007-08-28 01:59:01 +00:00
joey 6d3d4129f0 fix newsion number 2007-08-27 22:03:46 +00:00
joey 6c89a635bb * Add an editcontent hook. 2007-08-26 21:33:25 +00:00
joey a036817125 releasing version 2.6.1 2007-08-26 18:08:45 +00:00
joey ab8125d62a * Fix a bug in unlockwiki intorduced last version that made it crash ikiwiki
if it wasn't locked when called. This is known to break post-commit
  emails.
2007-08-26 17:38:17 +00:00
joey abc5919087 * Fix bug when blogging by cgi, introduced in last version. 2007-08-26 17:32:15 +00:00
joey 9653873e29 releasing version 2.6 2007-08-24 22:09:25 +00:00
joey 8c31a01efa rename tex to teximg 2007-08-23 21:19:21 +00:00
joey 27d029113f * Add embed plugin, which allows embedding content from google maps, video,
calendar, and youtube. Normally, the htmlsanitiser eats these since they
  use unsafe tags, the embed plugin overrides it for trusted sites.
* The googlecalendar plugin is now deprecated, and will be removed
  eventually. Please switch to using the embed plugin.
2007-08-23 20:14:08 +00:00
joey 2c5fbe844b * Call the formbuilder hook for the edit page.
* Call decode_form_utf8 before running formbuilder_setup hooks.
* Add editdiff plugin contributed by Jeremie Koenig.
* Fix it to not leak path info.
2007-08-22 21:06:13 +00:00
joey f760fcfa3f * Added tex plugin to generate images from latex code.
Contributed by Patrick Winnertz as a GSoC project.
2007-08-22 00:59:41 +00:00
joey 7946c67d1f * Avoid ugly gettext messages if LANG is empty. Closes: #439035 2007-08-21 21:19:53 +00:00
joey 50e1b43408 * Add monotone support, contributed by William Uther. 2007-08-21 03:10:35 +00:00
joey 4b06890971 * Add proper Homepage field to Debian package (needs uber-new dpkg). 2007-08-20 20:23:33 +00:00
joey a9b7f01ec8 * Add color parameter to postsparkline. Closes: #438900 2007-08-20 18:57:21 +00:00
joey ce7596dad9 * Applied Jeremie Koenig's pluggable editpage buttons patch:
- add a title to the editpage form;
  - pass a reference to the list of buttons to the formbuilder_setup
    hooks, so we can add ours;
  - relax asumption about the possible submit values (use "Save Page"
    explicitly);
  - de-hardcode the submit buttons from the editpage template
    (This was needed for compatability with a bug in CGI::FormBuilder
    3.0401, but ikiwiki already needs a newer version.)
* Pass buttons to all other formbuilder_setup hooks too.
2007-08-17 05:34:59 +00:00
joey c5ad5c8276 * Various minor fixes and stylistic improvements suggested by Perl::Critic. 2007-08-15 08:08:32 +00:00
joey d392f5776a * Fix bug when editing file from underlaydir, need to rcs_add it even though
a page creation isn't occuring.
2007-08-14 20:11:45 +00:00
joey 69065b8e79 * Fix bug in deletion/move during edit code introduced in 1.44. Need to take
the underlaydir into account.
2007-08-14 19:44:59 +00:00
joey b4dafe467b * Change yet again how unhandled and escaped preprocessor directives are
re-output onto the page. Hopefully I finally got it right..
2007-08-13 17:35:14 +00:00
joey 22e83e75c8 typo 2007-08-13 04:13:22 +00:00
joey 506bcbac04 * Fix --libdir to work at the command line.
* Plugins can now be written as standalone external programs, which can
  be written in any language that can do XML::RPC.
2007-08-13 03:07:31 +00:00
joey 2e1670a821 * Add time=mtime option to postsparkline. 2007-08-12 09:19:20 +00:00
joey 7922a663c0 * Support pagespec "functions" with no parameters, like included() in the
conditional plugin.
2007-08-11 23:31:57 +00:00
joey 160326b469 * Apply a patch from NicolasLimare adding modification date tags to rss and
atom feeds, and also changing the publication time for a feed to the
  newest modiciation time (was newest creation time).
* The patch also adds dcterms:creator to rss items that have a known author.
2007-08-11 23:15:08 +00:00
joey dc89360f03 * The toc directive doesn't work well or make sense inside an inlined page.
Disable it when the page with the toc is nested inside another page.
2007-08-11 21:46:59 +00:00
joey 3ef2f4b529 * Updated French translation from Cyril Brulebois. Closes: #437181 2007-08-11 21:25:28 +00:00
joey b72780e70b * Add sessioncgi hook.
* Updated Spanish translation from Victor Moral.
2007-08-10 18:05:04 +00:00
joey 46a80d9cbe * Move blog form code out of CGI.pm and into the inline plugin. 2007-08-05 22:07:32 +00:00
joey 8e2fb374e0 * Add sessioncgi hook. 2007-08-05 21:38:27 +00:00
joey 09b0a3b73f * Add rel=tag attribute to tag links, supporting that microformat, as well
as allowing them to be styled specially. Thanks, NicolasLimare.
2007-08-05 20:48:13 +00:00
joey 1d61c4d4d6 * pagetemplate: don't display template name 2007-08-05 18:22:21 +00:00
joey 2e6bbb2bec * Add --set-option command line switch. 2007-08-04 06:28:43 +00:00
joey 54e25f034c * Allow raw html in the rst plugin. 2007-07-29 22:39:40 +00:00
joey f371f2f2d8 * Fix problems with previewing in the graphviz plugin. Thanks,
HenrikBrixAndersen.
2007-07-29 22:34:42 +00:00
joey 0931723fab belated note about upgrades to 2.5 2007-07-29 21:57:39 +00:00
joey c0f8808232 * Various minor bug fixes for silly mistakes in the code, thanks to the
various reviewers.
2007-07-28 21:01:56 +00:00
joey 6a1e462cdd releasing version 2.5 2007-07-27 02:03:14 +00:00
joey 1e5cd11635 * Add a libdir config option to let ikiwiki load perl modules, including
plugins, from a user-configurable directory.
2007-07-27 00:48:06 +00:00
joey 40959ce76d * Add templatefile hook.
* Add pagetemplate plugin, which allows changing the template used for
  a page. (Not to be confused with the hook of the same name..)
2007-07-26 20:50:55 +00:00
joey 72c95e8434 * Fix re-rendering of pages when a linked to page goes away. This was broken
in version 1.50 with the addition of %destsources. Thanks, Ethan
  Glasser-Camp.
2007-07-26 19:41:04 +00:00
joey a7b8e35bf9 * Fix graphviz plugin to not try to read images as utf-8; they might
sometimes contain invalid utf-8 byte sequences. Thanks,
  HenrikBrixAndersen.
2007-07-25 02:15:52 +00:00
joey 1612dce6bb * Add a htmlext config option, this can be used to make ikiwiki generate
html files with a different extension.
2007-07-25 01:16:53 +00:00
joey 4de235a385 * Make the map plugin notice when pages in the map are deleted and update
it.
2007-07-25 01:04:56 +00:00
joey 4936b3db88 * Correct some issues with escaped preprocessor directives. 2007-07-20 17:55:19 +00:00
joey c92ab9cddd * Wrap the editpage template in the standard misctemplate, this allows the
pagetemplate hook to work for that page.
* Above change fixes the favicon plugin to work on edit pages.
2007-07-16 05:24:31 +00:00
joey 40261f2f9d releasing version 2.4 2007-07-15 23:43:16 +00:00
joey 3bd439fa03 * In img tag, allow link=no to disable link to full size image. Thanks,
Nis Martensen. Closes: #433188
2007-07-15 19:00:07 +00:00
joey 64ec439f1f bug closure 2007-07-13 22:39:34 +00:00
joey a0aca9f585 * Fix links to alternate stylesheets when usedirs is enabled.
* Use type= not style= in html for alternate stylesheets, which is more
  correct (but in my testing both epiphany and iceweasel work ok with
  style=text/css).
2007-07-13 20:38:31 +00:00
joey eabe03fb5b * Fix links to stylesheets when usedirs is enabled. 2007-07-13 20:19:34 +00:00
joey 03dc63588c on second thought, simple alphanumeric styles are not actually useful (class is already supported), and anything more complex is too hard to do, so revert 2007-07-11 17:57:02 +00:00
joey a8fa52080d * Allow simple alphanumeric style attribute values in the htmlscrubber. This
should be safe from javascript attacks.
2007-07-11 16:50:59 +00:00
joey e0da57358c get confused. So it's best for ikiwiki to follow the compatability
* Support building on systems that lack asprintf.
* mercurial getctime is currently broken, apparently by some change in
  mercurial version 0.9.4. Turn the failing test case into a TODO test case.
2007-07-09 00:39:55 +00:00
joey 45e2c23e03 * Make the toc plugin use html-compatible anchors. This is necessary since
most web sites serve ikiwiki xhtml files as text/html and mozilla browsers
  get confused. So it's best for ikiwiki to follow the compatability 
  recommendations in appendix C of the XHTML spec. Closes: #432045
2007-07-08 16:57:05 +00:00
joey 5fe490c7d7 massive naming and userlink patch from Paweł Tęcza 2007-07-07 23:48:00 +00:00
joey b1560f7275 * Correct a longstanding bug that could cause the edit form to be empty.
This turns out to have occured if the cgi wrapper was created by an
  ikiwiki invocation that included --rebuild. Thanks to Carl Worth for
  tracking that down.
2007-06-30 00:48:39 +00:00
joey 45e269b768 * French update from Jean-Luc Coulon. Closes: #430771 2007-06-28 17:47:25 +00:00
joey afcf0dc79e * Patch fixing various additional problems with test suite. Closes: #425891
once more.
2007-06-26 22:11:59 +00:00
joey 3bfa109971 * Allow svnpath config option to contain additional extra slashes anywhere
w/o confusing ikiwiki.
* Rcs modules are now imported, so other modules that need similar
  normalisation of configs etc can do so.
2007-06-23 12:12:59 +00:00
joey 9a122f001a * Corrected a typo in an error handler in the image plugin. 2007-06-19 18:46:43 +00:00
joey e00a8931a0 add freebsd port 2007-06-18 20:26:47 +00:00
joey 435e06bce1 * Add typographyattributes configuration setting to typography plugin. 2007-06-05 19:04:15 +00:00
joey d9a3c2bed2 * Make the url absolution code for feeds significantly more robust. 2007-06-03 17:10:32 +00:00
joey aadb214220 * Fix wrapper generator and untaint code's handling of strings contining
newlines.
2007-06-03 16:24:22 +00:00
joey bf228acd0a * Add test suite for preprocessor directive parsing. 2007-06-02 05:05:22 +00:00
joey 78323806ee * Explode some of the more insane regexps. 2007-06-01 23:40:43 +00:00
joey 66cb6baf4e * Apply a patch from Carl Worth adding support for using globs in link()
in a PageSpec.
2007-05-30 19:54:08 +00:00
joey b4eaef94bd * Correct some issues with display of unhandled preprocessor directives. 2007-05-29 01:56:52 +00:00
joey ba1765fbdf * More consistent encoding of titles in rss and atom feeds. Don't use
ESCAPE=HTML for titles in the templates for these feeds, and instead
  escape the title going in to the template. Previously, the title was
  sometimes double-escaped in a feed (if set via meta title), and sometimes
  not (if set from the page filename).
* In the meta plugin, when a title is set, encode the html entities in it
  numerically. This works better in the current landscape of a rss spec that
  doesn't specify encoding, and variously broken feed consumers, according
  to <http://www.rssboard.org/rss-profile#data-types-characterdata>.
2007-05-28 19:43:28 +00:00
joey 330bbd03df * Apply a patch from Carl Worth allowing a class attribute to be passed
through the img plugin. Also allow the id attribute to be passed through.
2007-05-28 19:07:38 +00:00
joey ffc06c8e4d * Fix FTBFS in test suite introduced in last version. Closes: #425891 2007-05-24 20:21:45 +00:00
joey 8c2c8c6bea * Deal better with rebuilds that involve moving files; track and clean up the
old files.
* Change where the img plugin puts scaled images. It's better to make the
  scaled images subpages of the page that embeds them, rather than putting
  them alongside the original image, since if two pages scale the same image
  the same way, this prevents complications in dealing with two pages
  creating the same file. The move will be handled transparently, though you
  might want to rebuild your wiki to make it occur in one step.
2007-05-24 19:56:08 +00:00
joey bb0cbecbc3 * Correct bug in the img plugin that caused dependencies on images to not
always be tracked correctly.
2007-05-23 01:44:11 +00:00
joey 9fa9080f2c * Updated Spanish translation from Victor Moral. 2007-05-21 17:18:52 +00:00
joey 82ac63d798 * Change the aggregate plugin's locking strategy. Now it defers loading state
until the wiki is building and already locked, unless it's aggregating.
  When aggregating, it does not wait for the lock if it cannot get it, and
  instead exits, to prevent aggregating processes from piling up.
2007-05-21 02:52:51 +00:00
joey d3d528b5c4 * Add a test ensuring that the basewiki is self-contained and has no broken
links.
2007-05-20 01:00:21 +00:00
joey cf35ee04cd * Add a destpage parameter to the filter hook.
* Fix links to smilies generated by the smiley plugin for inlined pages. The
  old links were often wrong, but often still worked by accident.
2007-05-17 19:55:11 +00:00
joey 739325834b * Fix some bugs in password handling:
- If the password is empty in preferences, don't clear the existing
    password.
  - Actually check the confirm password field, even if it's left empty.
2007-05-17 08:06:05 +00:00
joey 08d0bd7338 * Patch from hb to fix the pagestats plugin, which was broken by a past
change to the backlinks() function.
2007-05-12 17:56:56 +00:00
joey 190202dd4e * Make all templates have a footer div to ease themeing. Required template
and style sheet updates, and unless you're using customised versions,
  you'll want to rebuild wikis on upgrade to this version to avoid
  inconsistencies.
* Allow WIKINAME to to used in footers, as an example of something to put
  there.
2007-05-11 20:09:58 +00:00
joey f23ebaad2e * Apply patch from Pawel to avoid using -L in Makefile as it's not available
in older finds.
2007-05-10 18:59:02 +00:00
joey 301e2d93c4 * Updated Czech translation from Miroslav Kure. 2007-05-09 20:01:55 +00:00
joshtriplett b8d7ae91d0 * Add an account-creation password as a simple anti-spam mechanism. If
set in the wiki setup, passwordauth will require the password in
  order to create an account.
2007-05-09 02:05:32 +00:00
joshtriplett 563ea1c56f Remove doc-wiki-only item from the changelog. 2007-05-09 01:27:57 +00:00
joey 72c53650ad * Add the needsbuild hook. Plugins can use this to manipulate which files
ikiwiki builds when refreshing the wiki.
2007-05-09 00:48:09 +00:00
joey 127bceef5b * Add all=no option to conditional, can be used to form conditionals that do
not need to examine every page in the wiki.
* Use this to simplify the goodstuff detection in the plugin template.
2007-05-09 00:31:49 +00:00
joey 5c6b96967d update 2007-05-08 21:31:14 +00:00
joey 687928ead2 * Make testpagespec more robust, including checking for missing/bad
parameters, and detecting if a pagespec failed to compile.
2007-05-08 21:22:14 +00:00
joey 5132558731 * Improve handling of edits of locked pages by users who are not yet signed
in.
2007-05-07 05:34:55 +00:00
joey 9026ae05c2 * Fix a bug that prevented clearing email or subscriptions. 2007-04-30 21:32:24 +00:00
joey 65be0598a9 * Use div layout for the signin and preferences forms, so that they can be
styled using the stylesheet, rather than by creating signin and prefs
  templates.
* Make the openid login form nicely styled.
2007-04-30 21:27:58 +00:00
joey cd27ffc614 * If Net::OpenID::Consumer is not available, the openid module will quietly
disable itself, this avoids needing a hard dependency on the perl module.
2007-04-30 04:41:53 +00:00
joshtriplett fafaa119cf Revert passwordauth fieldset and doc to avoid 2.0 regressions; need to re-evaluate after 2.0. 2007-04-30 04:08:06 +00:00
joshtriplett 40365e1aee * Group passwordauth fields with a fieldset as well. Add a new
passwordauth page to the basewiki describing password
  authentication; like openid, it uses conditional to check which
  forms of authentication the wiki allows.  Add conditional cross-
  links between the openid and passwordauth pages, to help the user
  understand how they can log in.
2007-04-30 02:26:50 +00:00
joshtriplett e739073c38 * fieldset support appeared in CGI::FormBuilder 3.05, so increase
version in Depends on libcgi-formbuilder-perl to 3.05
2007-04-30 02:21:17 +00:00
joey 69d27a2ecd 2.0 stuff 2007-04-29 23:19:25 +00:00
joey 1e62e4f87f * Enable openid logins by default.
* Enable usedirs by default.
2007-04-29 22:54:14 +00:00
joey dde68ed9b9 * Use a fieldset to set off the openid entry from the rest of the login
form.
2007-04-29 22:16:15 +00:00
joey 93c6d2c340 * Use fieldsets in the preferences form to group related options together.
Especially cleans up the ordering of the admin's preferences form.
2007-04-29 21:57:25 +00:00
joshtriplett e97b63c95a * Avoid using GNU extensions to cp during "make install", which did
not work on FreeBSD.  Thanks to Henrik Brix Andersen for the patch.
2007-04-29 21:53:26 +00:00
joey 3340087f66 releasing version 1.51 2007-04-29 04:57:39 +00:00
joey 5c36a5cfc6 * Apply patch from hb that uses the full path to a file when adding a file
using the mercurial backend. Not 100% sure why it failed w/o the full
  path, but this still passes the test suite, and indeed, is how the test
  suite calls hg add.
2007-04-29 03:25:09 +00:00
joey a1d9abab8c * Updated Spanish translation from Victor Moral. 2007-04-29 02:16:13 +00:00
joey 89abde117a * Updated Czech translation from Miroslav Kure. 2007-04-28 17:35:01 +00:00
joey 6bbade916e * Updated Polish translation from Pawel Tecza. 2007-04-27 20:26:54 +00:00
joey 1eee32c5b5 * Make pagespec_match return an object that can be stringified to tell
* Include wikiname in syslogged messages.
2007-04-27 17:48:11 +00:00
joshtriplett bf006f771b * Fix bestlink to use pagecase for pages in userdir, to support pages
with non-lowercase filenames.
2007-04-27 09:11:14 +00:00
joey 8fa8bd0adb the kind of perl code that can only be written at 4:30 am
(Get a good message when a PageSpec fails due to a negated success by
creating success objects with a reason string, which morph into failure
objects when negated.)
2007-04-27 08:34:09 +00:00
joey f8a7fb227b * Make pagespec_match on failure return a value that is false, but in a
scalar context, evaluates to a reason why the match failed.
* Add testpagespec plugin, which might be useful to see why a pagespec isn't
  matching something.
2007-04-27 07:55:40 +00:00
joey 7cc6eb4ea4 * Updated Gujarati translation from Kartik Mistry. Closes: #421198 2007-04-27 05:31:15 +00:00
joey ee1ad53c4c * pagespec_match() has changed to take named parameters, to better allow
for extended pagespecs. The old calling convention will still work for
  back-compat for now.
* The calling convention for functions in the IkiWiki::PageSpec namespace
  has changed so they are passed named parameters.
* Plugin interface version increased to 2.00 since I don't anticipate any
  more interface changes before 2.0.
2007-04-27 02:55:52 +00:00
joey b14ac07025 * Add user(name) to the PageSpec for commit subscriptions. 2007-04-27 00:30:49 +00:00
joey 01f41560e3 * Fix sending of commit mails when new pages are added via the web. 2007-04-26 23:29:19 +00:00
joey 80b0165ff8 * Avoid .svn directories when installing from svn checkout. 2007-04-26 22:58:01 +00:00
joey 89c6564565 * Due to template changes and style sheet changes that depend on them,
wiki rebuilds are recommended on upgrade to this version.
2007-04-26 19:52:25 +00:00
joey 160fd34187 more footer improvements 2007-04-26 19:49:06 +00:00
joey fe52c28bd6 * Move the footer div to enclose tags and links too.
* More style sheet updates, remove the hack that used the tags div to create
  the footer border.
2007-04-26 19:33:28 +00:00
joshtriplett 0458338319 * Change basewiki CSS to not put a border around images used as links. 2007-04-24 20:53:36 +00:00
joey 71d2d93027 * Fix aggregator to not warn when a feed contains no body content at all.
* Work around bug #420636 by, if XML::Parser crashes, running the feed
  content though Encode::decode_utf8.
2007-04-23 18:36:44 +00:00
joey 1e62d2bc0c * In mercurial backend, untaint ipaddr when using it as the user for the
commit. Thanks, Alexander Wirt. Closes: #420428
2007-04-22 17:45:39 +00:00
joey 3af6dea3b5 * Minor template improvements by Alessandro. 2007-04-18 23:35:48 +00:00
joey c5975243a5 * Support setting svnpath to "" for wikis that are rooted at the top of
their svn repositories, with no trunk directory.
2007-04-16 19:07:52 +00:00
joey a98a8feaec releasing version 1.50 2007-04-15 20:10:35 +00:00
joey fedaead1d0 * Add .dpkg-tmp to prune regexp, so that if ikiwiki is run right as it's
being upgraded by dpkg it will ignore dpkg temp files in the basewiki.
2007-04-15 18:10:39 +00:00
joey e855e30d01 * Add feedshow parameter to inline, which can be useful for eg, removing
old posts from feeds when permalinks change.
2007-04-14 20:58:02 +00:00
joey 9b145798c7 * Patch from Tuomov to link to the directory in feeds when usedirs is in
effect. Note that this changes permalinks, so if you are already using
  usedirs you'll have to deal with that on upgrade to this version.
2007-04-14 20:46:41 +00:00
joey fb802f8d2d * Apply patch from Ethan to improve an error message that should never
happen.
2007-04-14 20:07:03 +00:00
joey dd03d57678 * Internal version number and installdir substitutions were lost, fix. 2007-04-13 18:41:06 +00:00
joey 01b058a285 * Add postformtext parameter to inline. 2007-04-12 04:13:55 +00:00
joshtriplett 42761921d0 * Add libtext-typography-perl to Suggests for the typography plugin. 2007-04-10 07:25:23 +00:00
joshtriplett e21c689d3c * Add libdigest-sha1-perl to Suggests, for sparkline and graphviz. 2007-04-10 07:22:11 +00:00
joshtriplett ae719636f5 * Add libtext-csv-perl to Suggests, for the table plugin. 2007-04-10 07:16:27 +00:00
joshtriplett d4c489ed93 * Conflicts/Replaces/Provides the unofficial ikiwiki-plugin-table
package, because ikiwiki now provides the table plugin, and thus has
  a file overlap with ikiwiki-plugin-table.
2007-04-10 06:46:54 +00:00
joey 13c7a51f1f * Optimise displaytime, trimming maybe 6% off the build time. 2007-04-10 01:49:16 +00:00
joshtriplett 15d61ff4ed spelling 2007-04-10 01:27:12 +00:00
joey 47cc9ee7bf credit 2007-04-10 01:25:50 +00:00
joey 06b955b84a * Add a new %destsources hash, which maps between a destination file and
the source page used to create it, ie it's the reverse of %renderedfiles.
* Use %destsources in htmllink and urlto for 20-50% speedup.
2007-04-10 01:18:03 +00:00
joey 88ffeae6ee * Add support for PROFILE=1 to the Makefile, this turns on profiling of the
wiki build using Devel::Profiler (Dprof can't handle ikiwiki).
2007-04-10 00:26:15 +00:00
joshtriplett 83c0daccce * Add myself as a co-maintainer, with Joey's approval. 2007-04-09 23:36:06 +00:00
joey 98994a4719 use err facility when logging errors to syslog 2007-04-09 23:09:43 +00:00
joshtriplett 5e239902b2 * Enhance helponformatting and related documentation to supply more
information about available preprocessor directives.
2007-04-09 21:53:36 +00:00
joshtriplett 54a4151306 * Add a graphviz plugin.
* Suggests: graphviz
2007-04-09 09:09:02 +00:00
joey c36f5afce8 releasing version 1.49 2007-04-08 20:24:18 +00:00
joshtriplett f2b60470c6 * Remove stray semicolon in linkmap.pm. 2007-04-07 00:30:09 +00:00
joey 4de163b997 * Fix display of escaped wikilinks containing anchors. 2007-04-06 21:20:14 +00:00
joey 8fa477fa28 * Fix smiley plugin to scan smileys.mdwn after it's updated, which fixes
a bug caused by committing changes to smilies.mdwn.
2007-04-06 20:36:29 +00:00
joey 6807cc5b28 update 2007-04-06 17:56:53 +00:00
joey 8d03891eba * Reorder the icon in the template above the stylesheets, to avoid icon
flashing during page load.
2007-04-06 17:31:00 +00:00
joey f5a2ba0164 * Updated French translation from JLC. Closes: #417982 2007-04-06 17:14:23 +00:00
joshtriplett b4b0638751 * Add XS-Vcs-Browser field. 2007-04-06 03:28:05 +00:00
joshtriplett 0fa01750ce * Add Homepage field. 2007-04-06 03:23:49 +00:00
joshtriplett 3f75c43e17 * Improvements to Description in debian/control:
* Note that some plugins have additional dependencies, found among the
    Recommends and Suggests.
  * ikiwiki supports both RSS and Atom feeds.
  * Fix typos.
2007-04-06 03:21:12 +00:00
joshtriplett a4d5000f04 * Add neutral smileys ":|" and ":-|", and question icon smiley "(?)",
with images taken from phpBB (GPL) and converted with gif2png.
2007-04-06 02:53:36 +00:00
joshtriplett 92433bae25 * Use pngcrush and optipng on all PNG files. 2007-04-06 02:46:19 +00:00
joey d25e91e127 * Fix tags to page names that contain special characters. 2007-04-04 21:08:01 +00:00
joey 83618add81 * Fix a bug that caused link(foo) to succeed if page foo did not exist. 2007-04-04 20:57:13 +00:00
joey aee4621bae * Fix a bug in the img plugin that caused thumbnailed files to not be
* Make the OpenID library a reccommendation of the Debian package, rather
  than just a suggests, since OpenID is enabled by default.
2007-04-04 00:40:57 +00:00
joey bf9e8bc900 * Fix a big in the img plugin that caused thumbnailed files to not be
tracked properly.
2007-04-01 20:53:03 +00:00
joey 6351ae2ac4 fix links to sparklines; abs2rel -> urlto 2007-04-01 20:25:27 +00:00
joey 7910c2c7f6 use urlto; htmlpage is no longer appropriate here 2007-04-01 20:21:35 +00:00
joey 02b9f69ba5 * Finally apply the index.html patch, with thanks to everyone who worked
on and supported creating it (especially Tumov). This adds a "usedirs"
  option that makes ikiwiki use foo/index.html instead of foo.html as
  output page names. It is not yet enabled by default.
2007-04-01 19:59:42 +00:00
joey a2cfdaaec5 * Hide excess backlinks and expand using CSS trick; control quantiy via
the numbacklinks setting.
2007-03-31 08:48:10 +00:00
joey d73eb7d9b2 * Add a templates page to the basewiki. It will automatically list all
available templates. Rename the old templates page to wikitemplates.
* Include the note template in the basewiki.
* Add a popup template in the basewiki. CSS based on some by Martin Krafft.
* Make the note, popup, and plugin templates detect missing variables and be
  self-documenting, listing the available variables.
2007-03-31 06:55:12 +00:00
joey 35ab3237fa * Fix urls generated by mirrorlist plugin. 2007-03-31 00:41:22 +00:00
joey 0302056332 * Add --post-commit option, which allows for the case of a split web server
and RCS server (or a push mirror). With this the RCS server can have a
  real post-commit hook that sshs back to the web server, and runs ikiwiki
  in post-commit mode to update the wiki.
2007-03-29 18:27:00 +00:00
joey e0cff15163 releasing version 1.48 2007-03-28 17:52:19 +00:00
joey c936ba1719 * Fix mercurial backend to deal with empty commit messages. 2007-03-24 15:14:53 +00:00
joey bbb0b3e72f * Finally fixed the longstanding inline removal bug.
* Renamed %oldpagemtime to a more accurately named %pagemtime and fix it to
  actually store pages' mtimes.
* Add "mtime" sort parameter to inline plugin.
2007-03-24 15:10:58 +00:00
joey 5a6a93544f * Make ikiwiki's stylesheet support printing by hiding parts of the page
that shouldn't appear in a printout: Search box, actions bar,
  blog post form, tags, backlinks, and feed buttons.
2007-03-22 00:02:48 +00:00
joey d3df4c133c typo 2007-03-21 23:16:44 +00:00
joey 2a0d91af2f * Fix link() PageSpecs to not just look at the raw link text, but at where
that given link points based on the page doing the linking. Note that this
  could make such PageSpecs match different things than before, if you
  relied on the old behavior of them only matching the raw link text.
* This required changing the match_* interface, adding a third parameter.
* Allow link() PageSpecs to match relative, as is allowed with globs.a
* Add postform option to inline plugin.
* Add an bug tracker to the softwaresite example.
2007-03-21 23:11:09 +00:00
joey 1ecd251ffa releasing version 1.47 2007-03-21 19:16:18 +00:00
joey c8b4ba354f * Fix a security hole that allowed insertion of unsafe content via the meta
plugins's support for inserting html link and meta tags. Now such content
  is passed through the htmlscrubber like everything else.
* Unfortunatly, that means that some valid uses of those tags are no longer
  usable, and special case methods needed to be added for including
  stylesheets, and for doing openid delegation. If you use either of these
  in your wiki, it will need to be modified. See the meta plugin docs
  for details.
2007-03-21 18:52:56 +00:00
joey 72ed9e455c the real bug turned out to be in the meta plugin 2007-03-21 06:46:06 +00:00
joey 03e5438155 oh, this is confusing, it needs escaping in <title>, but not when it's used
inline, already escaped there
2007-03-21 06:22:06 +00:00
joey 1c65ca4922 * Fix a few bugs around page titles containing html. The worst of these
is an actual security hole as it allows insertion of html into the title
  element of a page, which is not processed by the htmlscrubber.
2007-03-21 06:05:21 +00:00
joey 16112c3294 response 2007-03-18 22:27:09 +00:00
joey cb0c642aed * Applied a patch from Michał to make the mercurial backend pass --quiet to
hg.
2007-03-18 22:20:44 +00:00
joey 26213f8ee4 * Detect the case of two people independently creating the same page at the
same time, and let the second person resolve the conflict.
2007-03-17 23:57:03 +00:00
joey 50a9ef4753 * Make ikiwiki -verbose -setup with a setup file that enabled syslog logging
output the verbose build log to stdout, rather than to the syslog.
2007-03-17 23:32:48 +00:00
joey 188f1931c2 * Fix some broken logic in cgi creation of a subpage when a toplevel page
with the same name already exists, and generally simplify the edit code.
2007-03-17 23:20:27 +00:00
joey b154c971a9 * French update. Closes: #414597 2007-03-12 19:52:52 +00:00
joey e5ddd9b581 * Fix a bug with inlined create page links, including Discussion links on
blog post pages. The links will now create pages relative to the page that
  actually contains the link.
2007-03-11 04:59:03 +00:00
joey ec1dc5b00f releasing version 1.45 2007-03-11 02:29:15 +00:00
joey 89673afc6b add postsparkline plugin, providing sparkliney stats goodness for blog
posts
2007-03-11 00:24:31 +00:00
joey 66a65b5ddd * Correct a deadlock that could occur in post-commit if the aggregate plugin
was enabled and tried to lock the already locked wiki.
2007-03-08 11:04:59 +00:00
joey c1b698e418 * The underscore escaping support exposed a bug in edit links: Such links
were titlepage escaped in the urls, and then doubly escaped by the CGI
  when editing. To fix this, I removed the titlepage escaping in the edit
  urls.
* That means that *every edit link* on the wiki is potentially changed.
  Rebuilding wikis on upgrade to this version therefore necessary; enabled
  that in postinst.
2007-03-08 06:03:59 +00:00
joey 5d57a8436f * Add a table plugin, derived from the one written by Victor Moral. 2007-03-07 11:40:22 +00:00
joey b365d864c5 My fix to support encoded underscores in page titles broke links to pages
with underscores in their filenames, since the link code also used
titlepage. Create a new linkpage function and have the link code use that
instead.
2007-03-07 09:48:59 +00:00
joey c69d6f669a * The slash escaping when adding to a blog from the CGI was not working
since it ended up being double-escaped. Instead, just remove slashes.
* Fix some nasty issues with page name escaping during previewing
  (introduced in 1.44).
2007-03-07 09:23:13 +00:00
joey 7629ca1768 mention git 2007-03-07 05:47:34 +00:00
joey 1af4def09a typo sparline => sparkline 2007-03-07 05:35:35 +00:00
joey d4d535f17c * Add a sparline plugin. 2007-03-07 05:33:45 +00:00
joey 1202b4fd7b * Add preview parameter to preprocesser calls, use this rather than the
previous ugly hack used to avoid writing rss feeds in previews.
* Fix the img plugin to avoid overwriting images in previews. Instead it
  does all the work to make sure the resizing works, and dummys up a resized
  image using width and height attributes.
* Also fixes img preview display, the links were wrong in preview before.
2007-03-06 22:37:05 +00:00
joey b9f7a57f94 * Add titlepage template for inline plugin. 2007-03-06 19:16:46 +00:00
joey 10b8557946 * Add "template" option to inline plugin to allow for use of customised
templates.
2007-03-02 04:00:42 +00:00
joey 3660b1c7a1 * Allow for underscores to appear in page titles, if encoded appropriately
(__95__) in filenames. Previously, all underscores were replaced with
  spaces. Thanks, Enrico Zini for noticing that bug.
2007-03-02 00:37:22 +00:00
joey 1dbaf7a91c releasing version 1.44 2007-02-25 01:20:53 +00:00
joey 072967e62a * Patch from Ethan to improve behavior if a page is deleted or moved while
someone is editing it.
* Some cleanup of field setting in the failed edit and conflict handling
  code.
2007-02-24 00:39:06 +00:00
joey 2dfe3efcb7 * Correct a bug that could lead to infinite looping after signin in some
circumstances.
2007-02-24 00:20:36 +00:00
joey ba0d82e7ea * Patch from HenrikBrixAndersen to fix a broken use of foreach in the
search plugin.
2007-02-23 19:36:31 +00:00
joey 1e5d95e07b * French translation update. Closes: #411899 2007-02-21 18:34:36 +00:00
joey c60477228c * Since the CGI had to drop the wiki lock to avoid deadlocking the
commit hook, it was possible for one CGI to race another one and "win"
  the commit of both their files. This race has been fixed by adding a new
  commitlock, which when locked by the CGI, disables the commit hook
  (except for commit mails). The CGI then takes care of the updates the
  commit hook would have done.
2007-02-21 08:55:28 +00:00
joey 92e5781212 * Elegant patch from Ethan to clean up the display of page names in the
dropdown when creating a new page.
2007-02-21 00:17:50 +00:00
joey d0804acdc2 * Smarter detection of no-op changes to po files. 2007-02-20 23:13:49 +00:00
joey 135e5fc63a * perl is broken: print "" || die fails! Work around this insanity. 2007-02-20 22:19:28 +00:00
joey b90d4ccc06 test commit 2007-02-20 09:43:44 +00:00
joey e41cd25f4f typo 2007-02-20 04:28:16 +00:00
joey aae1bc4905 build ikiwiki.out and use it to build the wiki, so that NOTAINT can take effect during the build too if necessary 2007-02-20 04:24:54 +00:00
joey 0be3937a0f I belive that this patch was from Ben 2007-02-20 04:16:40 +00:00
joey 8b3a840a74 * Detect old versions of xgettext and avoid using them. 2007-02-20 04:10:31 +00:00
joey 2725887734 * Make img plugin not fail immediately if Image::Magick is not available.
This lets ikiwiki not build depend on perlmagic.
2007-02-20 03:59:35 +00:00
joey d442f1b2fc * Don't error out if estcmd fails, just print a warning message. estcmd is
to fragile to let it kill ikiwiki.
2007-02-20 03:17:09 +00:00
joey fa52a730ff * Changed calling convention for httmllink slightly. The first three
parameters remain the same, but additional options are now passed in using
  named parameters.
* Change plugin interface version to 1.02 to reflect this change.
* Add a new anchor option to htmllink. Thanks Ben for the idea.
* Support anchors in wikilinks.
* Add a "more" plugin based on one contributed by Ben to allow implementing
  those dreaded "Read more" links in blogs.
2007-02-20 03:05:47 +00:00
joey 1081aa1ee5 fix a bug 2007-02-20 01:49:52 +00:00
joey 34f1c2aee8 * Allow setting NOTAINT=1 when building the wiki to remove taint checking
flags, which can be useful on some hosting providers.
2007-02-20 01:09:48 +00:00
joey 7884f69eaf * Add a openidlogin-bg.gif to wikiicons and have the stylesheet use it for the
OpenID login form rather than linking to a remote logo, to avoid various
  issues. Since there is not yet a license for the actual OpenID logo, this
  file is currently a blank image. Users who want to can copy
  http://openid.net/login-bg.gif into their wiki.
2007-02-19 23:42:46 +00:00
joey 8bfcca5b47 * Patch to fix validaton of atom feeds by fixing the category tags. 2007-02-19 04:42:30 +00:00
joey 596019fb2b releasing version 1.43 2007-02-19 04:37:47 +00:00
joey c9d7926df4 * New domain name for ikiwiki: ikiwiki.info. Update your links. 2007-02-18 20:24:40 +00:00
joey fa386be22e * Add explicit module prereqs to Makefile.PL 2007-02-18 18:01:55 +00:00
joey ecf37caff9 * Avoid potential syslog format string issue, although only older versions
of perl are vulnerable and it is not known to really be exploitable from
  ikiwiki.
2007-02-17 21:34:42 +00:00
joey 43be4c519e * Updated Czech translation. 2007-02-17 19:02:53 +00:00
joey 0cfc607314 * Add a prettydate plugin that formats dates in a more readable fashion.
(I had to get a pretty date somehow today..)
2007-02-15 07:53:04 +00:00
joey f850acc6ad * Patch from Ethan to allow using meta tags to set creation dates of pages. 2007-02-15 05:48:40 +00:00
joey d4c61b7281 * Many changes to make ikiwiki very resistant to write failures
including out of disk space situations. ikiwiki should never leave
  truncated files, and if the error occurs during a web-based file edit,
  the user will be given an opportunity to retry.
  Inspired by the many ways Moin Moin destroys itself when out of disk. :-)
* Fix syslogging of errors.
2007-02-15 02:22:08 +00:00
joey 96125d8da5 * Allow multiple tag settings to appear in a single page. 2007-02-14 04:05:08 +00:00
joey 6fc66f83de * Fix the template, toggle, and conditional plugins to filter text before
preprocessing it.
* Fix smiley plugin to support smileys at the very beginning or end of
  the content.
2007-02-14 00:11:19 +00:00
joey 88e8f08c8f * Make the basewiki be full of symlinks to pages that should be the same
in the doc wiki. This will allow direct edits to alter the base wiki
  without manual munging.
2007-02-13 23:10:45 +00:00
joey 87ecd8bcda * Updated Spanish translation. 2007-02-12 18:50:41 +00:00
joey 479c7a1ea6 * Allow plugins to add new types of tests that can be used in PageSpecs.
* Add a "conditional" plugin, which allows displaying text if a condition
  is true. It is enabled by default so conditional can be used in the
  basewiki.
* Use conditionals in the template for plugins, so that plugin pages
  say if they're currently enabled or not, and in various other places
  in the wiki.
2007-02-12 02:44:47 +00:00
joey 9729c20898 releasing version 1.42 2007-02-10 20:38:50 +00:00
joey 29e6ff03b0 * Fix a security hole that allowed a web user to edit images and other
non-page format files in the wiki. To exploit this, the file already had
  to exist in the wiki, and the web user would need to somehow use the web
  based editor to replace it with malicious content.
  (Sorry Josh, this means you can't edit style.css directly anymore,
  although I do appreciate your fixes, actually..)
2007-02-10 20:37:36 +00:00
joey ace6a60b1b * viewcvs is now viewvc (in Debian unstable), update everything to use the
new name.
2007-02-09 05:34:40 +00:00
joey 7b6063c6dd typo 2007-02-08 21:24:43 +00:00
joey 56f8e6344c * Drop the BSD license for the templates and basewiki, and just allow them
to be used as close to public domain as possible.
2007-02-08 21:19:21 +00:00
joey 1eb59c4760 * Add "reverse" option to inline to invert sort orders. 2007-02-08 19:48:00 +00:00
joey f442856769 improve 2007-02-07 00:49:05 +00:00
joey 58141a0ebc * Patch based on a patch from Ethan to support relative matching in
PageSpecs, by using "./". pagespec_match() has grown a new third parameter
  to support this.
2007-02-06 21:17:25 +00:00
joey 46f0f5bdc2 * Add feedshow option to allow reducing the number of items included in
an rss or atom feed.
2007-02-05 21:54:36 +00:00
joey 97aea86162 code checking for locked pages into a new "lockedit" plugin. Both are
* Avoid using lots of memory when copying large non-html files.
  Yes, you can keep videos in the wiki..
2007-02-03 03:27:33 +00:00
joey 5f162cfd34 * Add canedit hook, allowing arbitrary controls over when a page can be
edited.
* Move code forcing signing before edit to a new "signinedit" plugin, and
  code checking for locked pages into a new "lockedit" plugin. Both are 
  enabled by default.
* Remove the anonok config setting. This is now implemented by a new
  "anonok" plugin. Anyone with a wiki allowing anonymous edits should
  change their configs to enable this new plugin.
* Add an opendiscussion plugin that allows anonymous users to edit
  discussion pages, on a wiki that is otherwise wouldn't allow it.
* Lots of CGI code reorg and cleanup.
2007-02-02 02:33:03 +00:00
joey d67c4817aa * Fix several more missing translations of Discussion. 2007-01-31 07:18:06 +00:00
joey 344ab0a16b * Fix for missing backlinks() in pagestats plugin. 2007-01-31 07:13:51 +00:00
joey 2dc010d66a * Fix one more missing translation of Discussion. 2007-01-31 07:10:11 +00:00
joey 2605d49d84 tighten gettext versioning 2007-01-31 07:05:21 +00:00
joey b61df3d54d releasing version 1.41 2007-01-30 07:37:44 +00:00
joey 64ca9a921a * Fix openid signin secret generation code. This fixes the bug that made
all openid signins fail the first time, and then succeed the second
  time.
2007-01-30 07:21:06 +00:00
joey ab71299293 * More gettext fun. 2007-01-28 02:24:43 +00:00
joey 9904d10ed9 * When building the doc wiki, build with LANG=C. 2007-01-28 01:53:26 +00:00
joey 5a128f3d63 * Replace underscores in shortcut texts with spaces when formatting for
display. This allows using a shortcut like [[wikipedia War_of_1812]],
  which links to the correct remote page, but is displayed nicely.
2007-01-28 01:01:33 +00:00
joey 4ff60ef1c5 * Always call rcs_update after a commit during a web edit, to work around
the problem described in bugs/svn_fails_to_update. Thanks to Ethan for the
  analysis and patch.
2007-01-28 00:26:55 +00:00
joey c566e16d9e * Improve use of svn merge, by specifying the file to merge, rather than
chdiring to the srcdir (which wasn't right when merging in a subdir).
  Thanks Ethan.
2007-01-28 00:06:01 +00:00
joey 8c5350bcf8 * French translation update. Closes: #408593 2007-01-27 23:57:08 +00:00
joey 72dbbe3a2c * Make gitorigin_branch and gitmaster_branch configurable via the setup
file. Closes: #408599
2007-01-27 23:56:17 +00:00
joey f6e917fcce * Fix handling of discussion links on discussion pages when l10n is used. 2007-01-18 15:06:57 +00:00
joey d8c3baf7a3 * Added smileys for Moin Moin compatability. 2007-01-18 14:46:51 +00:00
joey 04cde27a0e * Gettext 1.04 or up is needed for the OO interface that ikiwiki needs,
if an older version is installed, just don't gettext strings, instead of
  crashing.
2007-01-16 03:37:39 +00:00
joey d2805a5de8 releasing version 1.40 2007-01-15 02:43:30 +00:00
joey fa8bbbb0b3 * Fix bogus use of CDATA in atom feeds. Closes: #406898 2007-01-14 22:56:42 +00:00
joey b56e98cbe3 * Add French translation by Jean-Luc Coulon. Closes: #406881 2007-01-14 20:45:10 +00:00
joey e1c0576029 * Fix missing categories in rss/atom feeds. 2007-01-14 20:14:36 +00:00
joey 20fd72e221 releasing version 1.39 2007-01-14 05:25:25 +00:00
joey c4b1712212 * Change the RecentChanges page to show the path of changed pages. 2007-01-14 04:30:53 +00:00
joey 5608aa078e * In the aggregator, check for and deal with post filenames that are
longer than the maximum file length.
2007-01-14 04:17:53 +00:00
joey b695d6bdec add translation 2007-01-14 04:01:35 +00:00
joey 8c8ce06a1b * Search in default location for templates as a fallback when templatedir is
pointed elsewhere, so that only modified templates need to be copied into
  a templatedir. Based on work by JeremyReed.
2007-01-12 20:48:19 +00:00
joey 389f23a60b * Add a Gujarati translation by Kartik Mistry. Closes: #406635 2007-01-12 19:58:44 +00:00
joey 6601637493 * Add a Bulgarian translation by Damyan Ivanov. Closes: #406580 2007-01-12 00:00:21 +00:00
joey 92e26031ee * Fix encoding issue with use of Locale::Gettext. Seems that the OO
interface returns proper utf-8 decoded strings, unlike the traditional
  interface, so use the OO interface.
2007-01-11 23:29:22 +00:00
joey bd94e24566 * Add a Czech translation by Miroslav Kure. 2007-01-11 23:27:43 +00:00
joey 1702ef1c39 * Add a Swedish translation by Daniel Nylander. Closes: #406410 2007-01-11 03:24:57 +00:00
joey d1636b6323 * Include the pot file in the source tarball. Closes: #405890 2007-01-10 20:33:19 +00:00
joey b31dc8d994 * Fix --locale to control LC_ALL now. 2007-01-10 20:25:00 +00:00
joey 3f3f3e46ad * Add a rawhtml plugin that allows copying raw html files from the srcdir. 2007-01-08 21:00:18 +00:00
joey c7c546948a releasing version 1.38 2007-01-06 04:23:52 +00:00
joey 7bc7eb106e * Added a Polish translation by Paweł Tęcza. 2007-01-05 18:15:11 +00:00
joey 3b5f0e6ce9 * Added a Spanish translation by Victor Moral.
* A few translation infrastructure fixes.
2007-01-03 20:01:36 +00:00
joey e5348d2d70 * Corrected a bum regexp in openid munging. 2007-01-03 05:33:50 +00:00
joey c8787a2793 releasing version 1.37 2006-12-31 22:32:34 +00:00
joey ea266ea22f fixes 2006-12-31 20:56:35 +00:00
joey c494e2f974 * Escape shashes in page titles entered in the blog post form.
* Munge openids of the form somehost.com/user (trial, may revert)
2006-12-31 20:50:22 +00:00
joey f62d23f008 * If a userdir is configured, links to pages in it can be made without
specifying the path. This allows for easy signing of comments by linking
  to your page in the userdir.
2006-12-29 05:33:20 +00:00
joey 7819f34a50 * Add a textile format plugin contributed by mazirian. 2006-12-29 05:18:39 +00:00
joey b5e2afa943 * Allow disabling of plugins included in goodstuff. 2006-12-29 04:49:55 +00:00
joey 178ab4c51c * Don't put discussion links on discussion pages. 2006-12-29 04:45:09 +00:00
joey 912521ef07 * Initial work on internationalization of the program code. po/ikiwiki.pot
is available for translation.
* Export gettext() from IkiWiki module.
2006-12-29 04:38:40 +00:00
joey 8323bc5214 * Improve code that ignores files in the underlaydir if the srcdir has a
file building the same page. Now it will work even if the extensions of
  the source files differ.
2006-12-28 22:15:38 +00:00
joey ad4578ea5a test3 2006-12-24 06:09:13 +00:00
joey a87dcb0faa test2 2006-12-24 06:02:14 +00:00
joey adbbaaebe2 test 2006-12-24 06:01:38 +00:00
joey 65ddd9ee21 update 2006-12-24 05:52:51 +00:00
joey 8199187870 update 2006-12-24 05:49:43 +00:00
joey 56c5b85fd0 update 2006-12-24 05:48:15 +00:00
joey f16ddc4caa update 2006-12-24 05:47:07 +00:00
joey 0e847c08a5 update 2006-12-24 05:45:56 +00:00
joey 8216924629 update 2006-12-24 05:45:01 +00:00
joey 5be3971934 update 2006-12-24 05:43:52 +00:00