deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1773 commits 3 branches 18 tags 34 MiB
Commit graph

212 commits

Author SHA1 Message Date
Jacques Distler 40fd643680 Update Maruku 2011-12-03 17:31:53 -06:00
Jacques Distler f6d350302c Another one... 2011-09-23 01:25:52 -05:00
Jacques Distler e4b00f0bff Fix bug in Maruku to_html_document_tree 
Reported by Remi.
 2011-09-22 07:52:40 -05:00
Jacques Distler 2801421969 Another Maruku bug: bold in italics 2011-08-27 19:31:02 -05:00
Jacques Distler 26ed59485a This bug is fixed. 2011-08-27 09:42:50 -05:00
Jacques Distler 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
Jacques Distler 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
Jacques Distler 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
Jacques Distler 6b86177620 Whoops! Need to update those. 2011-08-22 08:19:39 -05:00
Jacques Distler 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
Jacques Distler 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
Jacques Distler 1e352e28a1 Make Sanitizer::safe_xhtml_sanitize use Nokogiri 
Also, update Bundler to 1.0.18.
 2011-08-19 19:32:53 -05:00
Jacques Distler 4b2448b09a Security: Update to Rails 2.3.14 2011-08-19 01:54:58 -05:00
Jacques Distler 3c650f2cf6 StringScanner is not multibyte-safe. Avoid like the plague. 2011-08-15 10:18:18 -05:00
Jacques Distler f7bce2c773 Another Maruku link bug 2011-08-14 16:54:21 -05:00
Jacques Distler 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
Jacques Distler 070f689f9c Fixed some Maruku bugs 
Email addresses and horizontal rules now work properly.
 2011-08-13 03:59:40 -05:00
Jacques Distler 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
Jacques Distler 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
Jacques Distler 8b008f8418 Fix Maruku Footnote Backlink 
Problem reported by Shamaoke.
 2011-06-18 15:54:32 -05:00
Jacques Distler 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
Jacques Distler 79a966f71f Fix Ordered Lists 
Fix a regression in Maruku.
(Reported by Andrew Stacey.)
 2011-06-09 08:30:23 -05:00
Jacques Distler 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
Jacques Distler 7e5dbe5854 Unvendor Rack 
You'll need to rerun

   ruby bundle

as rack is now loaded as gem.
 2011-06-01 12:26:50 -05:00
Jacques Distler 844ce0ed40 Rails 2.3.11, S5 Editing bug. 
Upgrade to Rails 2.3.11.
Fix a bug where the SVG-Edit button would not appear
when editing S5 slideshows.
 2011-02-18 23:36:23 -06:00
Jacques Distler 27a99e0146 Update Vendored Bundler to 1.0.7 2010-12-06 21:11:19 -06:00
Jacques Distler f914a40fa9 Fix Maruku Math Bug 
Reported by Andrew Stacey.
 2010-11-27 00:43:22 -06:00
Jacques Distler cebd381d0d Instiki 0.19.1 
tex_list, Rails 2.3.10, etc.
 2010-10-15 10:47:59 -05:00
Jacques Distler aee4f8b3a9 Export Multiple Pages to TeX 
Per a suggestion of Marco Gualtieri.
 2010-10-09 02:57:37 -05:00
Jacques Distler 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
Jacques Distler 3097b47111 Erubis and Rubyzip 
Use Bundler to manage Erubis and Rubyzip.
(Remove the vendored versions.)
 2010-09-25 01:59:03 -05:00
Jacques Distler 4bf2e0d944 Bundler 
Remove the vendored sqlite3-ruby.
Instead, add support for Bundler
(which is vendored).

Before running the new Instiki,
do a 

   ruby bundle

which will install all of the needed gems
locally. (If you need to, tweak the contents
of Gemfile.)
 2010-09-24 22:36:30 -05:00
Jacques Distler 399bd0d5a4 Update Fortran Syntax Highlighting 
Thanks to Jason Blevins
 2010-09-23 09:29:20 -05:00
Jacques Distler e99fcf720c Make Vendored Rack work with Ruby 1.9.2-p0 
Seemed to have no troubles with 1.9.2dev. But
with the release version, Instiki would fail to
launch, with a 

  `load_missing_constant': Rack is not missing constant Handler! (ArgumentError)

error.
 2010-09-09 00:57:35 -05:00
Jacques Distler ef30cc22df Update to Rails 2.3.9 and itextomml 1.3.27 2010-09-05 15:24:15 -05:00
Jacques Distler b3aae9b06d Sqlite3-ruby 1.3.1, itextomml 1.3.26 
Update vendored sqlite3-ruby and tests
for latest itextmml.
 2010-07-20 20:36:17 -05:00
Jacques Distler 39c2138f88 Update Vendored Erubis to 2.6.6 2010-07-04 08:51:53 -05:00
Jacques Distler ce8578d2d0 Some Maruku Regexp Refactoring 2010-06-19 03:02:15 -05:00
Jacques Distler 0d8f680d4f Updates 
SVG-Edit -> 2.5final
Vendored Rack -> 1.2.1
 2010-06-17 19:27:39 -05:00
Jacques Distler 6491d70326 Update Vendored Rack to 1.2.0 
Also update tests for itextomml 1.3.25.
 2010-06-13 23:09:24 -05:00
Jacques Distler 4f8759cdf3 Update vendored Sqlite3-ruby to 1.3.0 
Also, some tweaks to Maruku.
 2010-06-10 22:42:33 -05:00
Jacques Distler 90ad482ed2 Rename stringsupport.rb => instiki_stringsupport.rb 2010-06-09 11:47:39 -05:00
Jacques Distler 06ae79322a Maruku Cleanup Branch 
Use Nathan Weizenbaum's "cleanup" branch of
Maruku. There were a few evident problems
with his branch, so please report any
anomalies you see.
 2010-06-04 21:36:31 -05:00
Jacques Distler c25b608f3d Maruku's string_utils.rb 
Wow! Totally un-Ruby-like.
This is more Ruby-like and
(hopefully) faster.
 2010-06-02 00:15:58 -05:00
Jacques Distler b7a3b8aa94 Minor Update From Current Maruku 2010-06-01 10:39:55 -05:00
Jacques Distler 17e9cfab87 IAL's for <li> elements 
Add a Markdown syntax for attaching
attribute lists to list items (for both
ordered and unordered lists).

The syntax is trivial:

1. This is the first item
2. {: value="3"} We skip straight to #3

* This is an item
* {: style="color:red"} This is a red item
 2010-06-01 01:50:19 -05:00
Jacques Distler 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
Jacques Distler 1da034e2be Fix some to-be-deprecated stuff 2010-05-26 14:16:34 -05:00
Jacques Distler 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
Jacques Distler f0635301aa Update to Rails 2.3.8 2010-05-25 12:45:45 -05:00