Jacques Distler
b4758d9bfa
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-22 20:50:39 -06:00
Jacques Distler
a71e64a172
Update Vendored sqlite3-ruby
2009-12-22 20:48:32 -06:00
Jacques Distler
67b27da5c9
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-18 23:57:05 -06:00
Jacques Distler
9874650e4b
Silence Some Stupid Warnings in Ruby 1.9
2009-12-18 23:53:43 -06:00
Jacques Distler
c391c0eeee
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-16 01:04:56 -06:00
Jacques Distler
fe877a10b4
Make html_ext Available as a Helper
...
... and protected.
2009-12-16 00:59:33 -06:00
Jacques Distler
47941683ab
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-14 17:43:53 -06:00
Jacques Distler
d3e79ea84a
Make truncate() Unicode-aware
2009-12-14 17:41:28 -06:00
Jacques Distler
9ef71a7bce
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-12 15:30:47 -06:00
Jacques Distler
a58bee7437
Another Textarea Tweak and a Ruby 1.9 Fix
2009-12-12 15:28:05 -06:00
Jacques Distler
efd3def461
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-08 11:49:17 -06:00
Jacques Distler
023d84c4a4
Ack! This is better
2009-12-08 09:08:25 -06:00
Jacques Distler
a06d5443e1
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-08 08:52:09 -06:00
Jacques Distler
faac8951a3
More Ruby 1.9 String Encoding Fun
2009-12-08 08:50:01 -06:00
Jacques Distler
36bf257d72
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-05 10:53:19 -06:00
Jacques Distler
171c12d2c1
Efficiency
...
This version of String#purify
is 12% faster, under Ruby 1.9,
than before.
2009-12-05 10:50:58 -06:00
Jacques Distler
1376a01574
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-01 12:07:16 -06:00
Jacques Distler
34b63a8375
Fix a Ruby 1.9 Character Encoding Bug
...
Wow, this stuff is complicated!
Some things really want to be UTF-8;
others really want to be byte strings.
2009-12-01 12:03:15 -06:00
Jacques Distler
f23d892bf9
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-11-30 16:35:46 -06:00
Jacques Distler
a6429f8c22
Ruby 1.9 Compatibility
...
Completely removed the html5lib sanitizer.
Fixed the string-handling to work in both
Ruby 1.8.x and 1.9.2. There are still,
inexplicably, two functional tests that
fail. But the rest seems to work quite well.
2009-11-30 16:28:18 -06:00
Jacques Distler
5fb5744245
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-11-18 12:07:12 -06:00
Jacques Distler
371aab6f96
Sync with Latest itex2MML and MathML::Entities
...
Support the latest changes in
http://www.w3.org/TR/2009/WD-xml-entity-names-20091117/
2009-11-18 12:04:07 -06:00
Jacques Distler
df509623ed
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-28 00:25:15 -05:00
Jacques Distler
c99ca26a8d
Better log rotation for Passenger
...
Touch the tmp/restart.txt file, when
rotatingthe log files. Otherwise, multiple
workers may try to rotate the log files
at the same time, with sub-optimal results.
Also, an aesthetic tweak to the url_generator.
2009-10-28 00:03:25 -05:00
Jacques Distler
698c194b63
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-23 10:08:21 -05:00
Jacques Distler
f559d8a06d
Intra-Web Links in S5 Slideshows on Published Webs
...
Never really thought through where those should go.
They now point to the published version.
2009-10-23 10:05:02 -05:00
Jacques Distler
4764364480
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-23 00:25:32 -05:00
Jacques Distler
d880d81b0a
Simplification
...
The last commit means we can
simplify the url_generator.rb a bit more.
It's still an ugly beast.
2009-10-23 00:18:23 -05:00
Jacques Distler
3a4f66d484
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-22 17:59:25 -05:00
Jacques Distler
761f8bbb51
Links From Published Webs
...
Damn, but it's hard to get this right.
I think I've finally done it, though.
We'll see ...
2009-10-22 17:57:13 -05:00
Jacques Distler
dc26bbdd36
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-21 00:53:26 -05:00
Jacques Distler
97a35e280b
DB Migration
...
% rake upgrade_instiki
fixes some potential problems in the database column types.
Revision content can now be up to 16MB.
Under MySQL, the previous limit was 64KB.
Page names can now be up to 255 bytes.
Under MySQL, the previous limit was 60 bytes.
Additional CSS styles can now be up to 64KB.
Under MySQL, the previous limit was 255 bytes.
Thanks to Andrew Stacey for reporting these.
2009-10-21 00:42:48 -05:00
Jacques Distler
008824c1ad
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-11 10:22:15 -05:00
Jacques Distler
a483b4e71e
Also fix S5 slides.js
...
It needs to use relative URLs, too.
2009-10-11 10:20:43 -05:00
Jacques Distler
de44b81020
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-11 09:56:55 -05:00
Jacques Distler
23e9c6beb2
Use AssetTagHelpers in S5 Template
...
Otherwise S5 breaks when Instiki is
deployed to a non-root URL (e.g., by
setting RailsBaseURI in Passenger).
Also a stylistic tweak in lib/node.rb
2009-10-11 09:49:01 -05:00
Jacques Distler
fe9e834983
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-10 03:54:33 -05:00
Jacques Distler
dd8c912c6c
Update lib/node.rb
...
Grab some fixes from html_scanner, and add few of our own.
2009-10-10 03:52:33 -05:00
Jacques Distler
ffa6ee23cd
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-10 02:46:59 -05:00
Jacques Distler
d5e35d2861
Some more Sanitizer tweaks
...
Mostly stylistic things, but allow some constants to be defined by the calling program.
2009-10-10 02:44:44 -05:00
Jacques Distler
7995143c09
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-09 23:20:38 -05:00
Jacques Distler
d14db51d9e
More Sanitizer Refactoring
...
Make the Sanitizer more efficient.
Also, update some unit tests.
2009-10-09 23:18:17 -05:00
Jacques Distler
0f1b6bc695
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-09 14:03:57 -05:00
Jacques Distler
9b7071d190
Update Sanitizer Docs
...
They were a bit out-of-sync with what the sanitizer
actually does.
2009-10-09 14:02:07 -05:00
Jacques Distler
043db32754
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-09 13:04:00 -05:00
Jacques Distler
e7b77dd3d3
Sanitizer Refactoring
...
A bit of cleanup for the Sanitizer.
2009-10-09 13:02:02 -05:00
Jacques Distler
5c2e4437b5
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-08 16:24:59 -05:00
Jacques Distler
2f3ff9f651
Efficiency
...
There's a moderate efficiency gain to be had by
using Set#include?, rather than Array#include?
in the sanitizer.
2009-10-08 16:22:50 -05:00
Jacques Distler
a35921a90d
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-09-25 16:02:23 -05:00
Jacques Distler
e0df6c8a6a
Updated Tests and Sanitizer Fixes for Revision 439
2009-09-25 15:59:43 -05:00
