2d303d54a0
Better text/html serialization
...
For the Andrew Staceys of this world:
deal with empty element in a more
text/html-friendly fashion.
2011-08-27 02:40:40 -05:00
453693a868
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-26 20:56:53 -05:00
27ad6ff2a8
Multiple instances of the same abbreviation
...
Convert all of them, not just the first, when
they occur in the same string.
2011-08-26 20:55:04 -05:00
e26c12229e
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-23 14:39:30 -05:00
903c4b6bdd
Pre Chunk-Handler gets confused when XML parser converts empty elements to short-tag syntax.
...
Reported by Andrew Stacey.
2011-08-23 14:35:27 -05:00
09b2d24a18
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-22 11:02:44 -05:00
e387d095ec
Fix double-escaping on Search Page
...
Reported by Andrew Stacey
2011-08-22 11:00:03 -05:00
2d21eabee8
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-22 10:26:46 -05:00
6f18c90a50
Ack! 2 more Maruku Errors
...
1. #to_html_code was not working
(my own #$%* fault, for trying
to be too fancy).
2. Empty list items.
Reported by Andrew Stacey
2011-08-22 10:20:17 -05:00
03fc0324db
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-22 08:21:43 -05:00
6b86177620
Whoops! Need to update those.
2011-08-22 08:19:39 -05:00
3a54d7ee72
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-21 14:00:08 -05:00
477bd91567
More Maruku #to_markdown fixes.
...
Is there any point to this?
What version of Markdown are
we targetting, anyway?
2011-08-21 13:41:20 -05:00
1df2483663
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-21 02:50:01 -05:00
f463a3b1c8
Fix Maruku Indented Codeblocks
...
I'd screwed that up.
Also, fix some bugs in the #to_md
output method. Still not correct
(and I'm not sure I'm going to
bother completing the job), but
better.
2011-08-21 02:43:43 -05:00
a739a52f54
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-19 19:37:14 -05:00
1e352e28a1
Make Sanitizer::safe_xhtml_sanitize use Nokogiri
...
Also, update Bundler to 1.0.18.
2011-08-19 19:32:53 -05:00
85cada931d
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-19 01:57:27 -05:00
4b2448b09a
Security: Update to Rails 2.3.14
2011-08-19 01:54:58 -05:00
c1826775d2
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-15 10:20:14 -05:00
3c650f2cf6
StringScanner is not multibyte-safe. Avoid like the plague.
2011-08-15 10:18:18 -05:00
ecaf67dca9
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-14 16:58:45 -05:00
f7bce2c773
Another Maruku link bug
2011-08-14 16:54:21 -05:00
89f6b69245
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-14 02:18:43 -05:00
5c51f930b0
Fix another Maruku bbug
...
Image titles were not being output (a long-standing Maruku bug).
Also fix some broken specs. All the HTML specs pass. I hope they're
"correct".
2011-08-14 02:16:15 -05:00
ce97abe6ac
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-13 04:01:43 -05:00
070f689f9c
Fixed some Maruku bugs
...
Email addresses and horizontal rules now work properly.
2011-08-13 03:59:40 -05:00
5fd725e3a8
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-11 20:40:12 -05:00
13a522525c
REXML is dead. Long live Nokogiri.
...
Modify Maruku to use Nokogiri instead of REXML.
Produces a 3-fold speedup in the #to_html method.
2011-08-11 20:36:44 -05:00
6005297cfe
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-08 01:55:44 -05:00
46da1f3aaf
Tweaks to lib/chunks/engines.rb
2011-08-08 01:54:06 -05:00
a72d35bd4e
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-08 01:46:38 -05:00
201c25ce83
Small tweaks to Maruku
...
A real speedup could be had by redoing output/to_html.rb
2011-08-08 01:44:01 -05:00
c9312367c9
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-05 09:09:12 -05:00
47996ea1d3
Fix tests for above.
...
Set does not have a 'last' method.
2011-08-05 09:06:44 -05:00
f23e1487df
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-05 02:02:43 -05:00
14592f57f9
Some small efficiencies in the Chunk-handler
...
Also, log Maruku's processing time, out of perverse
interest.
2011-08-05 01:59:18 -05:00
7d2275d0a1
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-07-28 23:18:14 -05:00
52da76ff38
These Flash messages are html_safe
2011-07-28 23:16:21 -05:00
8d7f33f99b
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-07-07 10:32:49 -05:00
2967b207b2
Update for itex2MML 1.4.6
2011-07-07 10:18:55 -05:00
dfad5a3a37
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-18 15:57:54 -05:00
8b008f8418
Fix Maruku Footnote Backlink
...
Problem reported by Shamaoke.
2011-06-18 15:54:32 -05:00
fc8be60634
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-15 00:50:37 -05:00
9e909d5be3
Update Rails, rails_xss and Bundler
...
Update Bundler to 1.0.15.
Update Rails to 2.3.12.
Update rails_xss plugin.
The latter two were the
source of a considerable
amount of grief, as rails_xss
is now MUCH stricter about what
string methods can be used.
Also made it possible to use
rake 0.9.x with Instiki. But
you probably REALLY want to use
ruby bundle exec rake ...
instead of just saying
rake ....
2011-06-15 00:43:38 -05:00
088b535d52
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-12 12:59:12 -05:00
ec443685a6
MathJax 1.1a final
2011-06-12 12:57:10 -05:00
97148dc205
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-11 23:42:34 -05:00
cbf13ad57a
Instiki 0.19.2
...
Bump version number.
Also update to a faster method
of loading MathJax (thanks to
Davide Cervone for assistance).
2011-06-11 23:39:42 -05:00
ec31e46e92
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-09 08:36:27 -05:00
Jacques Distler