61426a7186
Reorganize index file, add a format version field.
...
Upgrades to the new index format should be transparent.
The version field is 3, because 1 was the old textual index, 2 was the
pre-versioned format.
This also includes some efficiency improvements to index loading, by
not copying a hash and using a reference.
2008-09-27 16:35:56 -04:00
55a0361a47
template: Make edit link for new templates ensure the page is located under toplevel templates directory.
2008-09-27 15:18:36 -04:00
67f38832aa
htmltidy robustness fixes
...
* htmltidy: Avoid returning undef if tidy fails. Also avoid returning the
untidied content if tidy crashes. In either case, it seems best to tidy
the content to nothing.
* htmltidy: Avoid spewing tidy errors to stderr.
2008-09-27 14:27:42 -04:00
9ec9d6901d
Export pagetitle, titlepage, linkpage.
2008-09-27 14:27:42 -04:00
3b39e93699
Beautify urls used in various places. (smcv)
2008-09-27 13:03:21 -04:00
748fc2fcd4
typo
2008-09-27 11:53:55 -04:00
60a80be0b3
Epand usage message and add --help. Closes : #500344
2008-09-27 11:17:19 -04:00
89256ab870
htmlscrubber: Add a config setting that can be used to disable the scrubber acting on a set of pages.
2008-09-26 18:07:37 -04:00
bce2a34c19
tag: Make edit link for new tags ensure that the tags are created inside tagbase, when it's set.
2008-09-25 20:25:07 -04:00
965f7310fe
git: Fix handling of utf-8 filenames in recentchanges.
...
Seems that the problem is that once the \nnn coming from git is converted
to a single character, decode_utf8 decides that this is a standalone
character, and not part of a multibyte utf-8 sequence, and so does nothing.
I tried playing with the utf-8 flag, but that didn't work. Instead, use
decode("utf8"), which doesn't have the same qualms, and successfully
decodes the octets into a utf-8 character.
Rant:
Think for a minute about fact that any and every program that parses git-log,
or git-show, etc output to figure out what files were in a commit needs to
contain this snippet of code, to convert from git-log's wacky output to a
regular character set:
if ($file =~ m/^"(.*)"$/) {
($file=$1) =~ s/\\([0-7]{1,3})/chr(oct($1))/eg;
}
(And it's only that "simple" if you don't care about filenames with
embedded \n or \t or other control characters.)
Does that strike anyone else as putting the parsing and conversion in the
wrong place (ie, in gitweb, ikiwiki, etc, etc)? Doesn't anyone who actually
uses git with utf-8 filenames get a bit pissed off at seeing \xxx\xxx
instead of the utf-8 in git-commit and other output?
2008-09-25 18:26:42 -04:00
e1ba137317
attachment: Add admin() pagespec to test if the uploading user is a wiki admin.
2008-09-25 16:49:30 -04:00
093e815440
aggregate: Avoid uninitialized value warnings for pages with no recorded ctime.
...
I saw this in the wild, apparently a page was not present on disk, but was
in the aggregate db, and not marked as expired either. Not sure how that
happened, but such pages should get marked as expired since they have an
effectively zero ctime.
2008-09-25 15:38:51 -04:00
3f5ba52ee0
recentchanges: Fix redirects to non-page files.
2008-09-25 13:46:12 -04:00
b127e86b35
releasing version 2.65
2008-09-24 18:14:09 -04:00
e00df8575f
rename: Hide type field from rename form when renaming attachments.
2008-09-23 19:31:34 -04:00
e33bbb24e8
changelog
2008-09-23 19:28:05 -04:00
8e0180d8ca
rename, remove: Don't rely on a form parameter to tell whether the page should be treated as an attachment.
2008-09-23 17:41:05 -04:00
dfe55e8956
Add keepextension parameter to htmlize hook. (Willu)
2008-09-23 13:39:21 -04:00
9cbcda14ac
Print a debug message if a page has multiple source files.
2008-09-23 13:32:41 -04:00
12eb585353
add missing page name sanity check
2008-09-20 22:48:22 -04:00
a6fc3b411f
edittemplate patch from Willu
...
* edittemplate: Default new page file type to the same type as the template.
(willu)
* edittemplate: Add "silent" parameter. (Willu)
* edittemplate: Link to template, to allow creating it. (Willu)
2008-09-20 16:19:09 -04:00
c51b304d90
Fix reversion in use of ikiwiki -verbose -setup with a setup file that enables syslog.
...
Setup output is once again output to stdout in this case.
Implemented by stashing the verbose/syslog values set in the setup file,
and using those values in the generated wrappers, but not allowing them to take
effect during the setup operation itself, so that command-line options,
appearing before or after -setup, are honored.
Also, some cleanups to how %config is generated for wrappers, removing some
fields that do not need to be recorded inside the wrapper.
2008-09-20 15:38:02 -04:00
779c5214f3
progress: Display an error if the progress cannot be parsed, and allow the percent parameter to only optionally end with "%".
2008-09-19 13:09:50 -04:00
89953e3e19
store ctime for use by expiry code
...
The expiry code does need to make sure to sort in ctime order, even if
expiring by count, so it expires the right ones.
2008-09-17 18:11:22 -04:00
1cb4154bc8
aggregate: Support atom feeds with only a summary element, and no content elements.
2008-09-17 15:56:58 -04:00
da7c6eb1b4
editdiff: Broken since 2.62 due to wrong syntax, now fixed.
2008-09-17 14:34:02 -04:00
b540b263de
aggregate: Allow expirecount to work on the first pass. (expireage still needs to wait for the pages to be rendered though)
2008-09-17 14:27:31 -04:00
51f19ca4c8
releasing version 2.64
2008-09-14 17:15:38 -04:00
0d6746a29f
document code change in last commit
2008-09-14 13:57:37 -04:00
0187c2ba0d
Removed old redirecton pages from basewiki (helponformatting, markdown, openid, pagespec, preprocessordirective, subpage, wikilink).
2008-09-12 16:15:20 -04:00
e9468fd5eb
Removed the obsolete blog page from the basewiki. ikiwiki/blog still remains, but is now deprecated too.
2008-09-11 20:15:25 -04:00
b9e8cb0dd1
license directive docs using basewiki license
2008-09-11 19:42:27 -04:00
bc7381c4f9
listdirectives: Enable use of the directives underlay.
2008-09-11 18:46:32 -04:00
7d98c3d52b
changelog
2008-09-11 18:32:19 -04:00
a87cfbcb8d
Improve error message if external plugin fails to load. Closes : #498458
2008-09-11 01:41:55 -04:00
d9d783c4bc
goodstuff update
...
* goodstuff: Remove otl plugin from the bundle since it needs a significant
external dependency and is not commonly used. If you use otl, make sure
you explicitly enable it now.
* goodstuff: Add more, progress, and table plugins to the bundle.
2008-09-09 16:11:16 -04:00
5d53fab853
img: Support sizes like 200x. Closes : #475149
2008-09-09 15:20:06 -04:00
7a680431ed
Add allow_symlinks_before_srcdir to config so websetup doesn't eat it.
2008-09-09 14:50:37 -04:00
6f46cc3b31
progress: New plugin to generate progress bars (willu)
2008-09-09 14:44:58 -04:00
2b53de66a0
ddate: Stop clobbering timeformat when not enabled.
2008-09-08 19:40:23 -04:00
0e654c1ea0
Avoid uninitialised value when --dumpsetup is used and no srcdir/destdir specified.
2008-09-08 19:21:45 -04:00
2283d5d878
releasing version 2.63
2008-09-08 12:27:01 -04:00
0f67e7d969
editpage: New core plugin factoring out page editing to allow disabling it if desired.
2008-09-05 13:57:25 -04:00
a1c7f3282d
po/Makefile: update po files when the pot file has changed. Closes : #497951
2008-09-05 12:37:29 -04:00
d2679de965
For fine control over what characters are allowed, unescaped in source filenames, the wiki_file_chars setting is added. For example, set to "-[:alnum:]+/._" to disable colons from being used in source files (which can cause trouble om Windows).
2008-09-04 14:13:10 -04:00
657bf7846d
table: Support header=column to make the table header be the first column of the data. (AlexandreDupas)
2008-09-02 14:57:20 -04:00
b7458c48d8
filecheck: Fall back to testing for binary or plain text files if no mime type is detected.
2008-09-01 15:00:15 -04:00
a82496d35a
style.css: Add missing semicolon. Closes : #497176
2008-09-01 11:25:28 -04:00
75a096d056
Work around perl $_ scoping nonsense that caused breakage when loading external plugins.
2008-08-29 18:40:41 -04:00
981d0474a1
Ignore failure to install files into /etc, in case install is running as non-root.
2008-08-29 15:53:46 -04:00
70d8df54a5
Typo. Closes : #497003
2008-08-29 11:30:51 -04:00
2a29641097
Set cookies HttpOnly.
2008-08-28 16:09:58 -04:00
dfea7fa1ac
releasing version 2.62.1
2008-08-28 13:08:20 -04:00
2b602e2e9f
filecheck: Fixed two bits broken in move from attachment.
2008-08-28 13:04:45 -04:00
90b8535b57
releasing version 2.62
2008-08-27 15:40:42 -04:00
a326ffed1f
autoindex: Avoid re-adding previously deleted (or renamed) pages.
2008-08-26 14:39:47 -04:00
042a057778
color: New plugin from ptecza.
2008-08-26 13:22:34 -04:00
d06096ad0d
edittemplate: Don't wipe out edits on preview.
2008-08-25 20:51:10 -04:00
78e34fbdc2
filecheck: New plugin factoring out the PageSpec additions that were originally part of the attachment plugin.
2008-08-25 19:52:34 -04:00
744a0edcfb
update
2008-08-25 14:21:46 -04:00
4956623ee6
rename plugin
...
I don't want to be stuck renameing it later if preprocessor directives are
turned into postprocessor directives. Also, "directives" is shorter and
clearer than "preprocessors".
2008-08-25 13:38:44 -04:00
4cec43e1b9
update
2008-08-25 13:30:36 -04:00
69e35d3c51
willu's teximg changes
...
* teximg: The prefix is configurable, and has changed to not include the
nonstandard mhchem by default. (willu)
* teximg: dvipng is used if available to render images. Its output is
antialiased and better than dvips. If not available, the old dvips+convert
chain will be used. (willu)
* Drop suggests on texlive-science, add suggests on dvipng.
2008-08-24 15:21:51 -04:00
9b10f5eab2
map: The fix for #449285 was buggy and broke display of parents in certian circumstances.
...
The use of $dummy was not sufficient, because it only stuck around for the
first element after a dummy parent, and was then lost. Instead, use a
$addparent that contains the actual dummy parent, so it can be compared
with the new item to see if we're still under that parent or have moved to
another one.
2008-08-23 13:10:49 -04:00
db73f81258
ikiwiki-makerepo: Added support for monotone. (Thomas Keller)
2008-08-21 23:44:00 -04:00
6cf96b5819
Fix bug in wikiname sanitisation in the setup automator.
2008-08-21 23:40:11 -04:00
15ed67132e
Revert "Add missing PREFIX to a few lines of the Makefile. (Thomas Keller)"
...
This reverts commit 65c12dffec
2008-08-21 23:12:14 -04:00
888f4203f5
Avoid using hostname -f for portability to eg, OS X, use Net::Domain instead, and prompt if it fails.
2008-08-21 22:48:07 -04:00
65c12dffec
Add missing PREFIX to a few lines of the Makefile. (Thomas Keller)
2008-08-21 22:25:36 -04:00
dec9b4e2c9
Avoid using cp -a (again). (HenrikBrixAndersen)
2008-08-21 16:21:40 -04:00
0ab3ed872b
releasing version 2.61
2008-08-14 21:11:45 -04:00
5d83e7359d
graphviz: Fix breakage of the name of the preprocessor directive.
2008-08-14 14:44:30 -04:00
6432d15cb4
fix a common case typo
2008-08-12 15:48:44 -04:00
b39b92c0a6
releasing version 2.60
2008-08-12 14:28:13 -04:00
6edd22808e
Danish update. Closes : #494632
2008-08-11 12:47:39 -04:00
c98ea6a971
close bug, changelog
2008-08-07 16:21:58 -04:00
581381e335
inline: Ignore parent dirs when sorting pages by title.
2008-08-07 15:47:59 -04:00
cc43a6ea70
Add Suggests on texlive and texlive-science for the teximg plugin
2008-08-06 20:58:42 -07:00
6cfb5c5b59
Added a small icon to the search input box.
2008-08-06 19:34:33 -04:00
adc2eb3d8c
Options set in the setup file are now immediatly loaded by ikiwiki -setup. This allows later switches to override them. Previously, setup file options overrode most command line options.
2008-08-06 01:58:04 -04:00
86660e9c82
external: Fix support for hooks called in an array context.
2008-08-06 01:05:44 -04:00
4c07e7362c
update
2008-08-06 00:23:22 -04:00
9cb415f4a4
autoindex: Ignore internal pages, and take underlay directories into account. Also, avoid making index pages for directories that contain no files.
2008-08-06 00:04:05 -04:00
ea6dc38325
add ikiwiki-transition setupformat subcommand.
...
Also fixed a bug in how aggregateinternal used IkiWiki::Setup::load,
and added checks for arguments to other subcommands.
2008-08-05 20:40:49 -04:00
29ab73258f
Clarify some wording in the setup documentation that could maybe lead users to putting paths with "~/" in the setup file, which doesn't work. Closes : #493835
2008-08-05 16:57:49 -04:00
0f06504422
remove description_html, add link
2008-08-03 14:36:17 -04:00
d9db5f2def
Bail if both srcdir and repository are not specified.
2008-08-03 14:21:43 -04:00
25c35b6e90
banned_users move to setup file, stage 1
2008-08-01 17:39:17 -04:00
bb394fdae8
admin prefs move to setup file, stage 1
...
The locked pages configuration is moving to a locked_pages option in the
setup file, and the allowed attachments configuration to
allowed_attachments. The admin prefs page can still be used for these, but
that's depreacted and will only be shown if there's currently a value.
2008-08-01 16:45:04 -04:00
041923a89e
Merge branch 'master' into autoconfig
...
Conflicts:
IkiWiki/Plugin/git.pm
debian/changelog
po/ikiwiki.pot
2008-07-31 19:35:37 -04:00
0f312d152e
releasing version 2.56
2008-07-31 19:29:29 -04:00
d266c4dc45
Revert "increase minimum git version"
...
This reverts commit 391c5c2cb5
2008-07-31 19:24:35 -04:00
f7b8f2297c
Add test for old versions of git that don't support --cleanup=verbatim, and munge empty commit messages.
2008-07-31 19:23:54 -04:00
391c5c2cb5
increase minimum git version
...
git commit --cleanup=verbatim was first introduced in git 1.5.4.
2008-07-31 19:01:02 -04:00
71eb56bcac
merged
2008-07-31 18:52:30 -04:00
e12627e0a4
update
2008-07-30 14:44:50 -04:00
12c5786df4
Merge branch 'tova' into autoconfig
...
Conflicts:
debian/changelog
2008-07-29 15:54:45 -04:00
106578f524
changelog
2008-07-29 15:54:07 -04:00
1916afc603
rename
2008-07-27 16:08:44 -04:00
ddef0d3170
Merge branch 'master' into autoconfig
...
Conflicts:
debian/changelog
doc/todo/color_plugin.mdwn
2008-07-27 11:43:47 -04:00
ccd567948e
releasing version 2.55
2008-07-27 11:32:05 -04:00
f28b57526c
setup automator
...
"ikiwiki -setup /etc/ikiwiki/simple.setup"
can be used set up a new wiki in seconds
2008-07-27 01:39:11 -04:00
e1f7146041
avoid clobbering example diffurl
2008-07-27 00:54:15 -04:00
bc3363beb7
ikiwiki-update-wikilist: Add -r switch to remove. Default behavior is now always to add.
2008-07-27 00:02:04 -04:00
4ef96e2d99
Merge branch 'master' into autoconfig
2008-07-26 23:22:42 -04:00
ecc40d1769
changelog and tweaks
2008-07-26 23:15:50 -04:00
1c831b472b
changelog
2008-07-26 23:06:40 -04:00
e99cc6dd9e
generate an example ikiwiki.setup as part of the build
2008-07-26 23:02:46 -04:00
4f06e7402a
remove ikiwiki.setup
...
To generate your own, use ikiwiki -dumpsetup ikiwiki.setup
Update docs.
2008-07-26 22:55:39 -04:00
6154dd03cb
finish with rcs plugin conversion
2008-07-26 22:28:18 -04:00
c83fd4a328
wrapper setup reorg
...
Flattened the wrapper setup, as this lets it be handled better by the
setup generation code.
2008-07-26 21:00:11 -04:00
4ee441c152
changelog
2008-07-26 16:23:29 -04:00
b7bf566f55
attachment: Use relative paths when inserting links.
2008-07-25 19:22:29 -04:00
99ec944766
bzr (mostly) done
2008-07-25 12:16:21 -04:00
99b59f2d62
toggle: Fix incompatability between javascript and webkit.
2008-07-25 01:24:20 -04:00
36a0d984c9
fix monotone/mercurial confusion
2008-07-24 22:03:38 -04:00
58e2b2c99c
mercurial: Add support for rename, delete, and also diff. (William Uther)
2008-07-24 14:17:04 -04:00
4691a2ad39
add renamepage hooks
...
Implemented for regular wikilinks, with a test suite.
2008-07-23 18:14:20 -04:00
96dab37a8e
Merge branch 'master' into tova
2008-07-23 17:34:01 -04:00
b95669c3c8
Rebuild pages that change their type. (Gabriel McManus)
2008-07-23 16:13:37 -04:00
335a6a59e6
Merge branch 'master' into tova
2008-07-23 15:00:07 -04:00
1d1767192c
attachment: Do not escape _ when determining attachment filenames.
2008-07-23 14:58:39 -04:00
d76c10cba2
Split out error messages from editpage.tmpl into several separate templates.
2008-07-22 19:58:34 -04:00
9776bbf853
Don't allow uploading an attachment with the same name as an existing page, to avoid confusion.
2008-07-22 17:12:20 -04:00
114e20e948
typo
2008-07-22 17:03:28 -04:00
cbddb5a4b8
add rcs_commit_staged and rcs_rename
...
Implemented for git and svn so far.
Note that rcs_commit_staged does assume that the rcs has the ability to
"stage" multiple changes for a later commit. Support for this varies, but
all we really care about is staging removals and renames, which, AFAIK, all
modern rcs's support.
2008-07-22 16:14:33 -04:00
96c529826d
skeleton rename plugin
2008-07-21 22:30:43 -04:00
9d5c9ce258
Merge branch 'master' into tova
2008-07-21 21:23:58 -04:00
c2a2f71508
Add allow_symlinks_before_srcdir config setting
...
can be used to avoid a security check that is a good safe default, but
problimatic overkill in some situations.
I decided to underdocument this, because the option looks ugly, and I don't
want people randomly turning it on because it looks like a good idea. So if
you need it, you'll get an error message mentioning how to fix it.
2008-07-21 18:33:09 -04:00
e630e7507e
Avoid troublesome abs_path calls in wrapper setup
...
As documented in the forum post.
2008-07-21 18:26:14 -04:00
18d2403647
Merge branch 'master' into tova
...
Conflicts:
debian/changelog
2008-07-21 17:27:50 -04:00
c2ffd205f3
Really fix bug with links to pages with names containing colons
...
Previous fix mised a few cases.
2008-07-21 17:27:14 -04:00
09331644a2
changelog
2008-07-21 17:06:40 -04:00
b1b5860b29
touchups
2008-07-21 14:03:39 -04:00
c924c76bd8
basically, removal works
...
Still need to consider all the edge cases..
2008-07-21 13:50:12 -04:00
c6d1ae33d2
All rcs backends need to implement rcs_remove
...
(Done for svn, git.)
2008-07-21 13:41:17 -04:00
3da279ddd4
editpage: Don't show attachments link when attachments are disabled.
2008-07-21 12:15:55 -04:00
4a3e16f851
prefix_directives enabled in doc wiki, all preprocessor directives converted. (Simon McVittie)
2008-07-21 11:41:32 -04:00
fede380a89
releasing version 2.54
2008-07-21 11:19:01 -04:00
01564d3ac2
add sparkline-php to suggests
2008-07-20 12:36:20 -04:00
b557ba7c46
close bug, add changelog
2008-07-19 13:24:58 -04:00
1b318dacbd
git: Fix parsing of git logs with no commit messages at all.
2008-07-17 16:53:54 -04:00
ac62a47ea4
git: Put web committer name/openid/address in the git author field
...
The committer's email address is not used (because leaking email addresses
is not liked by many users). Closes : #451023
A "Web-commit" trailer is added, to allow telling the difference between
web commits and direct commits.
2008-07-17 16:17:15 -04:00
584f3e3061
Add a postscan hook.
...
* Add a postscan hook.
* search: Use postscan hook, avoid updating index when previewing.
2008-07-17 16:17:15 -04:00
df3a8b183c
smiley escaping fixes
...
Smileys need to be double-escaped to work, since the smiley plugin runs as
a sanitize hook, and markdown helpfully removes one level of escapes first.
There were some bugs in the smiley handling code that made escaped smileys
still be expanded. After unescaping a smiley, it needed to move pos forward
past it or the next pass would expand it.
Also, once the m//g got to the end, it seemed to loop back through and make
one more pass (a difference in perl 5.10's regexp exngine? I observed that
pos was undefined when this happened, so added a `last unless defined pos`.
2008-07-17 12:34:38 -04:00
dc1cbf2c8c
merged intrigeri's parentlinks plugin, close todo
2008-07-16 17:49:24 -04:00
67d8f7f209
changelog
2008-07-16 17:45:38 -04:00
76b078d587
changelog
2008-07-14 21:12:03 -04:00
9957c7fd5d
Cut the size of the binary package in half by excluding pages for bugs and todo items from the html shipped in it.
2008-07-13 15:46:20 -04:00
edb59cd5b9
Error handling improvement for preprocess hooks. It's now safe to call error() from such hooks; it will cause a nicely formatted error message to be inserted into the page.
2008-07-13 14:41:40 -04:00
Joey Hess
Josh Triplett
Joey Hess