ikiwiki.git
12 years agoMerge commit 'upstream/master' into prv/po
intrigeri [Sun, 8 Mar 2009 23:32:10 +0000 (00:32 +0100)] 
Merge commit 'upstream/master' into prv/po

12 years agopo: fixed last unaddressed item from Joey's review, please have a look
intrigeri [Sun, 8 Mar 2009 23:30:19 +0000 (00:30 +0100)] 
po: fixed last unaddressed item from Joey's review, please have a look

Signed-off-by: intrigeri <intrigeri@boum.org>
12 years agorevert exposing of %backlinks and $backlinks_calculated
intrigeri [Sun, 8 Mar 2009 23:16:39 +0000 (00:16 +0100)] 
revert exposing of %backlinks and $backlinks_calculated

This change was introduced in 85f865b5d98e0122934d11e3f3eb6703e4f4c620 and
c3af3840a295780e0f32df398f2dc7d34653e75e ; it may be necessary for the meta-po
integration, but the po branch alone is supposed to work without it.

Signed-off-by: intrigeri <intrigeri@boum.org>
12 years agoadd news item for ikiwiki 3.07
Joey Hess [Sun, 8 Mar 2009 23:06:38 +0000 (19:06 -0400)] 
add news item for ikiwiki 3.07

12 years agoreleasing version 3.07
Joey Hess [Sun, 8 Mar 2009 23:05:59 +0000 (19:05 -0400)] 
releasing version 3.07

12 years agoWhen loading a template in scan mode, let preprocess know it only needs to scan.
Joey Hess [Sun, 8 Mar 2009 22:57:47 +0000 (18:57 -0400)] 
When loading a template in scan mode, let preprocess know it only needs to scan.

This makes wikis such as zack's much faster in the scan pass.
In that pass, when a template contains an inline, there is no reason to
process the entire inline and all its pages. I'd forgotten to pass
along the flag to let preprocess() know it was in scan mode, leading to
much unncessary churning.

12 years agoavoid potential infinite loop in smiley expansion
Joey Hess [Sun, 8 Mar 2009 22:46:18 +0000 (18:46 -0400)] 
avoid potential infinite loop in smiley expansion

- In 3.05, ikiwiki began expanding templates in scan mode,
  for annoying, expensive, but ultimatly necessary reasons
  of correctness.
- Smiley processing has a bug: It inserts a span for the smiley,
  and then continues searching forward in the content for more,
  starting at $end_of_smiley+1. Which means it searches for smilies
  in the span too! And if it somehow finds one, we get an infinite loop
  here.
- This bug can, probably, only be tickled if a htmllink to
  show the smiley fails, because the smiley file doesn't exist,
  or because ikiwiki doesn't know about it. In that case,
  a link will be inserted to _create_ the missing page,
  and that link will include the smiley inside the <a></a>.
- When a template is expanded in scan mode, and it contains
  an inline, the sanitize hook is run during scan mode,
  which never happened before. That causes the smiley processor
  to run, before ikiwiki is, necessarily, aware that all
  the smiley files exist (depending on scan order). So
  it inserts creation links for them, and triggers the bug.

I've put in the simple fix of jumping forward past the inserted
span, and it does fix the problem. I will need to look in a bit
more detail into why an inline nested inside a template is
fully expanded during the scan pass -- that really shouldn't
be necessary, and it makes things much slower than they need
to be.

12 years agofix doc, prefix directives have been default for a while
Joey Hess [Sun, 8 Mar 2009 21:07:12 +0000 (17:07 -0400)] 
fix doc, prefix directives have been default for a while

12 years agoconfigure wmd to leave text in markdown
Joey Hess [Sun, 8 Mar 2009 17:11:26 +0000 (13:11 -0400)] 
configure wmd to leave text in markdown

12 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Sun, 8 Mar 2009 16:50:24 +0000 (12:50 -0400)] 
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

Conflicts:
doc/todo/mdwn_preview.mdwn

12 years agopo doc: po4a 0.35 has been released, eventually
intrigeri [Sun, 8 Mar 2009 15:12:43 +0000 (16:12 +0100)] 
po doc: po4a 0.35 has been released, eventually

12 years agodetails
intrigeri [Sun, 8 Mar 2009 15:05:47 +0000 (11:05 -0400)] 
details

12 years agobrought back checkcontent hook full-content compat.
intrigeri [Sun, 8 Mar 2009 15:02:10 +0000 (16:02 +0100)] 
brought back checkcontent hook full-content compat.

This modification was initially done in editpage, in commit
a3726968bc13f19f458c372cbd7cf92ae4c6fce5, but was then lost while merging
upstream/master branch.

Signed-off-by: intrigeri <intrigeri@boum.org>
12 years agoimplemented Joey's solution
intrigeri [Sun, 8 Mar 2009 14:50:48 +0000 (15:50 +0100)] 
implemented Joey's solution

12 years agorename: remove duplicates that hook functions may have added to @torename
intrigeri [Sun, 8 Mar 2009 14:47:50 +0000 (15:47 +0100)] 
rename: remove duplicates that hook functions may have added to @torename

Signed-off-by: intrigeri <intrigeri@boum.org>
12 years agoLicense grant for my code. And note that I'll look at a more advanced version when...
http://www.cse.unsw.edu.au/~willu/ [Sun, 8 Mar 2009 14:39:07 +0000 (10:39 -0400)] 
License grant for my code.  And note that I'll look at a more advanced version when I get time.

12 years agorename: moved subpages addition to a rename hook
intrigeri [Sun, 8 Mar 2009 11:52:49 +0000 (12:52 +0100)] 
rename: moved subpages addition to a rename hook

Signed-off-by: intrigeri <intrigeri@boum.org>
12 years agorename hook: run once per file to be renamed
intrigeri [Sun, 8 Mar 2009 10:44:00 +0000 (11:44 +0100)] 
rename hook: run once per file to be renamed

... as Joey suggested on todo/need_global_renamepage_hook

This hook is applied recursively to returned additional rename
hashes, so that it handles the case where two plugins use the hook:
plugin A would see when plugin B adds a new file to be renamed.

The full set of rename hashes can no longer be changed by hook functions, that
are only allowed to return any additional rename hashes it wants to add.
Rationale: the correct behavior of the recursion would be hard, if not
impossible, to define, if already considered pages were changing on the run.

Signed-off-by: intrigeri <intrigeri@boum.org>
12 years agoMerge commit 'upstream/master' into prv/po
intrigeri [Sun, 8 Mar 2009 08:50:27 +0000 (09:50 +0100)] 
Merge commit 'upstream/master' into prv/po

Conflicts:

IkiWiki/Plugin/editpage.pm
debian/control
debian/copyright
doc/todo/need_global_renamepage_hook.mdwn

Signed-off-by: intrigeri <intrigeri@boum.org>
12 years agobug
Joey Hess [Sun, 8 Mar 2009 00:30:01 +0000 (19:30 -0500)] 
bug

12 years agoanother thought
Joey Hess [Sun, 8 Mar 2009 00:26:46 +0000 (19:26 -0500)] 
another thought

12 years agoremove patch, and more comments
Joey Hess [Sun, 8 Mar 2009 00:23:46 +0000 (19:23 -0500)] 
remove patch, and more comments

12 years agolook for wmd/wmd.js
Joey Hess [Sun, 8 Mar 2009 00:22:27 +0000 (19:22 -0500)] 
look for wmd/wmd.js

This means that the underlay needs to have a wmd/wmd/wmd.js,
which is a trifle weird, but it isolates all the wmd stuff in a
single wmd subdirectory of the built wiki. The wmd/images creating
a toplevel images directory was particularly bad.

12 years agoupdate, add some examples
Joey Hess [Sun, 8 Mar 2009 00:11:34 +0000 (19:11 -0500)] 
update, add some examples

12 years agowmd stuff
Joey Hess [Sat, 7 Mar 2009 23:57:06 +0000 (18:57 -0500)] 
wmd stuff

12 years agomake wmd comment support comment editing (I think)
Joey Hess [Sat, 7 Mar 2009 23:54:26 +0000 (18:54 -0500)] 
make wmd comment support comment editing (I think)

12 years agoforgot to add wmd tag here
Joey Hess [Sat, 7 Mar 2009 23:52:14 +0000 (18:52 -0500)] 
forgot to add wmd tag here

12 years agowmd copyright?
Joey Hess [Sat, 7 Mar 2009 23:45:55 +0000 (18:45 -0500)] 
wmd copyright?

12 years agoquestion
Joey Hess [Sat, 7 Mar 2009 22:48:17 +0000 (17:48 -0500)] 
question

12 years agonote that a wmd plugin has appeared
Joey Hess [Sat, 7 Mar 2009 19:42:16 +0000 (14:42 -0500)] 
note that a wmd plugin has appeared

12 years agopoint at wmd plugin
Joey Hess [Sat, 7 Mar 2009 19:40:49 +0000 (14:40 -0500)] 
point at wmd plugin

12 years agocomments
Joey Hess [Sat, 7 Mar 2009 19:38:48 +0000 (14:38 -0500)] 
comments

12 years agorebuild not needed
Joey Hess [Sat, 7 Mar 2009 19:34:31 +0000 (14:34 -0500)] 
rebuild not needed

This plugin only affects the page edit, not the compiled wiki.

12 years agowmd plugin from willu
Joey Hess [Sat, 7 Mar 2009 19:33:11 +0000 (14:33 -0500)] 
wmd plugin from willu

12 years agoUpdated French translation (Jean-Luc Coulon). Closes: #518510
Joey Hess [Fri, 6 Mar 2009 18:36:44 +0000 (13:36 -0500)] 
Updated French translation (Jean-Luc Coulon). Closes: #518510

12 years agoNote another issue with the basic plugin.
http://www.cse.unsw.edu.au/~willu/ [Fri, 6 Mar 2009 08:47:08 +0000 (03:47 -0500)] 
Note another issue with the basic plugin.

12 years agoAdd patch for WMD plugin. This new plugin adds live preview and text controls to...
http://www.cse.unsw.edu.au/~willu/ [Fri, 6 Mar 2009 08:40:50 +0000 (03:40 -0500)] 
Add patch for WMD plugin.  This new plugin adds live preview and text controls to ikiwiki edit pages.

12 years ago(no commit message)
https://launchpad.net/~jelmer [Thu, 5 Mar 2009 21:16:54 +0000 (16:16 -0500)] 

12 years agoUpdated German translation (Kai Wasserbäch). Closes: #518377
Joey Hess [Thu, 5 Mar 2009 20:44:11 +0000 (15:44 -0500)] 
Updated German translation (Kai Wasserbäch). Closes: #518377

12 years agoNotes that the wikiwyg plugin link is broken, and more.
http://www.cse.unsw.edu.au/~willu/ [Wed, 4 Mar 2009 22:30:11 +0000 (17:30 -0500)] 
Notes that the wikiwyg plugin link is broken, and more.

12 years agoresponse
Joey Hess [Wed, 4 Mar 2009 18:58:20 +0000 (13:58 -0500)] 
response

12 years agothat's wikiwyg
Joey Hess [Wed, 4 Mar 2009 18:53:34 +0000 (13:53 -0500)] 
that's wikiwyg

close as dup todo

12 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Wed, 4 Mar 2009 18:51:55 +0000 (13:51 -0500)] 
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

12 years ago(no commit message)
http://liw.fi/ [Wed, 4 Mar 2009 15:19:09 +0000 (10:19 -0500)] 

12 years agotypo and typography
PaulePanter [Wed, 4 Mar 2009 10:48:18 +0000 (05:48 -0500)] 
typo and typography

12 years ago(no commit message)
http://sarin.myopenid.com/ [Wed, 4 Mar 2009 02:52:36 +0000 (21:52 -0500)] 

12 years agoupdated spanish translation
Víctor Moral [Tue, 3 Mar 2009 09:53:09 +0000 (10:53 +0100)] 
updated spanish translation

12 years ago(no commit message)
http://electropo.mp/ [Mon, 2 Mar 2009 23:39:02 +0000 (18:39 -0500)] 

12 years agoadd news item for ikiwiki 3.06
Joey Hess [Sun, 1 Mar 2009 20:11:40 +0000 (15:11 -0500)] 
add news item for ikiwiki 3.06

12 years agoreleasing version 3.06
Joey Hess [Sun, 1 Mar 2009 20:11:11 +0000 (15:11 -0500)] 
releasing version 3.06

12 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Sun, 1 Mar 2009 20:07:14 +0000 (15:07 -0500)] 
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

12 years agoSetup automator: Fix bug in password comparison. Closes: #517654
Joey Hess [Sun, 1 Mar 2009 20:01:08 +0000 (15:01 -0500)] 
Setup automator: Fix bug in password comparison. Closes: #517654

12 years agoAdding bzed.de to ikiwikiusers
bzed [Sun, 1 Mar 2009 02:34:04 +0000 (21:34 -0500)] 
Adding bzed.de to ikiwikiusers

12 years agoAdd my blog.
http://per.bothner.myopenid.com/ [Sat, 28 Feb 2009 19:16:57 +0000 (14:16 -0500)] 
Add my blog.

12 years ago(no commit message)
http://zwol.livejournal.com/ [Fri, 27 Feb 2009 23:57:48 +0000 (18:57 -0500)] 

12 years ago(no commit message)
http://zwol.livejournal.com/ [Fri, 27 Feb 2009 23:56:25 +0000 (18:56 -0500)] 

12 years agoadd news item for ikiwiki 3.05
Joey Hess [Fri, 27 Feb 2009 20:55:34 +0000 (15:55 -0500)] 
add news item for ikiwiki 3.05

12 years agoreleasing version 3.05
Joey Hess [Fri, 27 Feb 2009 20:54:52 +0000 (15:54 -0500)] 
releasing version 3.05

12 years agolintian fixes
Joey Hess [Fri, 27 Feb 2009 20:40:42 +0000 (15:40 -0500)] 
lintian fixes

12 years agofix clean on clean tree
Joey Hess [Fri, 27 Feb 2009 20:35:40 +0000 (15:35 -0500)] 
fix clean on clean tree

12 years agolower debhelper build-dep
Joey Hess [Fri, 27 Feb 2009 20:33:50 +0000 (15:33 -0500)] 
lower debhelper build-dep

debhelper 7.0.50 will support everything needed, and will
be backported to stable

12 years agogoto: Fix typo that broke recentchanges_link compatability.
Joey Hess [Fri, 27 Feb 2009 18:21:29 +0000 (13:21 -0500)] 
goto: Fix typo that broke recentchanges_link compatability.

12 years agomercurial and tla are missing implementations of several things
Joey Hess [Thu, 26 Feb 2009 19:16:13 +0000 (14:16 -0500)] 
mercurial and tla are missing implementations of several things

12 years agobzr: Add missing rcs_diff. (liw)
Joey Hess [Thu, 26 Feb 2009 19:09:26 +0000 (14:09 -0500)] 
bzr: Add missing rcs_diff. (liw)

12 years ago(no commit message)
http://liw.fi/ [Thu, 26 Feb 2009 08:07:29 +0000 (03:07 -0500)] 

12 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Thu, 26 Feb 2009 07:31:24 +0000 (02:31 -0500)] 
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

12 years agocomments: Avoid showing comment moderation button in prefs to non-admins.
Joey Hess [Thu, 26 Feb 2009 07:31:13 +0000 (02:31 -0500)] 
comments: Avoid showing comment moderation button in prefs to non-admins.

12 years ago(no commit message)
http://liw.fi/ [Thu, 26 Feb 2009 07:10:15 +0000 (02:10 -0500)] 

12 years agodetect sslcookie set and no https
Joey Hess [Thu, 26 Feb 2009 06:59:05 +0000 (01:59 -0500)] 
detect sslcookie set and no https

This is likely a misconfiguration and can cause login to fail as the
browser refuses the send the session cookie back over http.

Not entirely happy with putting the check where I did, since users have to
try to log in, and fail, to see the misconfiguration explained. But I could
not find a better place to put the check.

12 years agoresponse
Joey Hess [Wed, 25 Feb 2009 22:15:25 +0000 (17:15 -0500)] 
response

12 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Wed, 25 Feb 2009 21:56:40 +0000 (16:56 -0500)] 
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

12 years agobzr: Add missing stub rcs_diff.
Joey Hess [Wed, 25 Feb 2009 21:56:02 +0000 (16:56 -0500)] 
bzr: Add missing stub rcs_diff.

12 years ago(no commit message)
http://liw.fi/ [Wed, 25 Feb 2009 12:19:39 +0000 (07:19 -0500)] 

12 years agoSetup automator: Prompt for password twice. Closes: #516973
Joey Hess [Tue, 24 Feb 2009 21:30:39 +0000 (16:30 -0500)] 
Setup automator: Prompt for password twice. Closes: #516973

12 years ago(no commit message)
http://ypoocs.livejournal.com/ [Mon, 23 Feb 2009 20:36:44 +0000 (15:36 -0500)] 

12 years agoUpdated German translation (Kai Wasserbäch). Closes: #516770
Joey Hess [Mon, 23 Feb 2009 18:44:32 +0000 (13:44 -0500)] 
Updated German translation (Kai Wasserbäch). Closes: #516770

12 years agolink to other todo item, personal opinions
intrigeri [Mon, 23 Feb 2009 12:02:34 +0000 (07:02 -0500)] 
link to other todo item, personal opinions

12 years agoSome more thoughts on this...
http://smcv.pseudorandom.co.uk/ [Fri, 20 Feb 2009 16:05:05 +0000 (11:05 -0500)] 
Some more thoughts on this...

12 years agoLink my version
http://smcv.pseudorandom.co.uk/ [Fri, 20 Feb 2009 15:25:47 +0000 (10:25 -0500)] 
Link my version

12 years agoFix wikilink to correct todo page
http://taozhyn.myopenid.com/ [Fri, 20 Feb 2009 10:05:57 +0000 (05:05 -0500)] 
Fix wikilink to correct todo page

12 years agoMoved to patch to todo/auto-create
http://taozhyn.myopenid.com/ [Fri, 20 Feb 2009 10:00:42 +0000 (05:00 -0500)] 
Moved to patch to todo/auto-create

12 years agoAdding patch, moved from plugins/tag/discussion
http://taozhyn.myopenid.com/ [Fri, 20 Feb 2009 09:58:52 +0000 (04:58 -0500)] 
Adding patch, moved from plugins/tag/discussion

12 years agoadded cosin
http://people.ee.ethz.ch/~andrmuel/openid/ [Fri, 20 Feb 2009 07:44:01 +0000 (02:44 -0500)] 
added cosin

12 years agocomments
Joey Hess [Thu, 19 Feb 2009 23:58:46 +0000 (18:58 -0500)] 
comments

12 years agorename tag() to tagged(); add docs
Joey Hess [Thu, 19 Feb 2009 23:54:25 +0000 (18:54 -0500)] 
rename tag() to tagged(); add docs

12 years agoadd tag() pagespec
Joey Hess [Thu, 19 Feb 2009 23:49:30 +0000 (18:49 -0500)] 
add tag() pagespec

patch from jon

12 years agoAdd noextension parameter to htmlize hooks to support, eg, Makefile.
Joey Hess [Thu, 19 Feb 2009 23:38:45 +0000 (18:38 -0500)] 
Add noextension parameter to htmlize hooks to support, eg, Makefile.

12 years agoadd keepextension tests
Joey Hess [Thu, 19 Feb 2009 23:31:57 +0000 (18:31 -0500)] 
add keepextension tests

12 years agofix pagename, pagetype tests
Joey Hess [Thu, 19 Feb 2009 23:28:43 +0000 (18:28 -0500)] 
fix pagename, pagetype tests

Put tests in right file.

Set internal variable to hash, the functions expect that.

12 years agofix pagetype test
Joey Hess [Thu, 19 Feb 2009 23:22:51 +0000 (18:22 -0500)] 
fix pagetype test

File had wrong name, and made wrong assumption about what pagetype does for
bare files.

12 years agoresponse
Joey Hess [Thu, 19 Feb 2009 22:50:43 +0000 (17:50 -0500)] 
response

12 years agoYes, the patch is complete.
http://www.cse.unsw.edu.au/~willu/ [Thu, 19 Feb 2009 11:45:40 +0000 (06:45 -0500)] 
Yes, the patch is complete.

12 years ago(no commit message)
http://josephturian.blogspot.com/ [Wed, 18 Feb 2009 23:24:21 +0000 (18:24 -0500)] 

12 years agoformatting
Joey Hess [Wed, 18 Feb 2009 03:51:03 +0000 (22:51 -0500)] 
formatting

12 years agois this patch complete?
Joey Hess [Wed, 18 Feb 2009 03:37:20 +0000 (22:37 -0500)] 
is this patch complete?

12 years agoresponse
Joey Hess [Wed, 18 Feb 2009 03:26:33 +0000 (22:26 -0500)] 
response

12 years agomove to forum, as this is a question
Joey Hess [Wed, 18 Feb 2009 03:19:33 +0000 (22:19 -0500)] 
move to forum, as this is a question

12 years agorevert addition of several blank lines
Joey Hess [Wed, 18 Feb 2009 03:17:59 +0000 (22:17 -0500)] 
revert addition of several blank lines

12 years agoadd hendy's git repo
Joey Hess [Wed, 18 Feb 2009 03:16:51 +0000 (22:16 -0500)] 
add hendy's git repo

12 years agohint
Joey Hess [Wed, 18 Feb 2009 03:16:34 +0000 (22:16 -0500)] 
hint