502cd00ec7
Allow the snews: URI scheme.
2008-02-10 15:05:11 -08:00
ec9d3ab549
Do not allow the steam: URI scheme.
2008-02-10 14:59:08 -08:00
3cda22a27f
Match literal '.' in URI schemas containing '.', rather than matching any character
2008-02-10 14:50:30 -08:00
bbcf878f75
* meta: Check that the urls provided for authorurl, permalink, and openid
...
are safe and can't contain javascript.
2008-02-10 17:17:44 -05:00
4bfdbd4858
export $safe_url_regexp
2008-02-10 17:07:21 -05:00
d20e24b636
Also filter the attributes cite, longdesc, and usemap, which can contain URIs
2008-02-10 13:59:37 -08:00
2078f706d6
add parens around scheme regexp
2008-02-10 16:29:46 -05:00
a7be7bdf56
Do not allow the about: URI scheme
...
Some browsers interpret about: URIs like a limited version of data:
URIs. In particular, some versions of Internet Explorer interpret
arbitrary HTML content in about: URIs.
2008-02-10 13:23:28 -08:00
dfd6bb3854
fix data:image handling
2008-02-10 15:24:03 -05:00
d7e0c035e5
* htmlscrubber security fix: Block javascript in uris.
...
* Add htmlscrubber test suite.
2008-02-10 13:16:40 -05:00
122f6df325
Merge branch 'master' into prefix-directives
...
Conflicts:
debian/changelog
templates/change.tmpl
2008-02-09 23:02:52 -08:00
f1fcb5be9c
* Page templates can now use CTIME to show when the page was created.
2008-02-09 23:05:48 -05:00
63e316f362
* Don't die if running with --getctime and rcs_getctime throws an error.
...
There are several cases (recentchanges files, aggregated files)
where some source files are not in revision control.
2008-02-07 22:11:54 -05:00
a4b2e77077
add support for prefix_directives
2008-02-05 16:14:38 -05:00
f64ef7deb6
proper fix for the preview/will_render issue
2008-02-04 18:46:34 -05:00
b37dc9c926
preview shouldn't show the feed buttons or post form
2008-02-04 18:44:54 -05:00
bf522a347f
* inline: Add new `allowrss` and `allowatom` config options. These can be
...
used if you want a wiki that doesn't default to generating rss or atom
feeds, but that does allow them to be turned on for specific blogs.
2008-02-04 18:36:50 -05:00
85de2f7bc4
the old code worked, suprisingly, but I prefer this form
2008-02-04 18:05:40 -05:00
d1c4899a22
* inline: When previewing, still call will_render on rss/atom files,
...
just avoid actually writing the files. This is necessary because ikiwiki
saves state after a preview (in case it actually *did* write files),
and if will_render isn't called its security checks will get upset
when the page is saved. Thanks to Edward Betts for his help tracking this
tricky bug down.
2008-02-04 17:58:23 -05:00
a3f224cb6c
move saveindex call into preview block
...
This call is only present to handle the case where previewing a page
actually causes files to be rendered.
2008-02-03 19:51:00 -05:00
408419ca3e
remove another commit mail mention
2008-02-03 19:47:01 -05:00
27d5f91a18
remove spurious EOF
2008-02-03 18:16:19 -05:00
749c1e36d9
* monotone changes by Brian May:
...
- On commits, replace "mtn sync" bidirectional with "mtn push" single
direction. No need to pull changes when doing a commit. mtn sync
is still called in rcs_update.
- Support for viewing differences via patches using viewmtn.
2008-02-03 18:14:39 -05:00
9d54cc4659
implement aggregate_locking design
...
Now aggregation will not lock the wiki. Any changes made during aggregaton are
merged in with the changed state accumulated while aggregating. A separate
lock file prevents multiple concurrent aggregators. Garbage collection
of orphaned guids is much improved. loadstate() is only called once
per process, so tricky support for reloading wiki state is not needed.
(Tested fairly thuroughly.)
2008-02-03 16:48:26 -05:00
38affb0c1c
add aggregate locking functions
2008-02-03 15:17:15 -05:00
e57749b702
* recentchanges: Exipre all *._change pages, even if the directory
...
they're in has changed.
2008-02-03 14:51:03 -05:00
340fe9707c
* recentchanges: Improve handling of links on the very static changes pages
...
by thunking to the CGI, which can redirect to the page, or allow it to be
created if it doesn't exist.
2008-02-03 14:48:20 -05:00
42e5b8dfdc
prototype fix
2008-02-03 14:22:25 -05:00
1f6591f0a6
* aggregate: Revert use of forking to not save state, that was not the right
...
approach.
2008-02-03 03:04:19 -05:00
9f60272831
* poll: This plugin turns out to have edited pages w/o doing any locking.
...
Oops. Convert it from a cgi to a sessioncgi hook, which will work
much better.
2008-02-03 00:26:00 -05:00
80915c830a
* cgi hooks are now run before ikiwiki state is loaded.
...
* This allows locking the wiki before loading state, which avoids some
tricky locking code when saving a web edit.
2008-02-03 00:23:04 -05:00
0779013683
* aggregate: Forking a child broke the one state that mattered: Forcing
...
the aggregating page to be rebuilt. Fix this.
2008-02-02 23:56:13 -05:00
6a7c3d1209
* Revert preservation of input file modification times in output files,
...
since this leads to too many problems with web caching, especially with
inlined pages. Properly solving this would involve tracking every page
that contributes to a page's content and using the youngest of them all,
as well as special cases for things like the version plugin, and it's just
too complex to do.
2008-02-02 23:40:57 -05:00
870adf3bbf
move openiduser function to the openid plugin
2008-01-30 02:39:17 -05:00
55e16be44a
move recentchanges link enabling into a pagetemplate hook
2008-01-30 02:29:12 -05:00
246e93a300
Expand file-id in diffurl in the bzr backend.
2008-01-30 02:29:28 +01:00
4284719464
rename bazaar -> bzr after discussion with jelmer
2008-01-29 19:48:30 -05:00
381ac0f667
commit only the changed file
2008-01-29 19:44:26 -05:00
274fb90026
stylistic changes
...
Remarkably few. Also, I removed the stub for the obsolete rcs_notify function.
2008-01-29 19:36:35 -05:00
cddc335b2b
Merge git://git.samba.org/jelmer/ikiwiki
2008-01-29 19:28:51 -05:00
f584abec0c
really fix the baseurl problem
...
the issue is that HTML::Template doesn't expand top-level variables when inside
a loop
2008-01-29 18:19:47 -05:00
9e15bd27ea
avoid temp var
2008-01-29 18:07:20 -05:00
7125c7269a
don't scan internal pages
...
scan() does too much. All that is needed is to preprocess the internal page
in scan-only mode.
2008-01-29 18:06:36 -05:00
3803266b8f
merged the recentchanges branch
...
misc fixes
2008-01-29 17:50:11 -05:00
7a40bcab9a
add missing test to avoid uninitialised value when a page with metadata is removed
2008-01-29 17:36:25 -05:00
64a8c828b8
* meta: Add pagespec functions to match against title, author, authorurl,
...
license, and copyright. This can be used to create custom RecentChanges.
* meta: To support the pagespec functions, metadata about pages has to be
retained as pagestate.
* Fix encoding bug when pagestate values contained spaces.
2008-01-29 17:16:51 -05:00
bc49e284ac
make the author metadata for changes pages be the un-munged openid
2008-01-29 16:05:31 -05:00
9875bc10d1
avoid redundant recentpages action on the recentchanges page itself
2008-01-29 15:53:49 -05:00
8b31c53366
added configuration for recentchanges
...
I kept it to a simple global configuration, rather than using the
preprocessor directive for recentchanges, because that had chicken and egg
problems and seemed overcomplicated. This should work reasonably well,
though it would be good to add some more metadata so that more customised
recentchanges pages can be made.
2008-01-29 15:51:32 -05:00
cabd5140c4
add code to delete old change pages
2008-01-29 15:22:23 -05:00
47ee266163
improve support for internal pages
...
This makes it a lot quicker to deal with lots of recentchanges pages
appearing and disappearing. It avoids needing to clutter up pagespecs with
exclusions for those pages, by making normal pagespecs not match them.
2008-01-29 15:05:49 -05:00
35bc35660c
use new refresh hook
2008-01-29 13:08:48 -05:00
e1ce482e41
add refresh hook
2008-01-29 13:08:32 -05:00
a5ad70a8dc
updates
2008-01-29 12:59:49 -05:00
152f32547f
indicate that an internal page will be rendered even if skipping it
...
This is important to do because until will_render is called, ikiwiki doesn't
know that the page exists. This avoids recentchanges re-writing every change
page every run.
2008-01-29 12:39:28 -05:00
598d338b11
escape wikilinks and preprocessor directives
2008-01-29 12:37:39 -05:00
7a4b7b1964
update RecentChanges action to point to page
2008-01-29 12:20:17 -05:00
85eb1abc61
typo
2008-01-29 04:45:54 -05:00
38e79f206e
more style improvements
2008-01-29 04:44:05 -05:00
21f44880cd
non-tabular recentchanges display
...
Doesn't look as good as the old table, but works as a rss feed.
2008-01-29 01:48:55 -05:00
d2a3695376
some parameteraisation and generalisation
2008-01-29 01:03:15 -05:00
d7fdd04b5a
* Removed support for sending commit notification mails. Along with it went
...
the svnrepo and notify settings, though both will be ignored if left in
setup files.
2008-01-29 00:36:58 -05:00
2ff726e875
don't render internal-use pages, and document them
2008-01-29 00:07:55 -05:00
5921b86fcc
proof of concept implementation of static recentchanges
...
Currently hardcoded to write to recentchanges/*, and the page format needs
to be rethought to be usable for aggregation, but it basically works.
2008-01-28 23:56:26 -05:00
2d3dc86d07
* prettydate,ddate: Don't ignore time formats passed to displaytime
...
function.
2008-01-28 23:48:27 -05:00
0d2894711c
support for internal-use page types
...
If a page type starts with an underscore, hide it from the list of page types
in the edit form, and don't allow editing pages of that type. This allows
for plugins to add page types for internal use.
2008-01-28 23:08:48 -05:00
29f3082772
move userlink to IkiWiki.pm
...
I have a plugin that needs to use userlink.
2008-01-28 22:58:31 -05:00
9f25e3436b
change rcs_recentchanges when to absolute, not relative, time
...
No point in using a relative time value in rcs_recentchanges. Different
consumers of the info want different things.
2008-01-28 22:57:22 -05:00
ad4f7bc075
remove debug message
...
This can legitimately happen when there's a simple merge.
2008-01-28 22:47:43 -05:00
0f95adbd1d
Merge branch 'master' into recentchanges
2008-01-28 21:24:15 -05:00
e30b96baba
figured out how rev is used..
2008-01-28 21:23:56 -05:00
3436fed081
* inline: The template can check for FIRST and LAST, which will be
...
set for the first and last inlined page. Useful for templates that build
tables and the like.
2008-01-28 21:22:04 -05:00
b11ddb88e6
add an id field to the rcs_recentchanges return structure
...
There was an undocumented field named "rev", I think "id" is a better name,
and nothing uses it yet.
2008-01-28 20:34:11 -05:00
161947160b
remove extraneous quoting
2008-01-28 18:01:51 -05:00
84d3856512
test1
2008-01-28 17:41:02 -05:00
df32ad1139
really fix comment
...
It doesn't really make sense to do notification from a post-commit hook.
2008-01-28 17:36:36 -05:00
52b16186c4
update comment
...
This is not only called from post-update in all configurations. Also, the
comment was innaccurate about what the post-update hook is passed.
2008-01-28 17:33:22 -05:00
d3f91f37ff
Finish bazaar backend and make the remaining test pass.
2008-01-28 07:30:37 +01:00
0be7aad67d
Initial work adding support for Bazaar.
2008-01-28 06:16:56 +01:00
fafb2edaa7
aggregate.pm: Replace Unicode apostrophe with ASCII to unbreak build
...
gettext choked on a Unicode apostrophe in the aggregate plugin, which
appeared in a new error message in commit
4f872b5633
2008-01-26 23:12:29 -08:00
4f872b5633
* aggregate: Fork a child process to handle the aggregation. This simplifies
...
the code, since that process can change internal state as needed, and
it will automatically be cleaned up for the parent process, which proceeds
to render the changes.
2008-01-24 17:22:39 -05:00
6d85ccdb6f
Add full parser for git diff-tree output
...
The -c option to git log/diff-tree produces "merged" diffs with a
different format from normal ones. However, the existing diff-tree
parser only accepted non-merged diff lines. Merged diff lines caused
the parser to get out of sync. This patch adds a full parser for diffs
with any number of parents. See the "DIFF FORMAT FOR MERGES" section in
the git-diff-tree man page for more information.
Signed-off-by: Brian Downing <bdowning@lavos.net>
2008-01-17 11:15:23 -05:00
ba6b8e5e3e
* aggregate: Don't let feeds set creation times for pages in the future.
2008-01-16 02:01:00 -05:00
81c726982b
I've wrote a little patch for the bug in teximg (can only include fomula on
...
one page).
2008-01-09 20:04:51 -05:00
141d363888
In preferences, allow the subscriptions and email fields to be cleared
2008-01-09 17:59:56 -05:00
e01960e90a
not only markdown adds gunk, so remove it in the main htmlize function
2008-01-09 14:41:28 -05:00
2b9ce0129b
* mdwn: When htmlizing text, if it's a single line with no newline,
...
remove the enclosing paragraph and newline markdown wraps it in.
This allows removing several hacks around this markdown behavior from
other plugins that htmlize fragements of pages.
2008-01-09 14:35:23 -05:00
57ff2ecaed
* template: Remove bogus htmlize pass added in 2.16.
...
* template: Htmlize template variables, but also provide a raw version
via `<TMPL_VAR raw_variable>`.
2008-01-09 14:17:25 -05:00
adb1bc8761
don't process data metadata in scan, as it's expensive and the metadata should not be needed so early
2008-01-09 02:41:38 -05:00
deb39a1f14
* meta: Run in scan mode again (more intelligently) and re-add support for
...
meta link.
* Fix support for the case where metadata appears after an inline directive.
This was broken in version 2.16.
2008-01-09 02:38:43 -05:00
a654a72fda
optimisation: detect scan mode and avoid generating image
2008-01-09 02:31:11 -05:00
b31e8c0826
* inline: Add copyright/license info on a per-post basis to atom
...
feeds if available. (rss doesn't allow such info on a per-post basis)
* meta: Allow copyright/license metadata to contain arbitrary markup.
2008-01-09 01:05:54 -05:00
86781fc43e
* aggregate: Include copyright statements from rss feed as meta copyright
...
directives.
* aggregate: Yet another state saving fix (sigh).
* aggregate: Add hack to support feeds with invalidly escaped html entities.
2008-01-08 20:41:25 -05:00
4c1a4402f9
* htmlscrubber: Further work around #365971 by adding tags for 'br/', 'hr/'
...
and 'p/'.
2008-01-07 18:32:50 -05:00
e35eb5a418
* Add a prereq on Data::Dumper 2.11 or better, needed to dump q// objects.
2008-01-07 18:12:12 -05:00
dcf342f366
add explicit test for do=postsignin
...
This happens when openid auth fails in certian ways
2008-01-07 16:39:49 -05:00
d7b2bb13d1
fixes
2008-01-07 16:37:19 -05:00
c34895364f
fixes
2008-01-07 16:35:16 -05:00
c487b847e2
* Improved the canedit hook interface, allowing a callback function to be
...
returned (and not run in some cases) rather than the plugins directly
forcing a user to log in.
* opendiscussion: allow editing of the toplevel discussion page,
and, indirectly, allow creating new discussion pages.
2008-01-07 16:34:13 -05:00
45de8dc710
* opendiscussion: allow editing of the toplevel discussion page
2008-01-07 16:10:32 -05:00
Josh Triplett
Joey Hess
Jelmer Vernooij
Brian Downing
Patrick Winnertz