Commit Graph

2738 Commits (2076ed597c02bfede9063c3d40f4b855d4e8f8b8)

Author SHA1 Message Date
Joey Hess 2076ed597c txt: Fix display when used inside a format directive.
txt's use of a format hook can't work in that case, so it needs to use a
htmlizeformat hook in this case to handle wrapping the text in pre tags.
2010-10-25 22:37:34 -04:00
Joey Hess 5db2d6f6b2 nice message if someone tries to revert a merge commit 2010-10-23 17:19:48 -04:00
Joey Hess 62a0f2f3d6 bugfix 2010-10-23 16:31:58 -04:00
Joey Hess 9ca9959eda fix web reversion when the srcdir is in a subdir of the git repo. 2010-10-23 16:19:16 -04:00
Joey Hess 1c5a3f2c67 Fix typo that broke anonymous git push. 2010-10-23 15:25:29 -04:00
Joey Hess 9b832df0d2 add a missing chomp 2010-10-19 21:38:34 -04:00
Joey Hess 8555d10f63 img: If a class is specified, don't also put the img in the img class. 2010-10-13 12:57:16 -04:00
Joey Hess 7ba0f7d297 monotone: Fix recentchanges page when the srcdir is not at the top of the monotone workspace. Thanks, tommyd. 2010-10-11 20:30:14 -04:00
Joey Hess cfbd272c8b websetup: Fix defaults of checkboxes in advanced mode.
So formbuilder has an annoying glitch, that setting the value of a
checkbox, even without force, will override the value currently on the
form. Thus the guards against changing checkbox values when a form has been
submitted.

But those guards also prevented the checkboxes for advanced items getting
the right value when going into advanced mode.

Note that if the user makes changes to advanced mode stuff and leaves
advanced mode, those changes are lost. That seems reasonable so I didn't
change it -- and it made this fix simple.
2010-10-11 11:41:34 -04:00
Joey Hess 274219ecc8 websetup: Fix saving of advanced mode changes.
The showadvanced field was not known to formbuilder when hitting the save
changes button.
2010-10-11 11:12:41 -04:00
Joey Hess 9aa9604c36 add blank line 2010-10-08 19:26:31 -04:00
Joey Hess 7d5ac1cdd9 typo 2010-10-08 19:25:35 -04:00
Joey Hess 7e9ca590c7 add message field to revert form 2010-10-08 19:19:43 -04:00
Joey Hess fb4ee927a0 propigate rcs_revert error message
and misc reorg
2010-10-08 18:59:04 -04:00
Joey Hess 4efc1f22d4 taint handling for rev 2010-10-08 18:58:47 -04:00
Joey Hess c430792148 refactor 2010-10-08 18:50:24 -04:00
Joey Hess e7d6dcfed6 remove todo item
I understand the need to avoid chdir when running git_parse_changes
for receive now. At that point, the changes have not been pushed to
the srcdir's repo yet. When running the same code for preprevert,
chdir to the srcdir is ok, and necessary.
2010-10-08 18:46:30 -04:00
Joey Hess faf94b5787 refactor check_canchange into IkiWiki library 2010-10-08 18:09:28 -04:00
Joey Hess 5c6f7a8d1b fix rcs_prepedit implementation to match spec 2010-10-08 18:02:47 -04:00
Joey Hess 84111d96c4 make revert hooks optional
I removed the IkiWiki::rcs_ stubs for the revert hooks. Instead
recentchanges tests to see if the hooks are available and calls
them directly.
2010-10-08 17:54:12 -04:00
Joey Hess 238e8b95a5 convert rcs_revert to only stage the reversion 2010-10-06 15:08:12 -04:00
Joey Hess 58a0698d92 return to recentchanges page on form cancel 2010-10-06 15:02:06 -04:00
Joey Hess d4fd8cd67d put diff at end of revert form 2010-10-06 15:00:48 -04:00
Joey Hess 237ea79d71 remove rcs_showpatch 2010-10-06 14:39:10 -04:00
Joey Hess fe582418d2 remove debugging dumper code 2010-10-04 16:56:21 -04:00
Joey Hess 3dce3cc1be indentation and layout 2010-10-04 16:56:04 -04:00
Joey Hess 80da2b2840 fix $git_root caching 2010-10-04 16:35:17 -04:00
Joey Hess f025923d14 fix indentation 2010-10-04 16:33:36 -04:00
Joey Hess 3f3aab3793 document new rcs reversion support functions 2010-10-04 16:22:50 -04:00
Joey Hess 68670cad82 indentation 2010-10-04 16:03:00 -04:00
Joey Hess 49ef98505a fix bug if git_root is "0" 2010-10-04 16:01:21 -04:00
Joey Hess 252e3f6006 Merge remote branch 'remotes/peteg/revert' into revert 2010-10-04 15:59:45 -04:00
Joey Hess bd48ff734a fixups tidy change
Need checkconfig hook; examples don't become default values.
2010-10-02 12:02:34 -04:00
Peter Gammie 7d1c3aa1cb Minor tidy-ups. 2010-10-01 14:08:07 +10:00
Peter Gammie 8024a2636f Complete rcs_preprevert and lightly test. 2010-10-01 14:06:00 +10:00
W. Trevor King 408ee89fd7 Make tidy command line configurable for the htmltidy plugin. 2010-09-30 08:09:29 -04:00
Peter Gammie 941755e466 Get things right after moving to a branch. 2010-09-29 15:43:44 +10:00
Peter Gammie acecbad0ff First cut at the revert plugin. 2010-09-29 15:14:19 +10:00
Joey Hess e22b18aabc template_depends: throw nice error message when template cannot be found
plovs reported a crash when templates were not installed properly,
with a non-useful error about the template object not being defined.
I've audited all uses of template_depends(), and template(), and it makes
sense for them to throw an error if the template cannot be found. All code
with a user-supplied template catches errors already, to handle template
parse failures.

It did not make sense for template_file to throw errors, as some code uses
it to probe if a template file is available.
2010-09-27 15:58:01 -04:00
Joey Hess 00595b62be avoid fatal error if aggregate page template could not be found
That template is user-controlled.
2010-09-27 15:44:04 -04:00
Joey Hess 1334695f4c Merge remote branch 'remotes/smcv/ready/htmlbalance' 2010-09-26 22:44:52 -04:00
Joey Hess 1883e31de2 Propigate PATH into wrapper.
In the last version, the ikiwiki script stopped setting PATH.
But that leads to gcc failing when run from websetup. See
http://www.branchable.com/bugs/Crashes_when_rebuilding_wiki_after_setup_change/
2010-09-26 22:27:46 -04:00
Simon McVittie 5876968fa1 htmlbalance: be compatible with HTML::Tree 4.0
The HTML::Tree changelog says:

    [THINGS THAT MAY BREAK YOUR CODE OR TESTS]
    ...
    * Attribute names are now validated in as_XML and invalid names will
      cause an error.

and indeed the regression tests do get an error.
2010-09-26 22:33:54 +01:00
Joey Hess 90bc68589e attachment: Fix attachment file size display. 2010-09-21 15:33:42 -04:00
Joey Hess 8063b960ad meta: Ensure that the url specified by xrds-location is absolute.
With a relative xrds-location, the openid perl client module will fail.
I haven't checked the specs to see if it needs to be absolute, but all
examples I've seen are absolute, so it seems a very good idea.
2010-09-19 20:15:34 -04:00
Joey Hess 2ca4ff8ae6 add missing space 2010-09-19 20:04:31 -04:00
Joey Hess 884835ce1c cutpaste: Fix bug that occured in some cases involving inlines when text was pasted on a page before being cut. 2010-09-15 16:24:50 -04:00
Joey Hess cd794613b6 git: When updating from remote, use git pull --prune, to avoid possible errors from conflicting obsolete remote branches. 2010-09-14 15:45:38 -04:00
Joey Hess 0ff945ddf1 external: Disable RPC::XML's "smart" encoding, which sent ints for strings that contained only a number, fixing a longstanding crash of the rst plugin. 2010-09-14 15:37:45 -04:00
Joey Hess e0898ae1a8 blogspam: Fix crash when content contained utf-8.
I also tried setting RPC::XML::ENCODING but that did not prevent the crash,
and it seems that blogspam.net doesn't like getting xml encoded in unicode,
since it mis-flagged comments as spammy that way that are normally allowed
through.
2010-09-14 15:23:28 -04:00