d208728065
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-10-15 10:50:31 -05:00
cebd381d0d
Instiki 0.19.1
...
tex_list, Rails 2.3.10, etc.
2010-10-15 10:47:59 -05:00
477adeffda
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-10-11 11:00:00 -05:00
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
a4776060a6
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-10-10 13:29:03 -05:00
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
5c576f66e9
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-10-09 15:42:19 -05:00
9c11c384d4
Some more tweaks to the tex_list feature
2010-10-09 15:41:25 -05:00
a64194806b
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-10-09 14:45:15 -05:00
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
a0a11c0bc8
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-10-09 11:22:37 -05:00
b1fcc93aa5
Test for text_list
...
Add a functional test for
the new feature.
2010-10-09 11:21:41 -05:00
3660f13c84
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-10-09 10:34:58 -05:00
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
194f10e809
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-10-09 03:02:26 -05:00
aee4f8b3a9
Export Multiple Pages to TeX
...
Per a suggestion of Marco Gualtieri.
2010-10-09 02:57:37 -05:00
b5481a1454
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-10-05 21:09:22 -05:00
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
1290dfc9ae
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-10-01 18:56:31 -05:00
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
98bf5a824e
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-09-28 11:06:43 -05:00
239a8d97e5
Instiki 0.19
2010-09-28 11:05:48 -05:00
1dc14ec2da
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-07-22 14:16:31 -05:00
0a87548324
Fix breakage from Revision 664
...
Noted by Andrew Stacey
2010-07-22 12:44:14 -05:00
3bfc30231a
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-07-21 09:42:26 -05:00
267f4a51fc
Don't escape web.additional_style
...
Reported by Andrew Stacey
2010-07-21 09:39:18 -05:00
a14db81b79
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-06-09 12:00:55 -05:00
90ad482ed2
Rename stringsupport.rb => instiki_stringsupport.rb
2010-06-09 11:47:39 -05:00
03c57473dc
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-06-04 12:13:36 -05:00
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
851b735158
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-05-30 13:36:04 -05:00
b8647da41a
Fix TeX Output
...
\empty was causing problems.
That was kinda stupid.
2010-05-30 13:34:30 -05:00
1f4f1a4ba3
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-05-27 00:30:29 -05:00
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
d61ae49e66
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-05-26 14:17:52 -05:00
1da034e2be
Fix some to-be-deprecated stuff
2010-05-26 14:16:34 -05:00
4774d7c8a1
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-05-26 01:28:03 -05:00
4b73f1a1ae
More rails_xss Plugin fun
...
:-(
2010-05-26 01:27:09 -05:00
e3cbef7dcd
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-05-26 00:33:21 -05:00
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
5196df7575
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-05-25 13:01:31 -05:00
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
f7b2a40cf6
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-05-22 16:12:35 -05:00
d2c4623bf7
HTML5 Doctype
2010-05-22 16:11:27 -05:00
e6854767b5
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-04-18 12:59:25 -05:00
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
3f87912191
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-03-29 09:28:51 -05:00
18b5ea9aa6
Use Instiki's escapeHTML Method in Templates
...
Fixes bug reported by Toby Bartels.
2010-03-29 09:27:14 -05:00
2df08e21d1
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-03-02 16:07:08 -06:00
932c42c24a
More itex Metal Refactoring
2010-03-02 13:59:50 -06:00
e07960a897
Efficiency improvements to itex endpoint
...
Benchmarks at up to twice as fast.
2010-03-01 21:10:13 -06:00
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
7b22daa784
Fix Revision 601
...
With tests, this time.
2010-02-28 23:51:33 -06:00
57fe0b9f0b
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-02-27 09:54:13 -06:00
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
f4f9261431
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-02-22 19:15:39 -06:00
47524a7104
Small tweak to itex metal
2010-02-22 19:13:46 -06:00
cf0668eb53
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-02-22 08:55:27 -06:00
3fbff19997
itex Endpoint Should Handle Blank TeX
...
Reported by Andrew Stacey
2010-02-22 08:52:52 -06:00
58d241c4c4
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-02-22 00:10:28 -06:00
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
7249c074b0
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-02-05 21:40:24 -06:00
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
1373963fe3
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-29 11:15:56 -06:00
954bcb52c2
The Rails Way
...
The previous implementation, in Revision
541, was ugly. This is better.
2010-01-29 11:13:16 -06:00
3af938b46e
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-28 23:41:15 -06:00
5506f87f17
One-Click S5 Template
...
Make it yet-easier to create
S5 slideshows.
2010-01-28 23:37:10 -06:00
3a9d1596d2
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-26 00:21:50 -06:00
bafa7743f1
Allow Periods in Page Names
...
Thanks to Jeff Zellman.
2010-01-26 00:18:30 -06:00
50d0e04624
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-24 22:57:50 -06:00
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
61a52a91e1
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-24 12:27:06 -06:00
aea2c5099f
More Ruby 1.9 Encoding Fun
...
Under Ruby 1.9, could not delete orphan
pages with utf-8 names. They would be
listed as orphan, but "Delete Orphan Pages"
would silently not delete them.
Fixed.
2010-01-24 12:23:47 -06:00
7a12cdb502
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-23 18:33:22 -06:00
b9db67073d
Ruby 1.9 fix
...
Make the previous fixes work under Ruby 1.9
as well.
2010-01-23 18:30:17 -06:00
a8370d5f45
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-23 18:25:30 -06:00
09e885d299
Small Cleanup
...
Small cleanup to the zip export.
2010-01-23 18:24:14 -06:00
a7d38ef6a1
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-23 18:12:23 -06:00
8ed5a88db0
Fix Zip Export and Print View
...
Fix http://bug.to/issues/show/335
and
http://bug.to/issues/show/334
We now bundle the uploaded files directory
(and the public/ directory for the (X)HTML
export) in the Zipball when exporting a Web.
Also, correct the Print View to produce proper links
uploaded files.
2010-01-23 18:01:02 -06:00
c85b50ff66
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-23 09:11:18 -06:00
ad2fab42bd
Whoops!
...
Move darken() helper method from
wiki_helper.rb to application_helper.rb.
2010-01-23 09:07:57 -06:00
512b8d60b9
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-23 00:24:48 -06:00
979ea7eca0
CSS Improvements
...
Fixed a few aesthetic matters.
2010-01-23 00:21:14 -06:00
36089f1543
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-07 08:14:28 -06:00
d67ce28855
Prevent Renaming to a Null Page Name
...
Fix http://rubyforge.org/tracker/index.php?func=detail&aid=27649&group_id=186&atid=783
2010-01-07 08:12:22 -06:00
6a5b0e108a
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-07 00:10:35 -06:00
c8ef0a3dd4
Release Instki 0.18.1
...
Seems warranted, in light of the
Ruby 1.9 encoding issues.
2010-01-07 00:07:10 -06:00
0c2bc65e7a
All I want for Christmas ...
...
... is to settle these encoding issues
once and for all.
Let's override the accessor methods, which
seems to offer a simpler solution.
Now with tests (for whatever that helps)...
2010-01-06 08:15:34 -06:00
036f6335ad
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-05 09:40:23 -06:00
6e6bf1a446
Yikes! Yet more Ruby 1.9 Encoding Issues
...
We're getting there. Thanks to Andrew Stacey.
2010-01-05 09:35:14 -06:00
0cdbbbd9ff
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-04 18:46:00 -06:00
6cf1463525
Revert Revision 520; This is more thorough
...
This ensures that @page.name has the right (utf8)
encoding.
2010-01-04 18:43:27 -06:00
e417054a67
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-04 06:48:20 -06:00
d786e95a77
Ruby 1.9 + MySQL Hack
...
The default encoding in MySQL is latin1. Ruby 1.9
is a stickler about the encoding of a sequence of bytes.
In this case, a utf8 page name stored in the database comes
back as "ASCII-8BIT" (ie, binary). Coerce that back to utf8.
This doesn't affect SQLite3, and it doesn't affect Ruby 1.8.
It doesn't even affect MySQL databases with "utf8" encoding
(though that has other issues, since MySQL's utf8 support is
broken).
There are probably other, similar problems lurking.
2010-01-04 06:41:04 -06:00
ce46bd0929
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-31 15:56:22 -06:00
f66fc4de4d
Fenced Code Blocks, Fortran Syntax Colouring
...
Support Marhdown Extra's fenced code blocks. [From Jason Blevins]
Fortran syntax colouring. [From Jason Blevins]
Turn on Syntax colouring, by default.
Point to Michel Fortin's Markdown Extra page.
2009-12-31 15:54:01 -06:00
7e61bc10d7
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-27 00:57:51 -06:00
2780344a1b
Version 0.18
2009-12-27 00:55:48 -06:00
27eab3ee41
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-27 00:43:28 -06:00
b75aa4b8d6
Fix a broken test
2009-12-27 00:41:04 -06:00
Jacques Distler