deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1568 commits 3 branches 18 tags 34 MiB
Commit graph

424 commits

Author SHA1 Message Date
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
Jacques Distler
e6854767b5 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-04-18 12:59:25 -05:00
Jacques Distler
79a2299363 Content-Type of Cached Files with Period in Name 
Monkey patch to prevent ActionCache from overriding
the correct content-type header, when serving cached
pages with a "." in the name. (Thanks to Jason Blevins)

Also sync with latest SVG-Edit.
 2010-04-18 12:55:02 -05:00
Jacques Distler
3f87912191 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-03-29 09:28:51 -05:00
Jacques Distler
18b5ea9aa6 Use Instiki's escapeHTML Method in Templates 
Fixes bug reported by Toby Bartels.
 2010-03-29 09:27:14 -05:00
Jacques Distler
2df08e21d1 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-03-02 16:07:08 -06:00
Jacques Distler
932c42c24a More itex Metal Refactoring 2010-03-02 13:59:50 -06:00
Jacques Distler
e07960a897 Efficiency improvements to itex endpoint 
Benchmarks at up to twice as fast.
 2010-03-01 21:10:13 -06:00
Jacques Distler
a6bceb2a8e Ensure that itex endpoint returns well-formed XML 
Since itex's \begin{svg}...\end{svg} syntax allows
the client to pass arbitrary junk through the document,
we need to check that the result is well-formed.

Use a pluggable XML parser: nokogiri, if installed,
REXML otherwise.
 2010-03-01 12:27:04 -06:00
Jacques Distler
7b22daa784 Fix Revision 601 
With tests, this time.
 2010-02-28 23:51:33 -06:00
Jacques Distler
57fe0b9f0b Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-02-27 09:54:13 -06:00
Jacques Distler
519f81ab20 Try to make Jeff happy 
Make use of a nonce for setting SVG-Edit IDs
option. By default, SVG-Edit behaves as before.
Calling svgCanvas.randomizeIds(true) gives our
behaviour, instead.

Also, sync with latest SVG-Edit (but disable,
for now, manual editing of IDs).
 2010-02-27 09:49:02 -06:00
Jacques Distler
f4f9261431 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-02-22 19:15:39 -06:00
Jacques Distler
47524a7104 Small tweak to itex metal 2010-02-22 19:13:46 -06:00
Jacques Distler
cf0668eb53 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-02-22 08:55:27 -06:00
Jacques Distler
3fbff19997 itex Endpoint Should Handle Blank TeX 
Reported by Andrew Stacey
 2010-02-22 08:52:52 -06:00
Jacques Distler
58d241c4c4 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-02-22 00:10:28 -06:00
Jacques Distler
702b450fd9 itex Endpoint 
Add a Rack Metal itex endpoint.
Add an itex tool to SVG-Edit.
Disable the foreignObject tool
(at least, for now) as it doesn't
currently play nice with the itex tool.
 2010-02-22 00:05:52 -06:00
Jacques Distler
7249c074b0 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-02-05 21:40:24 -06:00
Jacques Distler
c3ed5b461b Preliminary SVG-edit Support 
WYSIWYG SVG editing.

Still no support for mixed
SVG/MathML content, yet.
 2010-02-05 21:36:35 -06:00
Jacques Distler
1373963fe3 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-01-29 11:15:56 -06:00
Jacques Distler
954bcb52c2 The Rails Way 
The previous implementation, in Revision
541, was ugly. This is better.
 2010-01-29 11:13:16 -06:00
Jacques Distler
3af938b46e Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-01-28 23:41:15 -06:00
Jacques Distler
5506f87f17 One-Click S5 Template 
Make it yet-easier to create
S5 slideshows.
 2010-01-28 23:37:10 -06:00
Jacques Distler
3a9d1596d2 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-01-26 00:21:50 -06:00
Jacques Distler
bafa7743f1 Allow Periods in Page Names 
Thanks to Jeff Zellman.
 2010-01-26 00:18:30 -06:00
Jacques Distler
50d0e04624 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-01-24 22:57:50 -06:00
Jacques Distler
d3db9d1229 Export Zipballs Include BlahTeX PNGs 
It's as simple as recursing through the
files/ directory, when adding to the zipball.
 2010-01-24 22:54:35 -06:00
Jacques Distler
61a52a91e1 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-01-24 12:27:06 -06:00