Permalink
Commits on Apr 25, 2012
  1. Tag 1.4.1

    vmg committed Apr 25, 2012
Commits on Apr 16, 2012
  1. fixup readme error, fixes #294

    atmos committed Apr 16, 2012
Commits on Apr 14, 2012
  1. update org-ruby dev dep

    atmos committed Apr 14, 2012
Commits on Apr 12, 2012
  1. Update README

    vmg committed Apr 12, 2012
  2. Remove the GFM parser; it makes no sense

    vmg committed Apr 12, 2012
    The new versions of GitHub::Markup will automatically render GFM for
    Markdown documents if the necessary gems are installed.
Commits on Apr 11, 2012
  1. nuke whitespace

    atmos committed Apr 11, 2012
  2. cleanup whitespace

    atmos committed Apr 11, 2012
  3. release 1.4.0

    atmos committed Apr 11, 2012
  4. be a little more rubyish

    atmos committed Apr 11, 2012
  5. Merge remote-tracking branch 'origin/master' into websequencediagrams

    atmos committed Apr 11, 2012
    Conflicts:
    	README.md
    	lib/gollum.rb
    	lib/gollum/markup.rb
  6. Merge pull request #281 from muzuiget/master

    atmos committed Apr 11, 2012
    Fix searchbar position and button appearance
  7. Merge pull request #257 from hulihanapplications/default-editor-markup

    atmos committed Apr 11, 2012
    Make default markup changeable through sinatra settings
Commits on Apr 10, 2012
  1. Merge pull request #249 from ChrisCauser/master

    atmos committed Apr 10, 2012
    Fix spaces in filenames breaking redirect with Sinatra 1.3.1
  2. Merge pull request #166 from arr2036/mediawiki_compat

    atmos committed Apr 10, 2012
    Gollum doesn't play nice with un-canonicalized filenames, and breaks offsite links when replacing mediawiki
  3. Remove MathJax.

    bootstraponline authored and atmos committed Nov 30, 2011
  4. Merge branch 'master' into code_with_multibyte

    atmos committed Apr 10, 2012
    Conflicts:
    	lib/gollum/markup.rb
    	test/test_markup.rb
  5. Merge pull request #273 from polarblau/code_block_ascii_bug

    atmos committed Apr 10, 2012
    Added test for ASCII characters in code blocks created with back ticks.
  6. Merge pull request #264 from github/remove_contents

    atmos committed Apr 10, 2012
    remove contents of script and style elements
  7. minor api updates

    atmos committed Apr 10, 2012
  8. Merge remote-tracking branch 'origin/master' into xdite-merge

    atmos committed Apr 10, 2012
    Conflicts:
    	lib/gollum/markup.rb
  9. Merge pull request #283 from dentarg/master

    atmos committed Apr 10, 2012
    Serve Gravatars via SSL
Commits on Mar 17, 2012
  1. Serve Gravatars via SSL.

    dentarg committed Mar 17, 2012
Commits on Mar 4, 2012
Commits on Feb 7, 2012
Commits on Jan 9, 2012
  1. remove contents of script and style elements

    jnewland committed Jan 9, 2012
    Avoids rendering HTML-ized CSS and/or Javascript by removing the
    contents of script and style elements as well as the elements
    themselves.
    
    /cc @technoweenie
    
    Pull Request: master
Commits on Dec 23, 2011