Commit Graph

8080 Commits (e51089e11fc1093a253fc13ebfbd5d55912eba59)

Author SHA1 Message Date
Joey Hess bf386e22f5 inline: Fix handling of rootpage that doesn't exist.
It makes sense to use bestlink to determine which page rootpage refers to,
but if no page matches, just use the raw value.
2008-10-01 17:29:03 -04:00
Joey Hess f2b1a918b0 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2008-10-01 17:24:50 -04:00
Joey Hess 06de9da609 first review 2008-10-01 17:23:46 -04:00
Plareplane 8e77b66aae 2008-10-01 17:01:58 -04:00
Joey Hess f7431af308 add padding between inlined page title and content
Some aggregated contents do not include a span element, so there was zero
padding without this.
2008-10-01 16:49:56 -04:00
Joey Hess 6310b05e22 typo 2008-10-01 15:55:50 -04:00
Joey Hess 18b1c7f012 Merge branch 'tova' 2008-10-01 15:54:10 -04:00
Joey Hess aba53047af remove external image
The image is no longer on manoj's machine, and this wiki should not
rely on images hosted by third parties.

Manoj, if you'd like to add this image into ikiwiki's docs, we could talk
about that.
2008-10-01 15:34:12 -04:00
Joey Hess 7308f3da5b Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2008-10-01 14:47:49 -04:00
Joey Hess 826af4600a fix subpage rename bug with indexpages
If indexpages is enabled, then foo/index.mdwn will look like a subpage
of foo, so an additional check is needed to avoid trying to rename it
twice.
2008-10-01 14:43:28 -04:00
Joey Hess 82eac2d04e Merge branch 'master' into tova 2008-10-01 14:30:08 -04:00
Joey Hess 872e7425e4 typo 2008-10-01 14:29:59 -04:00
Joey Hess 5599a5bfb5 typo 2008-10-01 14:06:52 -04:00
bremner e21b190be2 2008-10-01 08:12:14 -04:00
Joey Hess 85ec27ab58 Merge branch 'master' into tova
Conflicts:

	debian/changelog
2008-09-30 21:04:22 -04:00
Joey Hess 0651e86a4c httpauth: Document that ikiwiki.cgi has to be in a directory subject to authentication. Closes: #500524 2008-09-30 21:03:51 -04:00
tschwinge 335049c5c4 The plugins have been rewritten and now should function properly. 2008-09-30 17:44:47 -04:00
Joey Hess 2bfbad7af4 Merge branch 'master' into tova 2008-09-30 16:35:44 -04:00
Joey Hess b5bc0e812d don't say rebuilding wiki when refreshing
If run w/o --refresh, it should still say "refreshing wiki", if there's no
setup file specifed.
2008-09-30 15:40:08 -04:00
Joey Hess 4a2b401fd0 interesting bug 2008-09-30 15:16:45 -04:00
Joey Hess 3ef2824350 add test for empty, and for entirely negated pagespecs 2008-09-30 15:06:12 -04:00
Joey Hess 0ca14589f3 close 2008-09-30 12:58:17 -04:00
bremner 3e600a67f4 mention a demo site for plugin 2008-09-30 10:04:48 -04:00
http://www.cse.unsw.edu.au/~willu/ 7ff6251d7b Response 2008-09-30 02:16:20 -04:00
Joey Hess d9dc2c6be5 remove testing code, accidentially committed 2008-09-29 19:09:53 -04:00
Joey Hess 733171bf3f support indexpages 2008-09-29 19:08:12 -04:00
Joey Hess 4c635fe225 update 2008-09-29 19:02:02 -04:00
Joey Hess 121efb246f Removed the pagefile function, which was confusingly close in name to
newpagefile.

Note that newpagefile is not used here (or in recentchanges) because
the internal use pages they generate are transient and unlikely to
benefit from being put each in their own subdir.
2008-09-29 18:59:20 -04:00
Joey Hess 2ba168ac83 use newpagefile 2008-09-29 18:52:42 -04:00
Joey Hess 2d45a303e2 add newpagefile function 2008-09-29 18:51:16 -04:00
Joey Hess a7fd6debc5 support indexpages when renaming pages
Note that the page filename code used here and in editpage are identical..
2008-09-29 18:29:53 -04:00
Joey Hess 41d7ccfa79 close todo about this 2008-09-29 18:24:36 -04:00
Joey Hess 40007b8111 support indexpages when creating new pages
Initial draft, may need to factor new page filename code out into helper
function if other plugins need to do the same..
2008-09-29 18:19:44 -04:00
Joey Hess 799bcbcd47 Merge branch 'master' into tova 2008-09-29 18:11:32 -04:00
Joey Hess 0d3878896f Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2008-09-29 18:10:19 -04:00
Joey Hess bb4211e326 avoid unnecessarily rebuilding pages with complex conditionals
I noticed that ikiwiki/formatting was beilg rebuilt when any page changed.
This turned out to be because it contained a complex conditional
"enabled(foo) or enabled(bar)", and the conditional plugin did not notice
that this consisted only of enabled() tests, and copied it unchanged into
add_depends. Thus, the page's dependencies were satisfied by any page
change.

The fix is to beef up the parser so that it can handle that and more
complex conditionals, and detect if they consist only of such tests.
2008-09-29 18:05:39 -04:00
Joey Hess a9d7c5453a Add indexpages option
This is the easy part of supporting foo/index.mdwn sources for page foo.

Note that if foo.mdwn exists too, there will be a warning about multiple
sources for the same page, and which is used is indeterminate.

indexpages should also cause web based editing to create index source pages
by default; this and other fallout of the option not yet implemented.
2008-09-29 17:30:30 -04:00
Joey Hess 1f1867a6fc update 2008-09-29 17:26:39 -04:00
Joey Hess fa620b1eca more changes for removal of blog page 2008-09-29 17:23:38 -04:00
Joey Hess 6b01fca253 use gettext 2008-09-29 17:06:56 -04:00
http://josephturian.blogspot.com/ a44d9d8e12 2008-09-29 16:17:26 -04:00
Joey Hess 71affd80d7 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2008-09-29 13:26:52 -04:00
Joey Hess c4be16703f fix handing of case of file first created by preview but then saved
To handle this, avoid populating %renderedfiles in preview,
and in expiry, check if the file is in %renderedfiles, if it is
do not delete it since it was saved.
2008-09-29 13:25:31 -04:00
http://josephturian.blogspot.com/ 9b27983808 2008-09-29 00:03:23 -04:00
chrysn 714de9f101 response 2008-09-28 05:47:20 -04:00
Joey Hess d4ac1c750e response 2008-09-27 21:13:35 -04:00
http://www.cse.unsw.edu.au/~willu/ 66eb48ebcd Thoughts on the new wikistate variable 2008-09-27 20:03:15 -04:00
Joey Hess 2ff3c8aee7 editpage: Be more aggressive (and less buggy) about cleaning up temporary files rendered during page preview. 2008-09-27 18:02:33 -04:00
Joey Hess a5d3acd37c Add %wikistate, which is like %pagestate except not specific to a given page, and is preserved across rebuilds. 2008-09-27 16:45:27 -04:00
Joey Hess 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