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
6fb6d51524
fix inverted test
2008-08-06 01:15:48 -04:00
86660e9c82
external: Fix support for hooks called in an array context.
2008-08-06 01:05:44 -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
bf8558f346
save to real setup file, and rebuild/refresh
2008-08-05 20:11:56 -04:00
83888b75f1
save the full path to the setup file
2008-08-05 20:11:23 -04:00
46b3f54ab6
typo
2008-08-05 19:58:33 -04:00
4b4bce5006
Revert "typo"
...
This reverts commit c8d3626c51
2008-08-05 19:39:30 -04:00
4b994ffed1
avoid forcing syslog setting
...
This avoids forcing the setting to 0 if it was not set at all.
2008-08-05 19:36:53 -04:00
c8d3626c51
typo
2008-08-05 19:30:09 -04:00
6e2f9e97f3
Add simple patch to silence a warning when using monotone
2008-08-04 15:00:47 -04:00
e48f8ff8a9
hm
2008-08-04 14:53:11 -04:00
0c3291d4f3
plugin enable/disable working and bugfixes
2008-08-03 22:16:38 -04:00
a4ce6550eb
loosen qw regexp
2008-08-03 22:16:38 -04:00
6d15912e8f
work around strange problem with banned_users
...
Its value was being ignored. Some kind of formbuilder bug?
Anyway, prefixing all keys with a section seems like a good idea
generally, in case there's ever overlap.
2008-08-03 21:06:13 -04:00
4b79a43db6
checkboxes back
2008-08-03 20:51:46 -04:00
2a712c8817
use radio, not checkbox, for booleans
...
Had to do this due to one of CGI::FormBuilder's more annoying quirks -- it
loses the value of a checkbox field with only one option, always treating
it as checked.
2008-08-03 20:20:25 -04:00
3905645342
add plugin safe/rebuild info (part 3 of 3)
2008-08-03 19:36:11 -04:00
219afc3f9c
support rebuild tristate
...
also some fixes to change minimisation logic
2008-08-03 18:23:17 -04:00
018321f2c8
fix misc breakage from plugin safe/rebuild data addition
2008-08-03 18:17:13 -04:00
39195de96e
add plugin safe/rebuild info (part 2 of 3)
...
(brain.. melting..)
2008-08-03 17:20:21 -04:00
1230e914b1
anonok is safe
2008-08-03 17:03:20 -04:00
1a37848346
move plugin toggles to before config setting again
2008-08-03 16:58:16 -04:00
b7d6a49be4
ui improvements
2008-08-03 16:46:38 -04:00
aacec52a07
show force disabled plugins in advanced mode
2008-08-03 16:43:42 -04:00
903213e63f
add plugin safe/rebuild info (part 1 of 2)
...
too many plugins.. brain exploding..
2008-08-03 16:40:12 -04:00
9e0cbb73fe
plugin safe/rebuild controls
2008-08-03 16:23:41 -04:00
4405cebd0a
add advanced and basic modes
2008-08-03 14:57:24 -04:00
5c0f539950
avoid adding extra disabled fields for arrays
2008-08-03 14:41:53 -04:00
d00f3edf13
properly support all types of data in arrays
2008-08-03 14:39:34 -04:00
0f06504422
remove description_html, add link
2008-08-03 14:36:17 -04:00
5ef45ca7e1
support arrays
2008-08-03 00:27:27 -04:00
d8b49840dd
update
2008-08-02 23:59:40 -04:00
7baa6320e0
rebuild detection
2008-08-02 23:32:40 -04:00
8c02d670d0
pull values from form to config
2008-08-02 23:14:59 -04:00
f6babf662b
fix syntax error with corrupt data
...
Just because it's supposed to be an integer or boolean doesn't mean the
vlaue really is..
2008-08-02 23:14:23 -04:00
94c59d3254
collect a hash of shown fields
...
Need to do this to know what fields to take from CGI.
(Can't trust that only safe ones are sent..)
2008-08-02 23:06:25 -04:00
c762b65ce4
show unsafe options (RO) by default
...
Small data leak, but only to admins, and I think it's worth it to see the
stuff that cannot be configured.
2008-08-02 22:50:09 -04:00
5dbd053da3
avoid syslog whining from broken plugins
2008-08-02 22:22:53 -04:00
6f65cb1cbe
avoid setting default value in websetup_force_plugins
...
This would make changes not be seen later.
2008-08-02 22:20:26 -04:00
15341aed01
don't install demo external plugins by default
2008-08-02 16:53:20 -04:00
4708aeceb3
websetup form display done
2008-08-02 16:41:37 -04:00
b0f4767448
basic form display done
2008-08-02 16:41:36 -04:00
102f29e500
add description_html
2008-08-02 16:41:36 -04:00
0b6dd9247b
refactor
2008-08-02 16:41:35 -04:00
d3cad5d2ca
relocate
2008-08-02 16:41:35 -04:00
680cd2fbc3
skeleton of web setup plugin
2008-08-02 16:41:35 -04:00
25c35b6e90
banned_users move to setup file, stage 1
2008-08-01 17:39:17 -04:00
190a845fe1
hide deprecated values if empty after save
2008-08-01 17:39:17 -04:00
f41448d9ca
rcs plugin loading reorg
...
Move rcs plugin load to loadplugins; move duplicate rcs detection logic out
of individual plugins and into loadplugins. Avoids checkconfig failing when
run twice.
2008-08-01 16:45:05 -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
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
6c8a8dd13b
add guard against enabling multiple rcs plugins
2008-07-30 14:32:48 -04:00
12c5786df4
Merge branch 'tova' into autoconfig
...
Conflicts:
debian/changelog
2008-07-29 15:54:45 -04:00
f0090d8c57
check generated pages in
...
I considered not checking them in, or making the checkin configurable.
However, then they would remain not checked in if edited by a user, which is
probably not desired.
Note that passing undef as the username/ip to rcs_commit_staged may not
result in ideal behavior; the commit may seem to come from "anonymous" with
some revision control systems. Most of them handle it a bit better and just
have it come from whatever user is running the build.
2008-07-29 15:51:25 -04:00
a02c3f46ea
initial draft
2008-07-29 15:39:01 -04:00
37245a9988
add refresh hook
2008-07-29 15:04:34 -04:00
73af360e99
fix cgiurl check
2008-07-27 19:21:56 -04:00
9be28d7865
handle options with no value and no example value
2008-07-27 19:19:04 -04:00
9607452346
typo
2008-07-27 16:11:06 -04:00
950850f639
add new wiki to wikilist
2008-07-27 16:01:29 -04:00
929a70a16d
password prompt for admin user
2008-07-27 15:44:11 -04:00
c755bfd1d8
automator improvements
2008-07-27 15:16:03 -04:00
3d4c32dace
lose the ugly $rawsetup, use a function
2008-07-27 15:08:10 -04:00
3d139e4312
rcs hook setup for the two I know
2008-07-27 01:50:43 -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
4ef96e2d99
Merge branch 'master' into autoconfig
2008-07-26 23:22:42 -04:00
618e3c1075
use new style error handling
2008-07-26 23:15:35 -04:00
e3713772f7
Added cutpaste plugin.
...
I'm wondering if cutandpaste wouldn't be a better name.
2008-07-26 23:08:17 -04:00
02078c406c
Handle the case when HTML got tidied.
...
This fixes debian bug #492529 .
2008-07-26 23:05:57 -04:00
6a64d13352
allow --dumpsetup to be used w/o specifying srcdir and destdir
...
shortcut tried to use srcdir in checkconfig; change it to not so this will
work.
2008-07-26 23:00:44 -04:00
67a63e7860
fixups
2008-07-26 22:38:43 -04:00
6154dd03cb
finish with rcs plugin conversion
2008-07-26 22:28:18 -04:00
14cd75746a
Version control backends promoted to first-class plugins
2008-07-26 22:27:24 -04:00
82f0facb62
fixups
2008-07-26 21:14:07 -04:00
42ac4ec009
remove default values in getsetup
...
They were a bit confusing, since they did not actually set the default, and
example values are sufficient.
2008-07-26 21:07:15 -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
38618838c9
add example wrapper and fix formatting
2008-07-26 19:49:45 -04:00
cecd3bf725
historyurl can be undef
2008-07-26 19:37:25 -04:00
8051316904
add missing setup options, tweak others' display
2008-07-26 19:28:15 -04:00
bb872ea1e8
filter out demo plugins
2008-07-26 19:11:31 -04:00
52bbdbb1a5
load all plugins when generating setup
2008-07-26 19:10:11 -04:00
f892cc8c50
two typos
2008-07-26 19:05:52 -04:00
477654003f
clarify wording
2008-07-26 18:33:18 -04:00
56b9b85e33
tla done too
2008-07-26 18:31:27 -04:00
2bbe1bf9af
move more settings out to rcs
2008-07-26 18:29:33 -04:00
90b310b93c
getsetup-ize svn and bzr
2008-07-26 18:26:56 -04:00
21af3ae336
add folding
2008-07-26 18:14:21 -04:00
b277e00d4e
add gensetup for hg
2008-07-26 18:13:16 -04:00
66739016fa
add gensetup for git
2008-07-26 18:10:01 -04:00
9bcb649efe
typos
2008-07-26 17:58:20 -04:00
0e0ee9b2ce
make monotone use hooks, add getsetup
...
Rather than every monotone rcs_ function calling check_config, just put it
in a checkconfig hook. (But the chdir still needs to be done by every
hook.)
2008-07-26 17:49:25 -04:00
cab1ac75c9
refactor
2008-07-26 15:43:25 -04:00
b073359b18
refactor
2008-07-26 15:39:41 -04:00
1c00717cb2
can now dump fully functional setup files
2008-07-26 15:34:38 -04:00
cd029da493
typo
2008-07-26 14:56:10 -04:00
26db34e1d6
adminemail may be undefined
2008-07-26 14:54:50 -04:00
79f637a436
typo
2008-07-26 14:44:49 -04:00
49e86d2562
turn booleans into questions
2008-07-26 14:43:47 -04:00
abab46f983
add info for all common setup file options, and most internal ones
2008-07-26 14:39:12 -04:00
1ba84c3a6b
predefine pingurl
2008-07-26 14:38:58 -04:00
c2507d33cb
allow account_creation_password to not be defined
2008-07-26 14:02:36 -04:00
6b19afb3ef
fixes
2008-07-26 13:10:52 -04:00
9169c3247f
standardising and documenting getsetup
2008-07-26 13:07:48 -04:00
255172215e
fixes
2008-07-26 12:53:07 -04:00
5bea644fdd
add dumpsetup option; refactor
2008-07-26 12:46:31 -04:00
62cd2e0a5d
setup dumping improvements
2008-07-26 12:01:10 -04:00
e727d5b6e9
more formatting
2008-07-26 02:04:30 -04:00
fe2fe5aa4b
improve formatting
2008-07-26 01:58:36 -04:00
278ae9afea
add ability to generate setup files
...
quite nice ones, too, with comments and everything
2008-07-26 01:35:26 -04:00
0d7bc7402c
fix plugin name
2008-07-26 00:45:32 -04:00
426200b34a
avoid fatal error in sanitize
2008-07-26 00:45:21 -04:00
84c905ec20
finish adding getsetup hooks to plugins
2008-07-26 00:38:13 -04:00
d0bd30824e
Merge branch 'master' into autoconfig
2008-07-25 19:27:15 -04:00
b7bf566f55
attachment: Use relative paths when inserting links.
2008-07-25 19:22:29 -04:00
1f8b0460c3
added getsetup hooks for all plugins up to recentchanges
2008-07-25 18:05:55 -04:00
cf6c2f142f
add getsetup
...
Also, avoid dying with a fatal error if multimarkdown is enabled and the
module doesh't load.
2008-07-25 17:52:00 -04:00
bf6198baf3
add getconfig for inline
...
Also, moved the pingurl getopt parsing to inline.
2008-07-25 17:24:52 -04:00
a71b9a1cf1
fix feed urls
...
The fix for colons involved adding "./" to some urls. Due to the weird way
inline called urlto, these snuck into feed urls and permalinks. Fix it by
adding an optional third parameter to urlto.
2008-07-25 16:16:44 -04:00
3575798564
bzr: Version directories on the fly, ignore directories when retrieving
...
changes.
Now passes t/bazaar.t again.
2008-07-25 20:13:45 +02:00
c401cf4f0c
Merge commit 'jelmer/master'
2008-07-25 12:03:34 -04:00
89e0de5bc4
improved, possibly faster getelementsbyclass by willu
2008-07-25 01:43:37 -04:00
99b59f2d62
toggle: Fix incompatability between javascript and webkit.
2008-07-25 01:24:20 -04:00
7538d356c8
Support staging commands in bzr backend.
2008-07-24 22:43:57 +02:00
58e2b2c99c
mercurial: Add support for rename, delete, and also diff. (William Uther)
2008-07-24 14:17:04 -04:00
c2f621cb1c
fix encoding issues with link conversion
...
Have to convert link text to page name going in.
And on the way out, need to replace spaces with underscores in the link
text, which is not normally done with titles.
2008-07-24 12:36:10 -04:00
8b3d2ab0bc
test suite and partial fix for encoding issues in link renaming
2008-07-23 21:04:11 -04:00
c9961ab1e9
add todo
2008-07-23 19:38:09 -04:00
762bf0b887
foldage
2008-07-23 19:25:46 -04:00
985a34b09e
fixup editpage links on rename
2008-07-23 19:20:11 -04:00
7befc6deb3
link fixup on rename working
2008-07-23 19:12:05 -04:00
4918c164e8
preserve case of subpage
2008-07-23 19:03:37 -04:00
8b063a24d9
case preservation
2008-07-23 18:57:27 -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
d9062864ee
Rebuild pages that change their type.
...
Previously, if a page changed its type but not its mtime
(e.g. mv page.txt page.mdwn), then it would not be rebuilt.
Now, check if the source of a page has changed,
in which case force a rebuild of that page.
(cherry picked from commit b6a3b8a683fed7a7f6d77a5b3f2dfbd14c849843)
2008-07-23 16:00:26 -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
29f32d0ba3
add a list of broken links after the rename
2008-07-22 20:30:54 -04:00
1c9a3cb82b
add a rename summary
2008-07-22 20:17:03 -04:00
d76c10cba2
Split out error messages from editpage.tmpl into several separate templates.
2008-07-22 19:58:34 -04:00
2b9615194e
fix gettext
2008-07-22 19:44:31 -04:00
421559b230
edit page fixup in postrename
2008-07-22 18:17:11 -04:00
89b3bb7e38
check for absolute paths
2008-07-22 17:38:31 -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
cf9620074a
qualifiy
2008-07-22 15:07:07 -04:00
bac47cdecd
make message a bit more generic
2008-07-22 15:06:59 -04:00
cbf1c8b810
rename checks improvements
2008-07-22 14:01:23 -04:00
569d31d875
permission checking improvements
...
Break out into function so it can be done up-front before confirmation too.
2008-07-22 13:29:54 -04:00
ac1226031e
avoid uninitialised value
2008-07-22 13:23:11 -04:00
a3e16cd29f
really add
2008-07-21 22:44:37 -04:00
0c9fe2f99c
use check_canattach
...
As noted, this may be overkill..
2008-07-21 22:44:19 -04:00
f9cbe871ad
factor out check_canattach
...
Other plugins will need to use this.
2008-07-21 22:41:31 -04:00
96c529826d
skeleton rename plugin
2008-07-21 22:30:43 -04:00
ed05e40566
error if nothing selected
2008-07-21 22:11:24 -04:00
6e243a45e5
probably redundant symlink check
2008-07-21 21:57:58 -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
09a5cdbb34
Don't prepend tagbase to tags if they start with "./" or "/".
...
That syntax made little sense previously, and this allows sites to put
"most" of their tags under $tagbase.
2008-07-21 22:02:55 +01:00
97e21ae21c
don't show an error if the image is missing, instead, a broken link
2008-07-21 16:53:52 -04:00
7910f1c352
remove debugging
2008-07-21 16:53:46 -04:00
d724a26754
avoid internal error message when img uses just-deleted page
...
I think this used to be a fatal error, not just inline error, so I don't
know why it was never noticed, but if a page that an img directive mentions
gets deleted, bestlink() returns a file that no longer exists, and
srcfile() throws an error.
Note that bestlink's behavior of returning a deleted file could be
considered buggy. But, if it's changed to not do that, the page with the img
on it is not updated at all when the file is removed.
2008-07-21 16:38:40 -04:00
d9af10a1be
typos
2008-07-21 16:21:59 -04:00
90de84b442
typos
2008-07-21 16:21:46 -04:00
b182f5e573
need to untaint..
2008-07-21 16:20:02 -04:00
2461ce0de6
a few bugfixes
...
Including a check the the file is in the srcdir, as opposed to some other
directory.
2008-07-21 16:18:28 -04:00
af9c5e4bba
support for removing attachments
2008-07-21 15:02:29 -04:00
a1df39ed4a
simplified confirmation form
...
also, there's no titlepage conversion issues
2008-07-21 14:22:57 -04:00
b1b5860b29
touchups
2008-07-21 14:03:39 -04:00
494e7ab8ba
redirect after removal
2008-07-21 13:53:34 -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
a204f86786
form tweaks; use title
2008-07-21 13:31:58 -04:00
b286ce04cb
implemented form state saving and retrieval
...
This is overkill for delete, since it's only used on Cancel. But it will be
crucial for rename, so as to restore any pending edits after renaming a
page.
2008-07-21 13:23:07 -04:00
8e7b31a19c
basic removal form skeleton
2008-07-21 12:54:23 -04:00
46617c23f4
rename skeleton.pm
...
Add '.example' so it's not installed with the other plugins.
2008-07-21 07:49:28 -04:00
e3b0584a49
Use correct term prefixes when searching.
...
The Z term prefix is for stemming and shouldn't be used here.
X is for custom fields.
2008-07-19 13:23:02 -04:00
2c9ab7065e
mark old web commits as from web
2008-07-17 19:25:10 -04:00
e8a11957df
fix web commit determination
2008-07-17 19:23:00 -04:00
afd3126e55
dummy up an email address for web commits
...
Not doing so breaks cia and other things that try to parse a username out
of the email address.
2008-07-17 19:12:34 -04:00
1b318dacbd
git: Fix parsing of git logs with no commit messages at all.
2008-07-17 16:53:54 -04:00
f66eddccc6
change how web commits are specified
...
The trailer line was a bit complex and ugly;
I think it's better to just put "(web)" after the user
name.
This has a side effect of making web commits with no messages
have a completly empty commit message. Use --cleanup=verbatim
to force git to accept such.
2008-07-17 16:35:18 -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
c4f124d78a
fix pos setting
...
What was really going on is that expanding a smiley modified the string and
reset the match process. Force set pos so it continues on from the expanded
smiley.
2008-07-17 13:11:47 -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
3096c8ea69
formatting etc
2008-07-16 17:43:42 -04:00
2c05a34be1
Merge commit 'intrigeri/pedigree'
2008-07-16 17:31:15 -04:00
35668b87d3
pedigree rename to parentlinks: rename/adapt everything
...
* Renamed to parentlinks every single variable or function called
pedigree
* Removed the parentlinks function from Render.pm
* Enabled the new parentlinks plugin by default
* Adapted testsuite and documentation to reflate the above facts
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-07-15 16:25:39 +02:00
486f460132
pedigree rename to parentlinks: renamed files, to start with
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-07-15 16:09:40 +02:00
55000fd779
pedigree: rewrote with different design
...
(and updated testsuite + docs accordingly)
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-07-15 13:06:52 +02:00
2696e0c6db
fixes
2008-07-14 23:00:29 -04:00
76bda69a92
use prune to delete rendered files
...
This handles deleting empty directories too.
2008-07-14 22:45:12 -04:00
b29d11b3c6
Fix aggregateinternal migration so it skips expired entries, and deletes output
2008-07-15 03:24:05 +01:00
Joey Hess
Enrico Zini
Jelmer Vernooij
Gabriel McManus
Simon McVittie
intrigeri