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
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
c5a2e325c0
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-27 09:45:27 -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
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
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
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
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
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
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
ec31e46e92
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-09 08:36:27 -05:00
79a966f71f
Fix Ordered Lists
...
Fix a regression in Maruku.
(Reported by Andrew Stacey.)
2011-06-09 08:30:23 -05:00
95d2fe540f
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-01 13:20:29 -05:00
c9ad2c0c6e
Non-ASCII Lists
...
Fix a bug in Maruku's
list-parsing.
Also fix a test broken
by latest Rack + Ruby 1.9.
2011-06-01 13:17:23 -05:00
823f8b79c9
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-04-24 16:12:38 -05:00
c010e6b7a4
Validate Web address
...
When changing the address of an existing Web
(or creating a new one), check that the new name is valid.
(Reported by Richard Marquez.)
2011-04-24 16:07:43 -05:00
f9628a3f19
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-02-18 13:13:43 -06:00
3843fa608d
Nasty!
...
How did a well-formedness bug creep into
the code? I *swear* this used to work.
2011-02-18 12:39:19 -06:00
5918d4c26e
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-11-27 00:45:16 -06:00
f914a40fa9
Fix Maruku Math Bug
...
Reported by Andrew Stacey.
2010-11-27 00:43:22 -06:00
88291ee4a2
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-11-03 23:52:06 -05:00
4be1a58a24
Update RedCloth to 4.x
...
Use Bundler to manage RedCloth
gem. 4.x should be much faster
and less buggy. Unfortunately,
it doesn't support mixed
Textile/Markdown syntax. So
we keep an (appropriately
renamed) copy of 3.x around,
for the users of the "Mixed"
text filter.
2010-11-03 23:32:55 -05:00
97434e097a
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-10-21 23:59:35 -05:00
bb17fbbe02
Included pages
...
Redirects and categories of included
pages should not be inherited.
(Suggestion of Andrew Stacey)
2010-10-21 23:58:04 -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
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
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
5ca5bce628
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-10-05 10:10:13 -05:00
8aa3a9e929
SVG-Edit fixes
...
Some bugfixes from the latest SVG-Edit
2010-10-05 10:08:48 -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
a5aa1b1fa8
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-09-05 15:26:17 -05:00
ef30cc22df
Update to Rails 2.3.9 and itextomml 1.3.27
2010-09-05 15:24:15 -05:00
Jacques Distler