Commit graph

452 commits

Author SHA1 Message Date
Jacques Distler 8d7381bb54 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-11-22 19:13:15 -06:00
Jacques Distler cd674bbb36 Clean up a few before_filters 2010-11-22 19:11:21 -06:00
Jacques Distler 88291ee4a2 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-11-03 23:52:06 -05:00
Jacques Distler 4be1a58a24 Update RedCloth to 4.x
Use Bundler to manage RedCloth
gem. 4.x should be much faster
and less buggy. Unfortunately,
it doesn't support mixed
Textile/Markdown syntax. So
we keep an (appropriately
renamed) copy of 3.x around,
for the users of the "Mixed"
text filter.
2010-11-03 23:32:55 -05:00
Jacques Distler 10aa983337 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-17 22:32:58 -05:00
Jacques Distler 1663d9f5c8 MathJax
For those without MathML-capable browsers,
we present MathJax. It's crappy 'n slow,
but it's better than nothing.
2010-10-17 22:30:56 -05:00
Jacques Distler d208728065 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-15 10:50:31 -05:00
Jacques Distler cebd381d0d Instiki 0.19.1
tex_list, Rails 2.3.10, etc.
2010-10-15 10:47:59 -05:00
Jacques Distler 477adeffda Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-11 11:00:00 -05:00
Jacques Distler 46da49485f More bugs in tex_list
Fix some more bugs in the new
tex_list action.
Make the drag-reorder *not*
result in a (superfluous)
AJAX request.
2010-10-11 10:57:26 -05:00
Jacques Distler a4776060a6 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-10 13:29:03 -05:00
Jacques Distler 8a989b1a7b Make reordering work in Ruby 1.8.x
I was fooled: Ruby 1.9 has ordered
hashes; 1.8 doesn't. So what I did
in Revision 689 works in Ruby 1.9,
but fails in 1.8.

Now we parse the POST params ourselves.
2010-10-10 13:24:05 -05:00
Jacques Distler 5c576f66e9 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-09 15:42:19 -05:00
Jacques Distler 9c11c384d4 Some more tweaks to the tex_list feature 2010-10-09 15:41:25 -05:00
Jacques Distler a64194806b Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-09 14:45:15 -05:00
Jacques Distler 7f7182afea A little CSS styling
Should make the drag target,
for re-ordering the pages,
a little more obvious.
2010-10-09 14:42:01 -05:00
Jacques Distler a0a11c0bc8 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-09 11:22:37 -05:00
Jacques Distler b1fcc93aa5 Test for text_list
Add a functional test for
the new feature.
2010-10-09 11:21:41 -05:00
Jacques Distler 3660f13c84 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-09 10:34:58 -05:00
Jacques Distler fece5a3486 Drag to re-order
For the previous commit, allow the user
to change the order of the LaTeX output.
2010-10-09 10:33:11 -05:00
Jacques Distler 194f10e809 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-09 03:02:26 -05:00
Jacques Distler aee4f8b3a9 Export Multiple Pages to TeX
Per a suggestion of Marco Gualtieri.
2010-10-09 02:57:37 -05:00
Jacques Distler b5481a1454 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-05 21:09:22 -05:00
Jacques Distler f6c818de8a LaTeX Export for \array
This will work for \array without
any options.

Also fix an SVG-Edit bug
2010-10-05 21:07:19 -05:00
Jacques Distler 1290dfc9ae Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-01 18:56:31 -05:00
Jacques Distler 105c1d79e7 LaTeX-style \sqrt[]{}
Fix LaTeX macros so that both (TeX-style)
\root{}{} and (LaTeX-style) \sqrt[]{} can
appear in the same file. The latter will be
supported in the next version of itex2MML.
2010-10-01 18:53:44 -05:00
Jacques Distler 98bf5a824e Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-09-28 11:06:43 -05:00
Jacques Distler 239a8d97e5 Instiki 0.19 2010-09-28 11:05:48 -05:00
Jacques Distler 1dc14ec2da Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-07-22 14:16:31 -05:00
Jacques Distler 0a87548324 Fix breakage from Revision 664
Noted by Andrew Stacey
2010-07-22 12:44:14 -05:00
Jacques Distler 3bfc30231a Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-07-21 09:42:26 -05:00
Jacques Distler 267f4a51fc Don't escape web.additional_style
Reported by Andrew Stacey
2010-07-21 09:39:18 -05:00
Jacques Distler a14db81b79 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-09 12:00:55 -05:00
Jacques Distler 90ad482ed2 Rename stringsupport.rb => instiki_stringsupport.rb 2010-06-09 11:47:39 -05:00
Jacques Distler 03c57473dc Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-04 12:13:36 -05:00
Jacques Distler dead710e69 Revert #633
MathPlayer doesn't like the HTML5 DOCTYPE.
Revert to sending XHTML+MathML+SVG DOCTYPE.
2010-06-04 12:10:26 -05:00
Jacques Distler 851b735158 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-30 13:36:04 -05:00
Jacques Distler b8647da41a Fix TeX Output
\empty was causing problems.
That was kinda stupid.
2010-05-30 13:34:30 -05:00
Jacques Distler 1f4f1a4ba3 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-27 00:30:29 -05:00
Jacques Distler a57152d743 Fix Category Listing Bugs
The links to the category listings
were bogus, and the category listing
page needed some XSS-unprotection.
2010-05-27 00:27:49 -05:00
Jacques Distler d61ae49e66 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-26 14:17:52 -05:00
Jacques Distler 1da034e2be Fix some to-be-deprecated stuff 2010-05-26 14:16:34 -05:00
Jacques Distler 4774d7c8a1 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-26 01:28:03 -05:00
Jacques Distler 4b73f1a1ae More rails_xss Plugin fun
:-(
2010-05-26 01:27:09 -05:00
Jacques Distler e3cbef7dcd Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-26 00:33:21 -05:00
Jacques Distler a5e08f7bcc Rails_xss Plugin
I installed the rails_xss plugin, for
the main purpose of seeing what will
break with Rails 3.0 (where the behaviour
of the plugin is the default). I think
I've fixed everything, but let me know if you
see stuff that is HTML-escaped, which
shouldn't be.

As a side benefit, we now use Erubis,
rather than ERB, to render templates.
They tell me it's faster ...
2010-05-26 00:27:49 -05:00
Jacques Distler 5196df7575 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-25 13:01:31 -05:00
Jacques Distler d6be09e0f0 Fix some Helper Methods
It seems that (advertising to the contrary)
Rails's XSS Protection is enabled, by default
in 2.3.8. So needed to fix some helper methods.
2010-05-25 12:59:35 -05:00
Jacques Distler f7b2a40cf6 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-22 16:12:35 -05:00
Jacques Distler d2c4623bf7 HTML5 Doctype 2010-05-22 16:11:27 -05:00