b9dad32707
Fix the test_normalizes_commit_hash on Travis-CI
2012-05-01 17:02:50 -05:00
9dba3f9c58
Revert "Merge pull request #303 from rwfowler/asciidocLinks"
...
This reverts commit 8fbbe40300b7fb4c5950
2012-05-01 19:51:05 +02:00
8fbbe40300
Merge pull request #303 from rwfowler/asciidocLinks
...
Fix for #52 - Disable internal link processing for asciidoc
2012-05-01 10:42:31 -07:00
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
b7fb4c5950
Merge pull request #302 from kristi/master
...
fix Rack config.ru documentation
2012-05-01 02:32:07 -07:00
fed49bb98b
Fix gollum_path in rack setup documentation
2012-05-01 01:37:17 -07:00
6aa4e382b2
Tag 1.4.3
2012-04-25 14:12:54 -07:00
8051d4f9b0
Fix the public path
2012-04-25 14:11:02 -07:00
31a49601b1
Namespace the public assets
2012-04-25 14:11:02 -07:00
4a50635fe1
docs for releasing the gem
2012-04-25 20:52:40 +02:00
9b92e9d325
Add Gollum.assets_path hook
2012-04-25 11:46:28 -07:00
833953d658
bump to 1.4.2
2012-04-25 20:44:16 +02:00
198dc8a8e2
Merge remote-tracking branch 'jussimalinen/fix-rest-local-links'
2012-04-25 17:00:56 +02:00
78cd65240f
Tag 1.4.1
2012-04-24 20:42:33 -07:00
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
4cd3fdcdba
fixup readme error, fixes #294
2012-04-16 15:41:11 -07:00
7c803288e0
update org-ruby dev dep
2012-04-14 14:10:29 -07:00
dc91e0f733
Merge remote-tracking branch 'origin/sane-parsing'
2012-04-12 14:07:08 -07:00
adc3abe82a
Update README
2012-04-12 22:59:44 +02:00
00b6f5c3fb
Add desc to tasks so they show up in rake -T.
2012-04-12 13:58:57 -07:00
b5a2a8df67
Keep a MarkupGFM class for compatibility reasons
2012-04-12 22:54:45 +02:00
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
7317a9ba2d
Allow indented code blocks in Gollum syntax
2012-04-12 22:52:08 +02:00
d6a4009989
nuke whitespace
2012-04-10 18:38:04 -07:00
8ee52e7d05
cleanup whitespace
2012-04-10 18:26:13 -07:00
b9a970a19a
minor css fixups from github's internal copy
2012-04-10 18:25:09 -07:00
bee93eade1
release 1.4.0
2012-04-10 18:15:39 -07:00
5d157eea54
update what changed in this release
2012-04-10 18:15:00 -07:00
28b494c913
Merge remote-tracking branch 'andrew0/editor_hooks'
2012-04-10 17:50:02 -07:00
817f189154
be a little more rubyish
2012-04-10 17:40:47 -07:00
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
8745314ad8
Merge pull request #281 from muzuiget/master
...
Fix searchbar position and button appearance
2012-04-10 17:11:19 -07:00
846d6d62c7
Merge pull request #257 from hulihanapplications/default-editor-markup
...
Make default markup changeable through sinatra settings
2012-04-10 17:10:12 -07:00
c625440161
Merge pull request #249 from ChrisCauser/master
...
Fix spaces in filenames breaking redirect with Sinatra 1.3.1
2012-04-10 16:10:02 -07:00
aa544f03fb
Merge pull request #166 from arr2036/mediawiki_compat
...
Gollum doesn't play nice with un-canonicalized filenames, and breaks offsite links when replacing mediawiki
2012-04-10 16:04:09 -07:00
8d42c06fb0
Remove MathJax.
2012-04-10 15:59:05 -07:00
4480ff0520
update the gemspec to reflect mathjax being gone
2012-04-10 15:55:30 -07:00
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
337a9b180e
Merge remote-tracking branch 'xdite/highlight-utf8'
2012-04-10 15:27:46 -07:00
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
26d5abe7a5
Merge pull request #264 from github/remove_contents
...
remove contents of script and style elements
2012-04-10 15:26:00 -07:00
bf8246c705
minor api updates
2012-04-10 15:21:34 -07:00
73cd25b05f
Merge remote-tracking branch 'origin/master' into xdite-merge
...
Conflicts:
lib/gollum/markup.rb
2012-04-10 15:16:13 -07:00
c5cc6905de
Merge pull request #283 from dentarg/master
...
Serve Gravatars via SSL
2012-04-10 15:06:30 -07:00
7b0a714e1f
Serve Gravatars via SSL.
2012-03-17 19:06:11 +01:00
b47d83a7f2
Fix searchbar position and button appearance
2012-03-04 17:57:31 +08:00
5f4d312b8e
Added test for ASCII characters in code blocks created with back ticks.
2012-02-07 12:52:06 +02:00
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
4e9111976e
Make default markup changeable through sinatra settings
2011-12-22 20:20:03 -07:00
5163f11ecb
allow ftp and irc protocol links in wiki pages
2011-12-22 09:30:27 -07:00
Ryan Fowler
Corey Donohoe
kristi
Vicent Martí
Jussi Malinen
bootstraponline
Patrik Ragnarsson
muzuiget
Polarblau
Jesse Newland
Dave Hulihan
rick