Commit Graph

6515 Commits (78155454a4d46c085e50937bda58bc4e2d40a648)

Author SHA1 Message Date
intrigeri ee166d1b6d fixes confirmed 2008-10-20 08:53:36 -04:00
intrigeri fadb26bc15 Merge commit 'origin/master' into prv/po 2008-10-20 14:33:19 +02:00
intrigeri 654adc105e po plugin: todo++
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-20 14:30:22 +02:00
tschwinge 4a958e0c1e My thoughts. 2008-10-20 04:58:04 -04:00
Joey Hess 423fae6f18 Use the pure perl Data::Dumper when generating setup files to ensure that utf-8 characters are written out as such, and not as the encoded perl strings the C Data::Dumper produces.
Note that the text produced by the C version was interpreted fine
when ikiwiki loaded the setup file. But it was not user-friendly.
2008-10-19 21:23:48 -04:00
Joey Hess 3e992b758b Fix issue with utf-8 in wikiname breaking session cookies, by entity-encoding the wikiname in the session cookie. 2008-10-19 21:07:12 -04:00
Joey Hess fd9393ef85 add displaytime hook
Need to use a hook because an exported function cannot be reliably
overridden. The replacement verstion was actually only affecting plugins
loaded after it.

formattime doesn't need a hook, since there's no reason to export it.
2008-10-19 20:12:37 -04:00
Joey Hess 3bdc66d300 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2008-10-19 19:55:28 -04:00
intrigeri 991c1b096b some more example bugfixes 2008-10-19 19:48:14 -04:00
intrigeri 3d8a6fa447 fix example 2008-10-19 19:47:19 -04:00
Joey Hess 3f8eb12b5f response 2008-10-19 19:28:25 -04:00
Joey Hess e4e89b8c61 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2008-10-19 19:27:15 -04:00
Joey Hess 2b569f99d9 fix relativedate timezone inclusion
The machine parseable date needs to include a timezone.

Also, simplified the interface for date display.
2008-10-19 19:21:44 -04:00
http://xma.myopenid.com/ d8e653e684 Webserver, why ? 2008-10-19 19:20:19 -04:00
intrigeri 214d73775f initial wishlist submission 2008-10-19 19:19:24 -04:00
intrigeri ac8e8f5ad7 one more opinion 2008-10-19 18:55:05 -04:00
intrigeri 9f7298d4fe linked to rcs/git to be in the backlinks 2008-10-19 18:45:38 -04:00
intrigeri cf84dc5d2b initial tip submission 2008-10-19 18:33:59 -04:00
intrigeri e32c6e4725 initial bug report 2008-10-19 18:19:14 -04:00
intrigeri b637f7f700 initial bug report 2008-10-19 18:13:47 -04:00
tschwinge 3670fe9a4f Correct copy&paste-o. 2008-10-19 12:14:08 -04:00
intrigeri 8211910566 po plugin: set every configuration item to unsafe
We will check later which ones are actually safe enough for websetup.

Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-19 17:19:42 +02:00
JoshTriplett 9fc7edeee5 Add links to the moin2iki code. 2008-10-18 20:05:37 -04:00
JoshTriplett a09a0087cc 2008-10-18 20:02:58 -04:00
JoshTriplett db0f771bc4 Update my contact info. 2008-10-18 20:02:28 -04:00
Joey Hess 3f922abff4 remove old dup div 2008-10-18 19:11:57 -04:00
intrigeri b4316fd941 po plugin: doc fix
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-19 00:15:44 +02:00
intrigeri f096a9d798 po plugin: added ISTRANSLATION and ISTRANSLATABLE template variables
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-19 00:05:13 +02:00
intrigeri 72dc1a5f02 po plugin: todo++
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-19 00:04:35 +02:00
http://jblevins.org/ c1a2df4fc1 Tracking some issues on my user page 2008-10-18 16:53:28 -04:00
http://jblevins.org/ e49a745fdd Unclosed div 2008-10-18 15:36:18 -04:00
intrigeri a0deb3038c po plugin: do not allow msgmerge to create backup files
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 19:18:22 +02:00
intrigeri d0c4d5061d po plugin: todo++
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:13 +02:00
intrigeri 7b7865150f po plugin: add correct dependencies on pages using OTHERLANGUAGES
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:13 +02:00
intrigeri 93b316f7c1 po plugin: todo++
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:13 +02:00
intrigeri 1d76762517 po plugin: initial implementation of automatic POT/PO update
The updated or created PO files are put under version control.

Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:12 +02:00
intrigeri c852203be8 po plugin: todo++ more security checks needed
... when creating new files.

Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:12 +02:00
intrigeri 58c77a01f7 po plugin: create missing POT/PO files in needsbuild hook
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:12 +02:00
intrigeri f42cf38076 po plugin: documentation work
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:12 +02:00
intrigeri 6add615928 po plugin: added and documented PERCENTTRANSLATED template variable
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:12 +02:00
intrigeri 1a670d3aca po plugin: make translation percentage available in OTHERLANGUAGES loop
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:12 +02:00
intrigeri d8c2800674 po plugin: documented custom PageSpec tests, reorganized doc a bit
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:12 +02:00
intrigeri 6f858cd59f po plugin: todo update wrt. newly translatable pages
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:11 +02:00
intrigeri d07c6b707d po plugin: todo++ : security note about system()
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:11 +02:00
intrigeri 27bfe18f51 po plugin: updated todo wrt. automatic POT/PO update/creation
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:11 +02:00
intrigeri d4f787ef52 po plugin: make any slave page dependent on the corresponding master page
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:11 +02:00
intrigeri 9332457e6c po plugin: todo++: create POT/PO when the plugin is enabled
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:11 +02:00
intrigeri 37222492a5 po plugin: updated doc to reflect current status of automatic PO files update
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:11 +02:00
intrigeri a28559798a po plugin: created OTHERLANGUAGES template loop
It currently only provides basic translations/master pages links.
Updated documentation accordingly.

Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:10 +02:00
intrigeri 32cc0b336a po plugin: po_slave_languages is a hash, rather than a hash of hashes
The latter seems to be unsupported by ikiwiki config system.

Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:10 +02:00
intrigeri d39f69da7f po plugin: fix formatting in documentation
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:10 +02:00
intrigeri ae827a43f8 po plugin: build %translations at scan time
... so that we can consider it as complete at preprocess time

Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:10 +02:00
intrigeri 458ccebdd3 po plugin: added *.pot to wiki_file_prune_regexps
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:10 +02:00
intrigeri e163b037bf po plugin: move translatable pages to setup file, refactor
Replaced [[!translatable]] directive with po_translatable_pages setting.

Moved istranslatable/istranslation code to helper functions leaving place for
future caching and/or memoization. The PageSpec functions still work.

Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:10 +02:00
intrigeri 886f35153b po plugin: added note about not publishing .pot files
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:09 +02:00
intrigeri b852b0655c po plugin: added todo note about optimization
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:09 +02:00
intrigeri 23dccccdf2 po plugin: update doc (move finished item from todo)
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:09 +02:00
intrigeri 79d6f52d30 po plugin: implemented po_link_to=current
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:09 +02:00
intrigeri fdc7974b2a po plugin: implemented po_link_to=negotiated
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:09 +02:00
intrigeri 9c25f5cfe9 po plugin: rewrite internal linking specification
(not implemented yet)

Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:09 +02:00
intrigeri 39d44d443d rename urlpath hook into tweakurlpath for consistency's sake
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:08 +02:00
intrigeri e51089e11f added the tweakbestlink hook
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:08 +02:00
intrigeri cc4736d9ee po plugin: clearer file naming specs
i.e. clarify that master pages do not have to obey a special naming convention,
so that migration from/to this plugin is smooth

Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:08 +02:00
intrigeri 24726f2836 po plugin: add one more pagespec function to the specification
(not implemented yet)

Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:08 +02:00
intrigeri a926f9840e po plugin: linking behavior specification
(no implementation yet)

Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:08 +02:00
intrigeri d9b9022c13 added hook urlpath
This hook can be used to modify the internal urls generated by ikiwiki.

Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:08 +02:00
intrigeri bd50ba3e83 po plugin: switch to page.LL.html naming convention
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:08 +02:00
intrigeri 968106cc80 po plugin: enhance documentation
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:07 +02:00
intrigeri 45d08022bb po plugin: name rendered master pages like slave ones (page.html.LL)
Apache's content negotiation transparently redirects any old URL (page.html) to
the new one, depending on the client preferred language (i.e. a German browser
will be fed with page.html.de). Transition to this naming convention is then
really smooth.

This naming convention allows one to deliberately display the master page, even
if her browser is configured for another language.

Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:07 +02:00
intrigeri fae57e807a po plugin: initial documentation, along with huge TODO list
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:07 +02:00
intrigeri fc299df955 added the targetpage hook
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:07 +02:00
intrigeri 219cb94841 Revert "fix"
This reverts commit 40757bfa154d816f0843af468c9085d5b041c95b.
2008-10-18 15:49:07 +02:00
intrigeri dd6a94b186 fix 2008-10-18 15:49:07 +02:00
http://hendry.iki.fi/ 943a4ff520 google plugin linked 2008-10-18 09:21:24 -04:00
http://xma.myopenid.com/ 15c6997979 2008-10-18 07:10:10 -04:00
Joey Hess 594243d615 update 2008-10-17 21:59:27 -04:00
Joey Hess 35c56622ea tweak recentchanges permalink code
Need to handle the case where url is not set.
2008-10-17 21:54:42 -04:00
Joey Hess ef4b9b5420 response 2008-10-17 21:16:27 -04:00
Joey Hess 1a86717284 response 2008-10-17 21:02:12 -04:00
Joey Hess 7390a7a072 relativedate: New javascript-alicious plugin that makes all dates display relative, in a very nice way, if I say so myself. 2008-10-17 20:47:32 -04:00
Joey Hess 9a62836d28 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2008-10-17 20:28:24 -04:00
Joey Hess 79b376f991 Add an underlay for javascript, and add ikiwiki.js containing some utility code.
* Add an underlay for javascript, and add ikiwiki.js containing some utility
  code.
* toggle: Stop embedding the full toggle code on each page using it, and
  move it to toggle.js in the javascript underlay.
2008-10-17 20:28:18 -04:00
http://jblevins.org/ 3690864e2b Patch for anchor-based change permalinks in recent changes feed 2008-10-17 19:52:42 -04:00
http://xma.myopenid.com/ b08feb5e08 2008-10-17 18:34:28 -04:00
http://xma.myopenid.com/ 84a77567c0 2008-10-17 18:30:03 -04:00
Joey Hess 578a487353 add news item for ikiwiki 2.67 2008-10-17 13:18:04 -04:00
http://alcopop.org/me/openid/ 37a0fbebd4 2008-10-17 11:00:37 -04:00
PaulePanter 5327fee1b2 response 2008-10-17 08:33:48 -04:00
pesco c2a55bd735 darcs rcs_add fixed. 2008-10-16 16:20:08 -04:00
http://xma.myopenid.com/ 75f1dbacbd That's good news for me then ! Thank you. 2008-10-16 14:56:28 -04:00
Joey Hess 798a601395 response 2008-10-16 14:00:35 -04:00
Joey Hess a16724ce5e response 2008-10-16 13:59:44 -04:00
Joey Hess ee41aedb10 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2008-10-16 12:53:33 -04:00
http://xma.myopenid.com/ fe4d7a6d3a creating Darcs as the RCS ? 2008-10-16 09:45:49 -04:00
http://xma.myopenid.com/ 620770f07f Testing [[ikiwiki]] formatting rules 2008-10-16 09:27:20 -04:00
http://alcopop.org/me/openid/ ece5c0ea8a Bundle::IkiWiki? 2008-10-16 07:51:04 -04:00
http://xma.myopenid.com/ f2b00bd81b Update 2008-10-16 05:14:58 -04:00
http://xma.myopenid.com/ 3b2079fd5e New page 2008-10-16 05:12:37 -04:00
http://xma.myopenid.com/ 20404d7f59 Added my website (warning: not polished at all) 2008-10-16 05:03:15 -04:00
Joey Hess 0517f9126c close 2008-10-15 23:50:20 -04:00
Joey Hess 2995ce6f2c thought 2008-10-15 23:48:58 -04:00
Joey Hess 995d91675e rm 2008-10-15 23:47:12 -04:00
neale 594df81c54 Joey's right, that's good enough. 2008-10-15 23:14:31 -04:00
neale c2bff24c65 Oh well. 2008-10-15 23:13:40 -04:00
neale 0543e59eca ahh 2008-10-15 23:12:25 -04:00
neale 9ae956e829 2008-10-15 22:30:36 -04:00
neale a1390e03f9 2008-10-15 22:29:40 -04:00
neale 0414c629b6 2008-10-15 22:29:29 -04:00
neale 9cd1ddce79 2008-10-15 22:28:42 -04:00
Joey Hess 20e691fe20 response 2008-10-15 19:36:35 -04:00
Joey Hess 020eb6f294 response 2008-10-15 19:32:39 -04:00
Joey Hess 62201f83ed response 2008-10-15 19:23:53 -04:00
Joey Hess 2a0cb4e9b1 response 2008-10-15 19:16:27 -04:00
Joey Hess 063cacce39 response 2008-10-15 19:12:59 -04:00
neale 9ae8774540 2008-10-15 17:58:14 -04:00
PaulePanter b7f09741f5 New post. 2008-10-15 16:27:53 -04:00
Joey Hess f2d43e4a0c response 2008-10-14 15:03:38 -04:00
Joey Hess 559c0707ae response 2008-10-14 15:02:12 -04:00
Joey Hess c39112e6ef inline: Allow MTIME to be used in inlinepage.tmpl. 2008-10-14 15:00:46 -04:00
jsilence fe2ba07428 Only a simple test 2008-10-14 04:04:33 -04:00
http://per.bothner.myopenid.com/ a75a0dd1dc Suggested patch. 2008-10-12 16:31:24 -04:00
http://per.bothner.myopenid.com/ de805e0f39 2008-10-12 16:16:06 -04:00
pesco 4d368e17c7 update on state of the darcs plugin 2008-10-11 11:53:25 -04:00
http://yag.myopenid.com/ 7ac2b6a6ca 2008-10-11 10:43:01 -04:00
PaulePanter 07d4868e57 fix entry 2008-10-11 10:29:52 -04:00
Joey Hess cd305909d3 document google plugin 2008-10-10 17:13:33 -04:00
http://alcopop.org/me/openid/ 61b37a3d73 ukuug talk 2008-10-10 08:57:36 -04:00
http://alcopop.org/me/openid/ c35f3baffc update homepage 2008-10-10 08:55:41 -04:00
http://alcopop.org/me/openid/ 9a80c66c70 +myself 2008-10-10 08:54:29 -04:00
bremner 3369bbee1c 2008-10-10 01:45:45 -04:00
http://yag.myopenid.com/ 2ff36e631e 2008-10-09 19:33:25 -04:00
Joey Hess debd8636a0 problem fixed 2008-10-09 19:15:39 -04:00
http://yag.myopenid.com/ 484e42fd48 2008-10-09 19:05:12 -04:00
http://yag.myopenid.com/ 8c46ca734a 2008-10-09 18:50:04 -04:00
https://yag.myopenid.com// e3bdea01e7 2008-10-09 17:52:21 -04:00
https://yag.myopenid.com// 1dc7aa1a3e 2008-10-09 17:51:51 -04:00
https://yag.myopenid.com// b888eeb564 2008-10-09 17:51:16 -04:00
https://yag.myopenid.com// 72d93d447c 2008-10-09 17:43:27 -04:00
https://yag.myopenid.com// 954e228ad6 2008-10-09 17:37:24 -04:00
Joey Hess 8c191adf5c tag updates 2008-10-09 16:58:25 -04:00
http://josephturian.blogspot.com/ 4544a3e583 2008-10-09 15:01:09 -04:00
http://josephturian.blogspot.com/ 2666da7cd9 2008-10-09 14:38:56 -04:00
http://josephturian.blogspot.com/ 33d1c8ec3e 2008-10-09 14:37:10 -04:00
http://josephturian.blogspot.com/ feb71d541d 2008-10-09 14:33:58 -04:00
Joey Hess 94cec17155 update 2008-10-08 18:02:03 -04:00
Joey Hess d3ca495e61 lockedit: Support specifying which users (and IP addresses) a page is locked for. This supports most of the ACL type things users have been wanting to be done. Closes: #443346 (It does not control who can read a page, but that's out of scope for ikiwiki.) 2008-10-08 17:47:38 -04:00
Joey Hess 240b58c36c fix name of admin() pagespec test 2008-10-08 17:12:06 -04:00
Joey Hess 6caed59b9c remove page_locking page, move content to plugins/lockedit
Also, removed obsolte para about using the prefs page to configure locked
pages, that interface is obsolete, hidden by default, and the locked_pages
setup file setting is used instead.
2008-10-08 17:09:24 -04:00
bstpierre 5b2b4a28a6 2008-10-07 12:34:52 -04:00
bstpierre cbde407de8 2008-10-07 12:33:25 -04:00
Joey Hess f504df45bc remove post, since this is intended to be an example people copy and use,
it should not get cluttered up
2008-10-06 12:53:55 -04:00
intrigeri 8e2362a499 done, documented workaround 2008-10-06 05:28:53 -04:00
foob 7d36f1000a 2008-10-06 05:16:34 -04:00
foob 8380dfc2c3 2008-10-06 05:15:50 -04:00
lschiere 8747b12b57 2008-10-06 00:32:20 -04:00
Joey Hess e2ae3963d5 add news item for ikiwiki 2.66 2008-10-05 19:25:15 -04:00
Joey Hess ab2cc5040c close 2008-10-02 17:52:20 -04:00
Joey Hess c2c1438e49 tag 2008-10-02 17:49:51 -04:00
Joey Hess dd7cd7e4ac fix tag 2008-10-02 17:43:03 -04:00
Joey Hess 0b89d44233 rename 2008-10-02 17:42:33 -04:00
Joey Hess de23516815 close 2008-10-02 17:40:07 -04:00
Joey Hess 7c07a20b36 done 2008-10-02 17:39:08 -04:00
Joey Hess 6d8cb05ddc tag 2008-10-02 17:38:13 -04:00
Joey Hess 3634d40a38 tag 2008-10-02 17:36:53 -04:00
Joey Hess 3388e1474a tag 2008-10-02 17:35:46 -04:00
Joey Hess 4857ac4585 tag 2008-10-02 17:34:52 -04:00
Joey Hess daa095689a tag 2008-10-02 17:33:55 -04:00
Joey Hess 781957ad91 wishlist 2008-10-02 17:33:25 -04:00
Joey Hess bc259c593f move 2008-10-02 17:32:53 -04:00
Joey Hess c885a0107b this is a wishlist todo item, rename too 2008-10-02 15:12:57 -04:00
Joey Hess c22c010e16 response 2008-10-02 15:11:17 -04:00
Joey Hess 0b1b72b2ee thoughts 2008-10-02 15:01:03 -04:00
Joey Hess a1f4a9c5c9 ping 2008-10-02 14:54:52 -04:00
Joey Hess 6055dd3ef2 close 2008-10-02 14:53:11 -04:00
Joey Hess 605ce02710 move to todo, response 2008-10-02 14:51:21 -04:00
Joey Hess 5c2309ada8 typo 2008-10-02 14:49:40 -04:00
Joey Hess d30a7b1268 fix bug closure 2008-10-02 14:48:35 -04:00
Joey Hess 45a2074071 update 2008-10-01 17:31:21 -04:00
Joey Hess bf386e22f5 inline: Fix handling of rootpage that doesn't exist.
It makes sense to use bestlink to determine which page rootpage refers to,
but if no page matches, just use the raw value.
2008-10-01 17:29:03 -04:00
Joey Hess f2b1a918b0 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2008-10-01 17:24:50 -04:00
Joey Hess 06de9da609 first review 2008-10-01 17:23:46 -04:00
Plareplane 8e77b66aae 2008-10-01 17:01:58 -04:00
Joey Hess f7431af308 add padding between inlined page title and content
Some aggregated contents do not include a span element, so there was zero
padding without this.
2008-10-01 16:49:56 -04:00
Joey Hess 18b1c7f012 Merge branch 'tova' 2008-10-01 15:54:10 -04:00
Joey Hess aba53047af remove external image
The image is no longer on manoj's machine, and this wiki should not
rely on images hosted by third parties.

Manoj, if you'd like to add this image into ikiwiki's docs, we could talk
about that.
2008-10-01 15:34:12 -04:00
Joey Hess 7308f3da5b Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2008-10-01 14:47:49 -04:00
bremner e21b190be2 2008-10-01 08:12:14 -04:00
Joey Hess 85ec27ab58 Merge branch 'master' into tova
Conflicts:

	debian/changelog
2008-09-30 21:04:22 -04:00
Joey Hess 0651e86a4c httpauth: Document that ikiwiki.cgi has to be in a directory subject to authentication. Closes: #500524 2008-09-30 21:03:51 -04:00
tschwinge 335049c5c4 The plugins have been rewritten and now should function properly. 2008-09-30 17:44:47 -04:00
Joey Hess 2bfbad7af4 Merge branch 'master' into tova 2008-09-30 16:35:44 -04:00
Joey Hess 4a2b401fd0 interesting bug 2008-09-30 15:16:45 -04:00
Joey Hess 0ca14589f3 close 2008-09-30 12:58:17 -04:00
bremner 3e600a67f4 mention a demo site for plugin 2008-09-30 10:04:48 -04:00
http://www.cse.unsw.edu.au/~willu/ 7ff6251d7b Response 2008-09-30 02:16:20 -04:00
Joey Hess 2d45a303e2 add newpagefile function 2008-09-29 18:51:16 -04:00
Joey Hess 41d7ccfa79 close todo about this 2008-09-29 18:24:36 -04:00
Joey Hess 0d3878896f Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2008-09-29 18:10:19 -04:00
Joey Hess fa620b1eca more changes for removal of blog page 2008-09-29 17:23:38 -04:00
http://josephturian.blogspot.com/ a44d9d8e12 2008-09-29 16:17:26 -04:00