Corey Donohoe
9dfeb237e7
Merge pull request #312 from kristi/frontend-tweak
...
searchbar fix for ie9
2012-05-04 09:21:45 -07:00
kristi
f834a0c84f
searchbar fix for ie9
2012-05-04 09:24:20 -07:00
Corey Donohoe
b769ba2974
Merge pull request #310 from kristi/frontend-tweak
...
Frontend tweaks
2012-05-04 08:32:17 -07:00
Vicent Martí
2bea800a37
Proper ordering for markup processing, fixes #135
...
Code blocks get extracted first.
2012-05-02 18:53:41 -07:00
kristi
4c1ff7deb7
fixup the compare revisions page
2012-05-02 16:55:16 -07:00
kristi
5a7cb129bb
Fixup css styling for pages, editor, history
2012-05-02 15:52:15 -07:00
kristi
b29d22e99b
Make navbar flow nicely for narrow windows
2012-05-02 13:51:26 -07:00
kristi
3d95730880
Fix navbar and searchbar css
2012-05-02 13:00:46 -07:00
Corey Donohoe
3cfa297b49
hide the page title as before
2012-05-02 19:29:17 +02:00
Corey Donohoe
e435769345
remove executable bit
2012-05-02 19:20:57 +02:00
bootstraponline
9a73877b3e
Fix search bar and restore title.
2012-05-02 11:03:37 -06: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
Vicent Martí
6aa4e382b2
Tag 1.4.3
2012-04-25 14:12:54 -07:00
Vicent Martí
8051d4f9b0
Fix the public path
2012-04-25 14:11:02 -07:00
Vicent Martí
31a49601b1
Namespace the public assets
2012-04-25 14:11:02 -07:00
Vicent Martí
9b92e9d325
Add Gollum.assets_path hook
2012-04-25 11:46:28 -07:00
Corey Donohoe
833953d658
bump to 1.4.2
2012-04-25 20:44:16 +02:00
Corey Donohoe
198dc8a8e2
Merge remote-tracking branch 'jussimalinen/fix-rest-local-links'
2012-04-25 17:00:56 +02:00
Vicent Martí
78cd65240f
Tag 1.4.1
2012-04-24 20:42:33 -07: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í
b5a2a8df67
Keep a MarkupGFM class for compatibility reasons
2012-04-12 22:54:45 +02: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
Vicent Martí
7317a9ba2d
Allow indented code blocks in Gollum syntax
2012-04-12 22:52:08 +02:00
Corey Donohoe
d6a4009989
nuke whitespace
2012-04-10 18:38:04 -07:00
Corey Donohoe
b9a970a19a
minor css fixups from github's internal copy
2012-04-10 18:25:09 -07:00
Corey Donohoe
bee93eade1
release 1.4.0
2012-04-10 18:15:39 -07:00
Corey Donohoe
28b494c913
Merge remote-tracking branch 'andrew0/editor_hooks'
2012-04-10 17:50:02 -07:00
Corey Donohoe
817f189154
be a little more rubyish
2012-04-10 17:40:47 -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
8745314ad8
Merge pull request #281 from muzuiget/master
...
Fix searchbar position and button appearance
2012-04-10 17:11:19 -07:00
Corey Donohoe
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
Corey Donohoe
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
Corey Donohoe
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
bootstraponline
8d42c06fb0
Remove MathJax.
2012-04-10 15:59:05 -07:00
Corey Donohoe
4480ff0520
update the gemspec to reflect mathjax being gone
2012-04-10 15:55:30 -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
337a9b180e
Merge remote-tracking branch 'xdite/highlight-utf8'
2012-04-10 15:27:46 -07:00
Corey Donohoe
26d5abe7a5
Merge pull request #264 from github/remove_contents
...
remove contents of script and style elements
2012-04-10 15:26:00 -07:00
Corey Donohoe
bf8246c705
minor api updates
2012-04-10 15:21:34 -07:00
Corey Donohoe
73cd25b05f
Merge remote-tracking branch 'origin/master' into xdite-merge
...
Conflicts:
lib/gollum/markup.rb
2012-04-10 15:16:13 -07:00
Patrik Ragnarsson
7b0a714e1f
Serve Gravatars via SSL.
2012-03-17 19:06:11 +01:00
muzuiget
b47d83a7f2
Fix searchbar position and button appearance
2012-03-04 17:57:31 +08: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
Dave Hulihan
4e9111976e
Make default markup changeable through sinatra settings
2011-12-22 20:20:03 -07:00
rick
5163f11ecb
allow ftp and irc protocol links in wiki pages
2011-12-22 09:30:27 -07:00
xdite
5a1d5fa4f0
syntax highlight should with utf-8
2011-12-21 15:18:12 +08:00
Chris Causer
d389390523
Escape names on page create redirect
2011-12-14 13:10:44 +00:00
Vicent Marti
8014486fd8
XHTML is dead
...
Do not enforce the XHTML conversion for Wiki pages. HTML is cool!
2011-12-07 18:57:07 +01:00