 Corey Donohoe
|
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 |
|
 Aman Gupta
|
218c894b5a
|
Merge pull request #319 from bootstraponline/looseObject
Fix LooseObjectError by upgrading to grit 2.5.
|
2012-05-07 13:29:21 -07:00 |
|
 bootstraponline
|
0dec522542
|
Fix LooseObjectError by upgrading to grit 2.5. See https://github.com/mojombo/grit/issues/65
|
2012-05-07 14:26:48 -06:00 |
|
|
bootstraponline
|
7fa6708483
|
Add _Header.md to revert.git.
|
2012-05-07 14:17:15 -06:00 |
|
 kristi
|
33af47c282
|
Make code border darker
|
2012-05-07 00:22:24 -07:00 |
|
|
kristi
|
6b971e9e1b
|
uniform spacing for css
|
2012-05-07 00:22:24 -07:00 |
|
|
kristi
|
50107504a6
|
Add images from github
|
2012-05-07 00:22:23 -07:00 |
|
|
kristi
|
2cb0c9fea6
|
Fix urls
|
2012-05-07 00:22:23 -07:00 |
|
|
Corey Donohoe
|
dd7c2cc7f6
|
Merge pull request #317 from kristi/frontend-tweak
Frontend tweak
|
2012-05-06 17:00:16 -07:00 |
|
|
kristi
|
857ca14499
|
add bottom margin to wiki-page css
|
2012-05-06 16:37:29 -07:00 |
|
|
kristi
|
f022b3fcde
|
Use github markup for page and sidebar content
|
2012-05-06 16:37:29 -07:00 |
|
|
kristi
|
9470ff2dcc
|
fix the sidebar editor
|
2012-05-06 16:37:28 -07:00 |
|
|
Corey Donohoe
|
d817a4fdb6
|
fixup page versioning, fixes #174
Thanks @nealpoole and @arr2036
v2.0.0
|
2012-05-06 13:30:23 -07:00 |
|
|
Corey Donohoe
|
19635b06cf
|
gemspec updates
|
2012-05-06 12:08:25 -07:00 |
|
|
Corey Donohoe
|
872776660b
|
next version will be 2.0
|
2012-05-06 12:08:12 -07:00 |
|
|
Corey Donohoe
|
9644d4b00e
|
dupe sanitization attrs initialized by constants, fixes #200
|
2012-05-06 12:07:41 -07:00 |
|
|
bootstraponline
|
04579d7ae6
|
Update test.
|
2012-05-05 13:51:46 -06:00 |
|
|
bootstraponline
|
e9a9eb1779
|
Add header.
|
2012-05-05 13:49:01 -06:00 |
|
|
Corey Donohoe
|
9a1dddaccf
|
whitelist apt uri schemes, fixes #233
|
2012-05-05 11:56:01 -07:00 |
|
|
Corey Donohoe
|
4110ab5a82
|
Merge pull request #308 from bootstraponline/title
Title defined by filename only.
|
2012-05-04 15:35:32 -07:00 |
|
|
Corey Donohoe
|
5d1844e491
|
Merge pull request #313 from kristi/frontend-tweak
Fix searchbar scaling issue
|
2012-05-04 09:44:23 -07:00 |
|
|
kristi
|
6a126d46ee
|
Fix searchbar scaling issue
|
2012-05-04 09:35:27 -07:00 |
|
|
kristi
|
f834a0c84f
|
searchbar fix for ie9
|
2012-05-04 09:24:20 -07:00 |
|
|
Corey Donohoe
|
9dfeb237e7
|
Merge pull request #312 from kristi/frontend-tweak
searchbar fix for ie9
|
2012-05-04 09:21:45 -07:00 |
|
|
Corey Donohoe
|
b769ba2974
|
Merge pull request #310 from kristi/frontend-tweak
Frontend tweaks
|
2012-05-04 08:32:17 -07:00 |
|
|
Corey Donohoe
|
fc1feb280f
|
let's use 0.8.0 if at all
|
2012-05-04 08:25:01 -07:00 |
|
|
Corey Donohoe
|
bface83af7
|
Merge pull request #309 from nricciar/master
Gollum using very old version of wikicloth
|
2012-05-04 08:24:14 -07:00 |
|
|
bootstraponline
|
9a89a16388
|
Update live preview and gemspec.
|
2012-05-03 17:22:34 -06:00 |
|
|
bootstraponline
|
7649abf86a
|
Add encodeURIComponent.
|
2012-05-03 11:51:59 -06:00 |
|
|
bootstraponline
|
b6ad97745d
|
Use encodeURIComponent.
|
2012-05-03 11:49:41 -06:00 |
|
|
bootstraponline
|
92028e191d
|
Remove console.log.
|
2012-05-03 11:13:27 -06:00 |
|
|
bootstraponline
|
7d4427a5d3
|
Add save and load.
|
2012-05-03 11:10:50 -06: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 |
|
|
bootstraponline
|
347260f17b
|
Add livepreview (7f3ed651e4e4388977f9b3ce29ed1a995ff6d7a9).
|
2012-05-02 16:59:50 -06:00 |
|
|
bootstraponline
|
1086fba7da
|
Only use live preview for editing markdown pages.
|
2012-05-02 16:58:49 -06: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 |
|
 David
|
12cf102543
|
removing hardcoded reference to old version of wikicloth
|
2012-05-02 20:45:46 +00:00 |
|
|
kristi
|
3d95730880
|
Fix navbar and searchbar css
|
2012-05-02 13:00:46 -07:00 |
|
|
bootstraponline
|
c5d807dd58
|
Fix tests.
|
2012-05-02 12:13:18 -06:00 |
|
|
bootstraponline
|
d40df79dce
|
Title defined by filename only.
|
2012-05-02 12:05:57 -06: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 |
|
|
Corey Donohoe
|
e2cd8d93f4
|
Merge pull request #306 from pdeschen/master
README Installation requirements sub section for mathematical equations support
|
2012-05-01 16:33:51 -07:00 |
|
|
Corey Donohoe
|
afc6ec468f
|
bit of testing info
|
2012-05-02 01:33:15 +02:00 |
|
|
Corey Donohoe
|
391838cfc3
|
no more rbx
|
2012-05-02 01:25:52 +02:00 |
|
|
Corey Donohoe
|
36a11ded4f
|
Merge pull request #304 from rwfowler/asciidocLinksWithTravis
Disable internal link processing for asciidoc
|
2012-05-01 16:10:51 -07:00 |
|
|
Corey Donohoe
|
f540ef2e06
|
Merge pull request #305 from rwfowler/goForGreen
Fix the test_normalizes_commit_hash on Travis-CI
|
2012-05-01 16:04:39 -07:00 |
|