]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/log
git.ikiwiki.info.git
14 years agoRevert "don't need to escape the inline tag if its in pre tag"
Joey Hess [Wed, 23 Jun 2010 17:16:31 +0000 (13:16 -0400)]
Revert "don't need to escape the inline tag if its in pre tag"

This reverts commit 4833f486b6ca759e1bcd8acc19e13ef4a0a6063f.

Being in a pre does not stop an inline directive from working.

14 years agoclarify indexdb is cached info, rebuildable
Joey Hess [Wed, 23 Jun 2010 17:15:10 +0000 (13:15 -0400)]
clarify indexdb is cached info, rebuildable

14 years agothoughts
Joey Hess [Wed, 23 Jun 2010 17:12:43 +0000 (13:12 -0400)]
thoughts

14 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Wed, 23 Jun 2010 17:05:02 +0000 (13:05 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

14 years agoresponse
Joey Hess [Wed, 23 Jun 2010 17:04:56 +0000 (13:04 -0400)]
response

14 years agoAdded a comment: do parameter missing
http://joey.kitenet.net/ [Wed, 23 Jun 2010 17:03:12 +0000 (17:03 +0000)]
Added a comment: do parameter missing

14 years agodespam
Joey Hess [Wed, 23 Jun 2010 16:53:01 +0000 (12:53 -0400)]
despam

"ikiwikiweb" is banned

14 years agoresponse
Joey Hess [Wed, 23 Jun 2010 16:51:50 +0000 (12:51 -0400)]
response

14 years ago(no commit message)
ikiwikiweb [Tue, 22 Jun 2010 20:46:57 +0000 (20:46 +0000)]

14 years agotesting
ikiwikiweb [Tue, 22 Jun 2010 20:45:40 +0000 (20:45 +0000)]
testing

14 years agoping
privat [Tue, 22 Jun 2010 15:10:59 +0000 (15:10 +0000)]
ping

14 years ago(no commit message)
privat [Tue, 22 Jun 2010 13:30:50 +0000 (13:30 +0000)]

14 years agoAdded a comment
jeanm [Sat, 19 Jun 2010 13:35:37 +0000 (13:35 +0000)]
Added a comment

14 years agoWhat license for themes for distribution in ikiwiki?
PaulePanter [Sat, 19 Jun 2010 10:47:30 +0000 (10:47 +0000)]
What license for themes for distribution in ikiwiki?

14 years agoMatch start page `/index` does not work.
PaulePanter [Sat, 19 Jun 2010 10:35:32 +0000 (10:35 +0000)]
Match start page `/index` does not work.

14 years agoTest PageSpec with root page `/index.mdwn`.
PaulePanter [Sat, 19 Jun 2010 10:27:28 +0000 (10:27 +0000)]
Test PageSpec with root page `/index.mdwn`.

14 years agoforgotten signature
bhobbit [Sat, 19 Jun 2010 00:20:50 +0000 (00:20 +0000)]
forgotten signature

14 years agoreply to Joey
bhobbit [Sat, 19 Jun 2010 00:20:01 +0000 (00:20 +0000)]
reply to Joey

14 years agoless tight positioning
Joey Hess [Fri, 18 Jun 2010 22:19:12 +0000 (18:19 -0400)]
less tight positioning

the descenders in the tabs were cut off before

14 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Fri, 18 Jun 2010 22:07:40 +0000 (18:07 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

14 years agosidebar styling and fix actions for inlined pages
Joey Hess [Fri, 18 Jun 2010 22:06:29 +0000 (18:06 -0400)]
sidebar styling and fix actions for inlined pages

Styling the actions for inlined pages as tabs did not work well.
That still needs some work; for now just don't style the actions for
inlined pages.

14 years agoupdate to newer version from svend's blog
Joey Hess [Fri, 18 Jun 2010 22:03:19 +0000 (18:03 -0400)]
update to newer version from svend's blog

14 years agodon't need to escape the inline tag if its in pre tag
http://www.openid.albertlash.com/openid/ [Fri, 18 Jun 2010 20:48:10 +0000 (20:48 +0000)]
don't need to escape the inline tag if its in pre tag

14 years ago(no commit message)
http://www.openid.albertlash.com/openid/ [Fri, 18 Jun 2010 20:47:31 +0000 (20:47 +0000)]

14 years agostore state to avoid needing to rebuild when changing theme
Joey Hess [Fri, 18 Jun 2010 20:40:47 +0000 (16:40 -0400)]
store state to avoid needing to rebuild when changing theme

14 years agoneedsbuild hook is passed an array ref
Joey Hess [Fri, 18 Jun 2010 20:15:57 +0000 (16:15 -0400)]
needsbuild hook is passed an array ref

14 years agotypo
Joey Hess [Fri, 18 Jun 2010 19:06:15 +0000 (15:06 -0400)]
typo

14 years agomention added themes
Joey Hess [Fri, 18 Jun 2010 18:59:45 +0000 (14:59 -0400)]
mention added themes

14 years agorename bzed theme to "blueview"
Joey Hess [Fri, 18 Jun 2010 18:58:36 +0000 (14:58 -0400)]
rename bzed theme to "blueview"

14 years agoalso a problem for theme plugin
Joey Hess [Fri, 18 Jun 2010 18:39:08 +0000 (14:39 -0400)]
also a problem for theme plugin

14 years agoresponse
Joey Hess [Fri, 18 Jun 2010 18:31:24 +0000 (14:31 -0400)]
response

14 years agoresponse
Joey Hess [Fri, 18 Jun 2010 18:24:39 +0000 (14:24 -0400)]
response

14 years agoavoid showing subpages of contrib plugins
Joey Hess [Fri, 18 Jun 2010 16:59:03 +0000 (12:59 -0400)]
avoid showing subpages of contrib plugins

14 years agofix filename
Joey Hess [Fri, 18 Jun 2010 16:57:20 +0000 (12:57 -0400)]
fix filename

14 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Fri, 18 Jun 2010 16:56:57 +0000 (12:56 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

14 years agobugnum
Joey Hess [Fri, 18 Jun 2010 16:52:26 +0000 (12:52 -0400)]
bugnum

14 years agoavoid shelling
Joey Hess [Fri, 18 Jun 2010 16:50:31 +0000 (12:50 -0400)]
avoid shelling

14 years agomercurial: Fix buggy getctime code.
Joey Hess [Fri, 18 Jun 2010 16:48:05 +0000 (12:48 -0400)]
mercurial: Fix buggy getctime code.

The file passed to rcs_getctime is already absolute, and it was
trying to stick the srcdir on the front.

Also, eliminated potentially unsafe shelling.

14 years ago`themes.pm` instead of `themes.mdwn`
PaulePanter [Fri, 18 Jun 2010 09:08:28 +0000 (09:08 +0000)]
`themes.pm` instead of `themes.mdwn`

14 years agoavoid dying if cannot chdir to an underlaydir
Joey Hess [Thu, 17 Jun 2010 20:54:03 +0000 (16:54 -0400)]
avoid dying if cannot chdir to an underlaydir

14 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Thu, 17 Jun 2010 20:52:33 +0000 (16:52 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

14 years agoyeay ! \\o \o/ o//
demo [Thu, 17 Jun 2010 15:00:59 +0000 (15:00 +0000)]
yeay ! \\o \o/ o//

14 years ago(no commit message)
jhagg [Thu, 17 Jun 2010 08:30:38 +0000 (08:30 +0000)]

14 years ago(no commit message)
jeanm [Thu, 17 Jun 2010 06:22:19 +0000 (06:22 +0000)]

14 years agolink to theme plugin
Joey Hess [Wed, 16 Jun 2010 23:23:08 +0000 (19:23 -0400)]
link to theme plugin

14 years agoMerge branch 'themes'
Joey Hess [Wed, 16 Jun 2010 23:17:18 +0000 (19:17 -0400)]
Merge branch 'themes'

14 years agoadd background image, kindly gpl'd by bzed
Joey Hess [Wed, 16 Jun 2010 23:15:57 +0000 (19:15 -0400)]
add background image, kindly gpl'd by bzed

14 years agoforce list context
Joey Hess [Wed, 16 Jun 2010 20:07:41 +0000 (16:07 -0400)]
force list context

run_or_die returns a status code in scalar context

14 years agopreserve timestamps for directive and theme underlays
Joey Hess [Wed, 16 Jun 2010 19:48:50 +0000 (15:48 -0400)]
preserve timestamps for directive and theme underlays

14 years agoforce rebuild for theme change
Joey Hess [Wed, 16 Jun 2010 19:44:21 +0000 (15:44 -0400)]
force rebuild for theme change

For now, a rebuild is the only way to ensure the changed theme is used.
Ikiwiki normally will not realize style.css has changed, since themes
tend to have the same timestamp for the file.

14 years agoadd theme plugin
Joey Hess [Wed, 16 Jun 2010 19:43:42 +0000 (15:43 -0400)]
add theme plugin

14 years agoEncode not used
Joey Hess [Wed, 16 Jun 2010 19:30:33 +0000 (15:30 -0400)]
Encode not used

14 years agocomments
Joey Hess [Wed, 16 Jun 2010 19:03:38 +0000 (15:03 -0400)]
comments

14 years agonot local.css here
Joey Hess [Wed, 16 Jun 2010 19:02:42 +0000 (15:02 -0400)]
not local.css here

14 years agocopy from actiontabs.css in css_market
Joey Hess [Wed, 16 Jun 2010 19:02:14 +0000 (15:02 -0400)]
copy from actiontabs.css in css_market

fixed a few indents

14 years agocopy from bzed
Joey Hess [Wed, 16 Jun 2010 19:00:26 +0000 (15:00 -0400)]
copy from bzed

14 years agotweak bzed's theme
Joey Hess [Wed, 16 Jun 2010 18:55:44 +0000 (14:55 -0400)]
tweak bzed's theme

* move dotted border from bottom inlinecontent to top inlinefooter,
  and allow inlinefooter to clear floating content. This way, floating
  images do not hang down through the dotted border
* don't reset inputs and textareas, it makes buttons in forms
  all squash up together
* don't eliminate fieldsets, it makes the web setup page a
  mess
* only force the size of the search box. ikiwiki generally picks
  form field sizes with a reasonable good reason
* remove some custom css classes not used
* remove some trailing whitespace

14 years agoadd copy of local.css from bzed.de
Joey Hess [Wed, 16 Jun 2010 18:53:47 +0000 (14:53 -0400)]
add copy of local.css from bzed.de

bzed says this is not quite ready, but I'm an impatient guy. Guess
I'll have to track his updates.

14 years agoattachment: Support Windows paths when taking basename of client-supplied file name.
Joey Hess [Wed, 16 Jun 2010 17:23:32 +0000 (13:23 -0400)]
attachment: Support Windows paths when taking basename of client-supplied file name.

14 years ago(no commit message)
jhagg [Wed, 16 Jun 2010 13:40:29 +0000 (13:40 +0000)]

14 years agogit: Gix --gettime to properly support utf8 filenames.
Joey Hess [Wed, 16 Jun 2010 03:21:55 +0000 (23:21 -0400)]
git: Gix --gettime to properly support utf8 filenames.

In passing, fixed a bug where the srcdir was in a subdir of a repository
named "0".

14 years agoMake --gettime be honored after initial setup.
Joey Hess [Wed, 16 Jun 2010 02:56:06 +0000 (22:56 -0400)]
Make --gettime be honored after initial setup.

Bugfix in passing: New files not treated as such when no rcs is used.

14 years agobugnum
Joey Hess [Tue, 15 Jun 2010 23:35:17 +0000 (19:35 -0400)]
bugnum

14 years agofix other cases of unicode mixing issue
Joey Hess [Tue, 15 Jun 2010 21:41:26 +0000 (17:41 -0400)]
fix other cases of unicode mixing issue

and fix underlaydir override attack guard when srcdir is non-absolute

14 years agoFix issues with combining unicode srcdirs and source files.
Joey Hess [Tue, 15 Jun 2010 20:40:37 +0000 (16:40 -0400)]
Fix issues with combining unicode srcdirs and source files.

A short story:

  Once there was a unicode string, let's call him Srcdir.

  Along came a crufy old File::Find, who went through a tree and pasted each
  of the leaves in turn onto Srcdir. But this 90's relic didn't decode the
  leaves -- despite some of them using unicode! Poor Srcdir, with these
  leaves stuck on him, tainted them with his nice unicode-ness. They didn't
  look like leaves at all, but instead garbage.

(In other words, perl's unicode support sucks mightily, and drives
us all to drink and bad storytelling. But we knew that..)

So, srcdir is not normally flagged as unicode, because typically it's pure
ascii. And in that case, things work ok; File::Find finds filenames, which
are not yet decoded to unicode, and appends them to the srcdir, and then
decode_utf8 happily converts the whole thing.

But, if the srcdir does contain utf8 characters, that breaks. Or, if a Yaml
setup file is used, Yaml::Syck's implicitunicode sets the unicode flag of
*all* strings, even those containing only ascii. In either case, srcdir
has the unicode flag set; a non-decoded filename is appended, and the flag
remains set; and decode_utf8 sees the flag and does *nothing*. The result
is that the filename is not decoded, so looks valid and gets skipped.

File::Find only sticks the directory and filenames together in no_chdir
mode .. but we need that mode for security. In order to retain the
security, and avoid the problem, I made it not pass srcdir to File::Find.
Instead, chdir to the srcdir, and pass ".". Since "." is ascii, the problem
is avoided.

Note that chdir srcdir is safe because we check for symlinks in the srcdir
path.

Note that it takes care to chdir back to the starting location. Because
the user may have specified relative paths and so staying in the srcdir
might break. A relative path could even be specifed for an underlay dir, so
it chdirs back after each.

14 years agoFix issues with combining unicode srcdirs and source files.
Joey Hess [Tue, 15 Jun 2010 20:40:37 +0000 (16:40 -0400)]
Fix issues with combining unicode srcdirs and source files.

A short story:

  Once there was a unicode string, let's call him Srcdir.

  Along came a crufy old File::Find, who went through a tree and pasted each
  of the leaves in turn onto Srcdir. But this 90's relic didn't decode the
  leaves -- despite some of them using unicode! Poor Srcdir, with these
  leaves stuck on him, tainted them with his nice unicode-ness. They didn't
  look like leaves at all, but instead garbage.

In other words, perl's unicode support sucks mightily, and drives
us all to drink and bad storytelling. But we knew that..

So, srcdir is not normally flagged as unicode, because typically it's pure
ascii. And in that case, things work ok; File::Find finds filenames, which
are not yet decoded to unicode, and appends them to the srcdir, and then
decode_utf8 happily converts the whole thing.

But, if the srcdir does contain utf8 characters, that breaks. Or, if a Yaml
setup file is used, Yaml::Syck's implicitunicode sets the unicode flag of
*all* strings, even those containing only ascii. In either case, srcdir
has the unicode flag set; a non-decoded filename is appended, and
decode_utf8 sees the flag and does *nothing*. The result is that the
filename is not decoded, so looks valid and gets skipped.

File::Find only sticks the directory and filenames together in no_chdir
mode .. but we need that mode for security. In order to retain the
security, and avoid the problem, I made it not pass srcdir to File::Find.
Instead, chdir to the srcdir, and pass ".". Since "." is ascii, the problem
is avoided.

Note that it takes care to chdir back to the starting location. Because
the user may have specified relative paths and so staying in the srcdir
might break. A relative path could even be specifed for an underlay dir, so
it chdirs back after each.

14 years agonote
Joey Hess [Tue, 15 Jun 2010 19:15:39 +0000 (15:15 -0400)]
note

14 years agomatch only pages in calendar
Joey Hess [Tue, 15 Jun 2010 18:17:23 +0000 (14:17 -0400)]
match only pages in calendar

14 years agoclear floats before comments begin
Joey Hess [Tue, 15 Jun 2010 17:44:42 +0000 (13:44 -0400)]
clear floats before comments begin

14 years agocalendar: Tune archive_pagespec to only match pages, not other files.
Joey Hess [Tue, 15 Jun 2010 17:38:19 +0000 (13:38 -0400)]
calendar: Tune archive_pagespec to only match pages, not other files.

14 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Tue, 15 Jun 2010 17:34:45 +0000 (13:34 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

14 years agofix labels for form elements
Joey Hess [Tue, 15 Jun 2010 17:33:43 +0000 (13:33 -0400)]
fix labels for form elements

The label for attribute must correspond to the element id (not name).
And it needs to be unique inside the loop.

14 years agoThanks
privat [Tue, 15 Jun 2010 13:33:16 +0000 (13:33 +0000)]
Thanks

14 years agotypo
bhobbit [Tue, 15 Jun 2010 03:43:48 +0000 (03:43 +0000)]
typo

14 years ago(no commit message)
bhobbit [Tue, 15 Jun 2010 03:41:34 +0000 (03:41 +0000)]

14 years agofix links
Joey Hess [Mon, 14 Jun 2010 20:36:54 +0000 (16:36 -0400)]
fix links

14 years agoadd links to mentioned directives
Joey Hess [Mon, 14 Jun 2010 20:35:12 +0000 (16:35 -0400)]
add links to mentioned directives

Using the !iki shortcut, since the directive pages may not be included in
the basewiki.

14 years agoeditpage, comments: Fix broken links in sidebar (due to forcebaseurl). (Thanks, privat)
Joey Hess [Mon, 14 Jun 2010 18:34:52 +0000 (14:34 -0400)]
editpage, comments: Fix broken links in sidebar (due to forcebaseurl). (Thanks, privat)

14 years agogood idea
Joey Hess [Mon, 14 Jun 2010 18:14:43 +0000 (14:14 -0400)]
good idea

14 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Mon, 14 Jun 2010 18:11:35 +0000 (14:11 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

14 years agosimplify, avoid confusing suggestions
Joey Hess [Mon, 14 Jun 2010 18:10:59 +0000 (14:10 -0400)]
simplify, avoid confusing suggestions

Don't even talk about ACLs, and more strongly discourage directly
committing to ikiwiki's srcdir.

14 years agolimit blog inlines to pages
Joey Hess [Mon, 14 Jun 2010 16:35:21 +0000 (12:35 -0400)]
limit blog inlines to pages

This way images attached to blog posts don't show up as enclosures in the
blog by default.

14 years agoReopen the bug since it is not fixed
privat [Mon, 14 Jun 2010 13:54:43 +0000 (13:54 +0000)]
Reopen the bug since it is not fixed

14 years agomore symetric enable/disable
Joey Hess [Sun, 13 Jun 2010 14:23:05 +0000 (10:23 -0400)]
more symetric enable/disable

Removing a plugin from add_plugins is not always enough to disable it.
It may have been redundantly added there and also pulled in via goodstuff.
Always add didabled plugins to disable_plugins.

14 years agowebsetup: Allow enabling plugins listed in disable_plugins.
Joey Hess [Sun, 13 Jun 2010 14:21:19 +0000 (10:21 -0400)]
websetup: Allow enabling plugins listed in disable_plugins.

The bug here was that disabling a plugin included thru goodstuff, like
htmlscrubber, caused it to be added to disable_plugins, and those plugins
were never loaded, so could not be re-enabled. Fix by allowing them to be
force loaded when appropriate. (Also that allows disabled plugins to still
record their setup options when dumping a setup file.)

14 years agoresponse
Joey Hess [Sun, 13 Jun 2010 13:11:59 +0000 (09:11 -0400)]
response

14 years agoMerge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Sun, 13 Jun 2010 12:49:32 +0000 (08:49 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

14 years agoremove obsolete ol class=form for editpage and editcomment
Joey Hess [Sun, 13 Jun 2010 12:47:21 +0000 (08:47 -0400)]
remove obsolete ol class=form for editpage and editcomment

The styling of labels on the form largely obsoleted the special styled ol,
so just a few br's sufficed. Using an ol like that was not too semantically
right (probably?) and could cause problems with customized local.css.

14 years ago(no commit message)
http://abhidg.wordpress.com/ [Sun, 13 Jun 2010 12:37:16 +0000 (12:37 +0000)]

14 years agowording
Joey Hess [Sun, 13 Jun 2010 05:21:32 +0000 (01:21 -0400)]
wording

14 years agospeling
Joey Hess [Sun, 13 Jun 2010 05:14:24 +0000 (01:14 -0400)]
speling

14 years agotypo
Joey Hess [Sun, 13 Jun 2010 05:12:04 +0000 (01:12 -0400)]
typo

14 years agoattachment: When inserting links, insert img directives for images, if that plugin...
Joey Hess [Sun, 13 Jun 2010 03:00:30 +0000 (23:00 -0400)]
attachment: When inserting links, insert img directives for images, if that plugin is enabled.

14 years agoavoid ugly warning if size="" is specified
Joey Hess [Sun, 13 Jun 2010 02:59:46 +0000 (22:59 -0400)]
avoid ugly warning if size="" is specified

14 years agoedittemplate: Look for template pages under templates/ like everything else (still...
Joey Hess [Sun, 13 Jun 2010 02:43:34 +0000 (22:43 -0400)]
edittemplate: Look for template pages under templates/ like everything else (still looks in old location for backwards compatability).

14 years agoedittemplate: Make silent mode not disable display when the template page does not...
Joey Hess [Sun, 13 Jun 2010 02:20:22 +0000 (22:20 -0400)]
edittemplate: Make silent mode not disable display when the template page does not exist, so it can be easily created.

14 years agoeditpage: Rename "comments" field to avoid CSS conflict with the comments div.
Joey Hess [Sat, 12 Jun 2010 22:10:33 +0000 (18:10 -0400)]
editpage: Rename "comments" field to avoid CSS conflict with the comments div.

14 years agoimg: Support hspace and vspace attributes.
Joey Hess [Sat, 12 Jun 2010 20:16:24 +0000 (16:16 -0400)]
img: Support hspace and vspace attributes.

14 years agoattachment: Show files from underlay in attachments list.
Joey Hess [Sat, 12 Jun 2010 18:29:56 +0000 (14:29 -0400)]
attachment: Show files from underlay in attachments list.

While those files cannot be removed or renamed, this allows easy
downloading of them, and a new version can after all be uploaded.

14 years agorealm is an url pattern
Joey Hess [Fri, 11 Jun 2010 18:14:20 +0000 (14:14 -0400)]
realm is an url pattern