Commit Graph

6937 Commits (18d24036477223794e8319428cd7ba971129c29c)

Author SHA1 Message Date
Joey Hess 18d2403647 Merge branch 'master' into tova
Conflicts:

	debian/changelog
2008-07-21 17:27:50 -04:00
Joey Hess 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
Joey Hess c323a51efb remove test 2008-07-21 17:18:14 -04:00
Joey Hess fcbdc3f05b test 2008-07-21 17:16:10 -04:00
Joey Hess 9a8b0744a3 typo 2008-07-21 17:15:12 -04:00
Joey Hess 9187e53575 test 2008-07-21 17:14:43 -04:00
Joey Hess b884cbd00f response 2008-07-21 17:12:17 -04:00
Joey Hess 09331644a2 changelog 2008-07-21 17:06:40 -04:00
Joey Hess edfe869381 Merge commit 'smcv/master' 2008-07-21 17:05:40 -04:00
Simon McVittie 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
Joey Hess 97e21ae21c don't show an error if the image is missing, instead, a broken link 2008-07-21 16:53:52 -04:00
Joey Hess 7910f1c352 remove debugging 2008-07-21 16:53:46 -04:00
Joey Hess 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
Joey Hess d9af10a1be typos 2008-07-21 16:21:59 -04:00
Joey Hess 90de84b442 typos 2008-07-21 16:21:46 -04:00
Joey Hess b182f5e573 need to untaint.. 2008-07-21 16:20:02 -04:00
Joey Hess 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
Mathias 652beaf48c 2008-07-21 16:04:17 -04:00
Joey Hess af9c5e4bba support for removing attachments 2008-07-21 15:02:29 -04:00
Joey Hess a1df39ed4a simplified confirmation form
also, there's no titlepage conversion issues
2008-07-21 14:22:57 -04:00
Joey Hess b1b5860b29 touchups 2008-07-21 14:03:39 -04:00
Joey Hess 8cab4366d1 document remove plugin 2008-07-21 13:59:45 -04:00
Joey Hess 20cae78ac7 update on some of the conflict cases 2008-07-21 13:56:58 -04:00
Joey Hess 494e7ab8ba redirect after removal 2008-07-21 13:53:34 -04:00
http://smcv.pseudorandom.co.uk/ 8fbe201bb3 Fix one missed instance of a directive without [[! (it was committed after I branched) 2008-07-21 13:50:59 -04:00
Joey Hess c924c76bd8 basically, removal works
Still need to consider all the edge cases..
2008-07-21 13:50:12 -04:00
Joey Hess c6d1ae33d2 All rcs backends need to implement rcs_remove
(Done for svn, git.)
2008-07-21 13:41:17 -04:00
Joey Hess a204f86786 form tweaks; use title 2008-07-21 13:31:58 -04:00
Joey Hess 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
Joey Hess 8e7b31a19c basic removal form skeleton 2008-07-21 12:54:23 -04:00
Joey Hess 3da279ddd4 editpage: Don't show attachments link when attachments are disabled. 2008-07-21 12:15:55 -04:00
Joey Hess 3f1a81c8e5 thoughts 2008-07-21 12:08:26 -04:00
Joey Hess 4a3e16f851 prefix_directives enabled in doc wiki, all preprocessor directives converted. (Simon McVittie) 2008-07-21 11:41:32 -04:00
Joey Hess d5e65e582a Merge commit 'smcv/prefix'
Conflicts:

	doc/news/version_2.49.mdwn

Also fixed the newest news file (and my wikiannounce script).
2008-07-21 11:34:49 -04:00
Joey Hess d13200f92b add news item for ikiwiki 2.54 2008-07-21 11:20:30 -04:00
Joey Hess fede380a89 releasing version 2.54 2008-07-21 11:19:01 -04:00
Joey Hess b386fd2185 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2008-07-21 09:59:50 -04:00
Joey Hess 46617c23f4 rename skeleton.pm
Add '.example' so it's not installed with the other plugins.
2008-07-21 07:49:28 -04:00
Joey Hess 89e1e7195b elaborate on this idea 2008-07-21 07:49:07 -04:00
Simon McVittie e3a8495271 Migrate escaped directives (\[[) in the rest of doc to have \[[! prefix 2008-07-21 12:47:07 +01:00
Simon McVittie 404f54ac60 Migrate escaped directives (\[[) in doc/bugs to have \[[! prefix 2008-07-21 12:46:47 +01:00
Simon McVittie 953a959be7 Migrate escaped directives (\[[) in doc/plugins to have \[[! prefix 2008-07-21 12:46:35 +01:00
Simon McVittie 1ca63edde0 Migrate escaped directives (\[[) in doc/todo to have \[[! prefix 2008-07-21 12:45:54 +01:00
Simon McVittie 47d179802d Migrate everything else via prefix_directives
This is a partial commit of:
egrep -rl '\[\[[a-z]+ ' doc | xargs --max-args 1 ./ikiwiki-transition
prefix_directives
2008-07-21 12:32:31 +01:00
Simon McVittie 121d0f3456 Migrate doc/users via prefix_directives
This is a partial commit of:
egrep -rl '\[\[[a-z]+ ' doc | xargs --max-args 1 ./ikiwiki-transition
prefix_directives
2008-07-21 12:32:14 +01:00
Simon McVittie 297ff849b9 Migrate doc/plugins via prefix_directives
This is a partial commit of:
egrep -rl '\[\[[a-z]+ ' doc | xargs --max-args 1 ./ikiwiki-transition
prefix_directives
2008-07-21 12:31:57 +01:00
Simon McVittie dd87d82fbe Migrate doc/todo via prefix_directives
This is a partial commit of:
egrep -rl '\[\[[a-z]+ ' doc | xargs --max-args 1 ./ikiwiki-transition
prefix_directives
2008-07-21 12:31:33 +01:00
Simon McVittie 9c02d61d9b Migrate doc/bugs via prefix_directives
This is a partial commit of:
egrep -rl '\[\[[a-z]+ ' doc | xargs --max-args 1 ./ikiwiki-transition
prefix_directives
2008-07-21 12:31:04 +01:00
http://www.cse.unsw.edu.au/~willu/ 6153fd6d88 Thoughts on example setup file 2008-07-21 06:26:20 -04:00
http://www.cse.unsw.edu.au/~willu/ 19d29f4576 Update patch 2008-07-21 06:05:46 -04:00