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