Permalink
Switch branches/tags
Nothing to show
Commits on Oct 1, 2012
Commits on Sep 15, 2012
  1. require lib correctly

    bhollis committed Sep 15, 2012
Commits on Sep 8, 2012
  1. Merge pull request #52 from stomar/fix_nokogiri_switch

    `maruku file.md' fails in the command line (since switch to Nokogiri)
    bhollis committed Sep 8, 2012
  2. Merge pull request #53 from stomar/toc_list_style

    Remove inline CSS style from toc lists
    bhollis committed Sep 8, 2012
  3. Merge pull request #54 from stomar/doc

    Small changes in command line help message
    bhollis committed Sep 8, 2012
Commits on Sep 6, 2012
  1. Small changes in help message

    stomar committed Sep 6, 2012
  2. Improve help message (-o -)

    stomar committed Sep 6, 2012
Commits on Sep 5, 2012
  1. Remove unused code

    stomar committed Sep 5, 2012
  2. Remove REXML option (:ie_hack)

    stomar committed Sep 5, 2012
Commits on Aug 3, 2012
Commits on Jul 31, 2012
  1. String#ord doesn't work in 1.8.7

    bhollis committed Jul 31, 2012
  2. Fix up README

    bhollis committed Jul 31, 2012
Commits on Jul 29, 2012
  1. Merge remote-tracking branch 'distler/nokogiri'

    This drops testing for #to_s and #to_md.
    
    Conflicts:
    	Rakefile
    	lib/maruku/input/parse_doc.rb
    	maruku.gemspec
    	spec/block_docs/iframe.md
    	spec/block_spec.rb
    	spec/spec_helper.rb
    bhollis committed Jul 29, 2012
  2. Merge pull request #39 from stepheneb/iframe

    spec test for embedding and html iframe
    bhollis committed Jul 29, 2012
  3. Merge pull request #33 from brettgoulder/master

    Fixed a documentation error when installing the Maruku gem
    bhollis committed Jul 29, 2012
  4. Merge pull request #45 from bmichelsen/embedding_radiant

    Fixed embedding Radiant link
    bhollis committed Jul 29, 2012
  5. Merge pull request #41 from eagleas/master

    Use String#encode for ruby 1.9, and Iconv for 1.8
    bhollis committed Jul 29, 2012
Commits on Jul 26, 2012
  1. Some cleanup

    eagleas committed Jul 26, 2012