Commit Graph

88 Commits

Author SHA1 Message Date
kristi d7f4eeea2c Merge remote-tracking branch 'upstream/master' into toc
Conflicts:
	lib/gollum/frontend/app.rb
	lib/gollum/markup.rb
	test/test_markup.rb
2012-05-14 09:12:44 -07:00
kristi b0ba205532 Remove :header_hashtags option and adjust tests 2012-05-14 00:38:27 -07:00
Jonathan Roes f9899033aa Before replacing tags, ensure the SHA1 is not within preformatted content. 2012-05-12 17:29:23 -04:00
Jonathan Roes eb37b17486 Remove links in code, fixes #128. 2012-05-11 22:49:26 -04:00
kristi f53e1a60d5 Fix tests by adding a default_options hash to the wiki 2012-05-11 12:51:04 -07:00
bootstraponline b037777f83 Fix spacing. 2012-05-08 13:18:46 -06:00
Corey Donohoe 9a1dddaccf whitelist apt uri schemes, fixes #233 2012-05-05 11:56:01 -07:00
Ryan Fowler d1cf698b45 Disable internal link processing for asciidoc
asciidoc's representation of section identifiers interferes with
Gollum's page linking. This disables Gollum's page link tag
extraction for asciidoc files.

Adds "apt-get install -y asciidoc" to .travis.yml so tests pass
on @travis-ci.
2012-05-01 14:23:26 -05:00
Corey Donohoe 9dba3f9c58 Revert "Merge pull request #303 from rwfowler/asciidocLinks"
This reverts commit 8fbbe40300, reversing
changes made to b7fb4c5950.
2012-05-01 19:51:05 +02:00
Ryan Fowler f73c925ad9 Disable internal link processing for asciidoc
asciidoc's representation of section identifiers interferes with
Gollum's page linking. This disables Gollum's page link tag
extraction for asciidoc files.
2012-05-01 11:43:27 -05:00
Jussi Malinen 02073f827b add id to whitelisted attributes. The transformers still seem to work and prefix ids with wiki-. Uncommented relevant tests. 2012-04-23 20:08:24 +03:00
Vicent Martí 0cc4c9f2c2 Remove the GFM parser; it makes no sense
The new versions of GitHub::Markup will automatically render GFM for
Markdown documents if the necessary gems are installed.
2012-04-12 22:54:11 +02:00
Corey Donohoe d6a4009989 nuke whitespace 2012-04-10 18:38:04 -07:00
Corey Donohoe 0bfa049778 Merge remote-tracking branch 'origin/master' into websequencediagrams
Conflicts:
	README.md
	lib/gollum.rb
	lib/gollum/markup.rb
2012-04-10 17:37:48 -07:00
Corey Donohoe eed9b2695a Merge branch 'master' into code_with_multibyte
Conflicts:
	lib/gollum/markup.rb
	test/test_markup.rb
2012-04-10 15:49:37 -07:00
Corey Donohoe 66a6ee97f0 Merge pull request #273 from polarblau/code_block_ascii_bug
Added test for ASCII characters in code blocks created with back ticks.
2012-04-10 15:26:31 -07:00
Polarblau 5f4d312b8e Added test for ASCII characters in code blocks created with back ticks. 2012-02-07 12:52:06 +02:00
Jesse Newland be4c52202c remove contents of script and style elements
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
2012-01-08 22:07:33 -05:00
Vicent Marti af09f99c8a Fix newline tests in code blocks 2011-12-07 13:02:54 +01:00
Vicent Marti 108876d9a1 Do not assume Markdown output is XHTML
Self-closing tags are bad for your health.
2011-12-07 12:34:59 +01:00
Joshua Peek 3cba98fee6 Merge branch 'master' into server-side-tex 2011-11-28 13:21:46 -06:00
Joshua Peek cc96786ac0 Fix Wiki XSS vuln 2011-11-15 15:29:05 -06:00
hibariya 5b84ecf372 ruby1.8 compatibility 2011-11-12 11:32:54 +09:00
hibariya 620926c379 add encoding option 2011-11-12 11:23:04 +09:00
Joshua Peek 7a4e57a49d Fix Tex tests 2011-10-24 15:54:40 -05:00
rick 8c1f82d894 let Gollum::Markup handle code blocks instead of RedCarpet 2011-09-29 11:02:35 -06:00
risk 20e4ca6a56 normalize test output 2011-08-08 15:26:27 -07:00
risk cd4704aed7 prefix name attributes too 2011-08-08 15:02:10 -07:00
Scott Chacon aa258dbe6b fix test breaking due to new footnote anchor 2011-07-19 12:55:43 -07:00
Scott Chacon 5a7659e1c3 fix tests breaking due to whitespace issues 2011-07-19 12:55:19 -07:00
Schuyler Duveen c22050fca8 allow @id attributes but force a "wiki-" prefix 2011-05-04 11:50:38 -04:00
rick e0494a6321 fix tests 2011-03-10 11:06:18 -08:00
rick ecb44b50e1 use Albino::Multi 2011-03-03 16:28:13 -08:00
rick 732e8a9361 fix bug where relative images in previews did not render 2011-01-27 16:34:29 -08:00
rick a9d4e117aa fix markup formatting edge case 2011-01-17 10:17:14 -08:00
rick feff07ae9c Merge branch 'org-mode-file-links' of https://github.com/hugoduncan/gollum into hugoduncan-org-mode-file-links 2011-01-17 10:12:50 -08:00
rick ca2aaa543a Merge branch 'mediawiki_fixups' of https://github.com/qmx/gollum into qmx-mediawiki_fixups 2011-01-17 09:06:00 -08:00
rick 9a4e2e39a8 update albino to 1.2.3, handle bad code blocks gracefully 2011-01-12 15:00:58 -08:00
Douglas Campos 2dbb4e9fa7 fixed mediawiki link handling 2011-01-12 00:57:21 -02:00
Douglas Campos e4103e6181 testing link labeling current behavior 2011-01-11 22:50:59 -02:00
rick c5e4935e85 tweak code markup parser so that blocks without a language are just output in pre tags 2011-01-11 01:00:51 -08:00
rick 45765eb161 add proper shell escaping for Albino 2011-01-11 00:58:04 -08:00
Hugo Duncan 32d1f9eb2f Add parsing of org-mode [[file:path.org][label]] links 2011-01-07 23:59:36 -05:00
rick aeb90c6293 use expand_path so ruby doesnt load helper.rb twice 2010-12-09 13:58:51 -08:00
rick 2fe6b7b7f1 provide access to the parsed Nokogiri document fragment when rendering marked up content. 2010-12-02 14:47:20 -08:00
rick 39d16b8c43 Merge branch 'text_data_method' of https://github.com/hiroshi/gollum into hiroshi-text_data_method 2010-11-09 12:19:29 -08:00
Marko Anastasov 16ef859073 Ignore case when matching image paths.
Otherwise images with file extensions in caps don't get rendered.
2010-10-12 12:07:07 +02:00
Hiroshi Saito dc7693dbd0 FIX: Sanitize.clean raise Encoding::CompatibilityError if a page contains non ASCII-7 characters 2010-10-08 23:39:18 +09:00
Tim Sharpe e5fe89a4fd Simple test case 2010-10-01 16:05:20 +10:00
rick 4dbe3ea844 ensures rel="nofollow" is added to all anchors if a page is retrieved with a SHA 2010-09-30 17:19:37 -07:00