efd2f49484
Remove unused local var.
2012-05-07 15:37:24 -06:00
9d4d6ccca5
Merge remote-tracking branch 'bootstraponline/gollum2'
...
/cc @kristi is the css behaving on this? we had minor markup conflicts
Conflicts:
lib/gollum/frontend/templates/page.mustache
2012-05-07 14:10:38 -07:00
857ca14499
add bottom margin to wiki-page css
2012-05-06 16:37:29 -07:00
f022b3fcde
Use github markup for page and sidebar content
2012-05-06 16:37:29 -07:00
9470ff2dcc
fix the sidebar editor
2012-05-06 16:37:28 -07:00
d817a4fdb6
fixup page versioning, fixes #174
...
Thanks @nealpoole and @arr2036
2012-05-06 13:30:23 -07:00
872776660b
next version will be 2.0
2012-05-06 12:08:12 -07:00
9644d4b00e
dupe sanitization attrs initialized by constants, fixes #200
2012-05-06 12:07:41 -07:00
e9a9eb1779
Add header.
2012-05-05 13:49:01 -06:00
9a1dddaccf
whitelist apt uri schemes, fixes #233
2012-05-05 11:56:01 -07:00
4110ab5a82
Merge pull request #308 from bootstraponline/title
...
Title defined by filename only.
2012-05-04 15:35:32 -07:00
5d1844e491
Merge pull request #313 from kristi/frontend-tweak
...
Fix searchbar scaling issue
2012-05-04 09:44:23 -07:00
6a126d46ee
Fix searchbar scaling issue
2012-05-04 09:35:27 -07:00
f834a0c84f
searchbar fix for ie9
2012-05-04 09:24:20 -07:00
9dfeb237e7
Merge pull request #312 from kristi/frontend-tweak
...
searchbar fix for ie9
2012-05-04 09:21:45 -07:00
b769ba2974
Merge pull request #310 from kristi/frontend-tweak
...
Frontend tweaks
2012-05-04 08:32:17 -07:00
2bea800a37
Proper ordering for markup processing, fixes #135
...
Code blocks get extracted first.
2012-05-02 18:53:41 -07:00
4c1ff7deb7
fixup the compare revisions page
2012-05-02 16:55:16 -07:00
5a7cb129bb
Fixup css styling for pages, editor, history
2012-05-02 15:52:15 -07:00
b29d22e99b
Make navbar flow nicely for narrow windows
2012-05-02 13:51:26 -07:00
3d95730880
Fix navbar and searchbar css
2012-05-02 13:00:46 -07:00
d40df79dce
Title defined by filename only.
2012-05-02 12:05:57 -06:00
3cfa297b49
hide the page title as before
2012-05-02 19:29:17 +02:00
e435769345
remove executable bit
2012-05-02 19:20:57 +02:00
9a73877b3e
Fix search bar and restore title.
2012-05-02 11:03:37 -06:00
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
9dba3f9c58
Revert "Merge pull request #303 from rwfowler/asciidocLinks"
...
This reverts commit 8fbbe40300b7fb4c5950
2012-05-01 19:51:05 +02: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
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
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
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
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
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
bootstraponline
Corey Donohoe
kristi
Vicent Martí
Ryan Fowler
Jussi Malinen