summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-06-17Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.infoJoey Hess
2010-06-17yeay ! \\o \o/ o//demo
2010-06-17(no commit message)jhagg
2010-06-17(no commit message)jeanm
2010-06-16link to theme pluginJoey Hess
2010-06-16Merge branch 'themes'Joey Hess
2010-06-16add background image, kindly gpl'd by bzedJoey Hess
2010-06-16force list contextJoey Hess
run_or_die returns a status code in scalar context
2010-06-16preserve timestamps for directive and theme underlaysJoey Hess
2010-06-16force rebuild for theme changeJoey Hess
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.
2010-06-16add theme pluginJoey Hess
2010-06-16Encode not usedJoey Hess
2010-06-16commentsJoey Hess
2010-06-16not local.css hereJoey Hess
2010-06-16copy from actiontabs.css in css_marketJoey Hess
fixed a few indents
2010-06-16copy from bzedJoey Hess
2010-06-16tweak bzed's themeJoey Hess
* 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
2010-06-16add copy of local.css from bzed.deJoey Hess
bzed says this is not quite ready, but I'm an impatient guy. Guess I'll have to track his updates.
2010-06-16attachment: Support Windows paths when taking basename of client-supplied ↵Joey Hess
file name.
2010-06-16(no commit message)jhagg
2010-06-15git: Gix --gettime to properly support utf8 filenames.Joey Hess
In passing, fixed a bug where the srcdir was in a subdir of a repository named "0".
2010-06-15Make --gettime be honored after initial setup.Joey Hess
Bugfix in passing: New files not treated as such when no rcs is used.
2010-06-15bugnumJoey Hess
2010-06-15fix other cases of unicode mixing issueJoey Hess
and fix underlaydir override attack guard when srcdir is non-absolute
2010-06-15Fix issues with combining unicode srcdirs and source files.Joey Hess
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.
2010-06-15Fix issues with combining unicode srcdirs and source files.Joey Hess
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.
2010-06-15noteJoey Hess
2010-06-15match only pages in calendarJoey Hess
2010-06-15clear floats before comments beginJoey Hess
2010-06-15calendar: Tune archive_pagespec to only match pages, not other files.Joey Hess
2010-06-15Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.infoJoey Hess
2010-06-15fix labels for form elementsJoey Hess
The label for attribute must correspond to the element id (not name). And it needs to be unique inside the loop.
2010-06-15Thanksprivat
2010-06-15typobhobbit
2010-06-15(no commit message)bhobbit
2010-06-14fix linksJoey Hess
2010-06-14add links to mentioned directivesJoey Hess
Using the !iki shortcut, since the directive pages may not be included in the basewiki.
2010-06-14editpage, comments: Fix broken links in sidebar (due to forcebaseurl). ↵Joey Hess
(Thanks, privat)
2010-06-14good ideaJoey Hess
2010-06-14Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.infoJoey Hess
2010-06-14simplify, avoid confusing suggestionsJoey Hess
Don't even talk about ACLs, and more strongly discourage directly committing to ikiwiki's srcdir.
2010-06-14limit blog inlines to pagesJoey Hess
This way images attached to blog posts don't show up as enclosures in the blog by default.
2010-06-14Reopen the bug since it is not fixedprivat
2010-06-13more symetric enable/disableJoey Hess
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.
2010-06-13websetup: Allow enabling plugins listed in disable_plugins.Joey Hess
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.)
2010-06-13responseJoey Hess
2010-06-13Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.infoJoey Hess
2010-06-13remove obsolete ol class=form for editpage and editcommentJoey Hess
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.
2010-06-13(no commit message)http://abhidg.wordpress.com/
2010-06-13wordingJoey Hess