8c74de6670
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-09-07 15:41:53 -05:00
ee05118e8f
Update for itextomml 1.4.7
2011-09-07 15:39:41 -05:00
c7b46cbde3
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-09-05 02:53:39 -05:00
7bf832e8c7
Add voffset as an allowed MathML attribute
2011-09-05 02:50:15 -05:00
f5c892c717
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-09-03 11:35:37 -05:00
364de9dbab
Better
...
3rd time's the charm?
2011-09-03 11:33:51 -05:00
1efa08dcc7
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-09-03 11:14:59 -05:00
ddf1846fe1
Fix double-escaping of flash messages (for real, this time)
2011-09-03 11:12:49 -05:00
04ca7e8a38
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-31 11:59:26 -05:00
f9e60828c7
Instiki 0.19.3
2011-08-31 11:57:20 -05:00
9e25ada5c8
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-27 22:01:07 -05:00
66f62bac1f
Source view for Revisions
2011-08-27 21:58:14 -05:00
e00b2a0ac0
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-27 19:33:54 -05:00
2801421969
Another Maruku bug: bold in italics
2011-08-27 19:31:02 -05:00
b1d1f74b7d
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-27 16:34:33 -05:00
a088201062
Null search
...
Search without a query-param should
not result in a application error.
2011-08-27 16:30:57 -05:00
c5a2e325c0
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-27 09:45:27 -05:00
26ed59485a
This bug is fixed.
2011-08-27 09:42:50 -05:00
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
Jacques Distler