 bootstraponline
|
31b3aea282
|
Merge branch 'master' of github.com:github/gollum
|
2012-05-09 14:36:37 -06:00 |
|
|
bootstraponline
|
2e1d236e8e
|
Enable previewframe scrolling.
|
2012-05-09 14:36:20 -06:00 |
|
|
bootstraponline
|
4f1dcea806
|
|
2012-05-09 14:28:32 -06:00 |
|
|
bootstraponline
|
5da1a2c611
|
|
2012-05-09 14:28:20 -06:00 |
|
|
bootstraponline
|
180a214e1f
|
Merge pull request #311 from bootstraponline/livepreview
Live Preview.
|
2012-05-09 13:24:12 -07:00 |
|
|
bootstraponline
|
2fd07211d9
|
Update README.md
|
2012-05-09 12:06:05 -06:00 |
|
|
bootstraponline
|
128f3be596
|
Use template.css
|
2012-05-09 10:56:52 -06:00 |
|
|
bootstraponline
|
810333dbb7
|
Update link CSS to match github.com.
|
2012-05-09 10:24:12 -06:00 |
|
|
bootstraponline
|
e465358ec0
|
Add Ubuntu asciidoc install commmand.
|
2012-05-09 10:03:38 -06:00 |
|
|
bootstraponline
|
2954ed84a0
|
Merge pull request #327 from arr2036/master
Pass :is_bare to Grit where appropriate.
|
2012-05-09 08:57:18 -07:00 |
|
 Arran Cudbard-Bell
|
b36cd8a68e
|
Pass through :is_bare option from wiki_options, allows Gollum to work with gitolite
|
2012-05-09 16:12:00 +02:00 |
|
 Kristi
|
a692ec1124
|
Merge pull request #326 from kristi/frontend-tweak
Frontend tweak: Add header to editor, small fixup for asciidoc css, add spacing to headers
|
2012-05-08 17:25:26 -07:00 |
|
|
kristi
|
4e5f2c9587
|
Add header to editor
|
2012-05-08 17:29:28 -07:00 |
|
|
kristi
|
1cc263acfb
|
Make footer editor font normal sized
|
2012-05-08 17:22:39 -07:00 |
|
|
kristi
|
49c6534da6
|
Put asciidoc fix into template with the rest of the markup css
Also remove padding from the asciidoc code block so first line doesn't get indented
|
2012-05-08 17:11:02 -07:00 |
|
|
bootstraponline
|
02d3a3d7ec
|
Clarify gemspec task desc.
|
2012-05-08 16:36:44 -06:00 |
|
|
kristi
|
1dbe49243c
|
Give headers more headroom
|
2012-05-08 15:03:15 -07:00 |
|
|
kristi
|
2c12fb7ae8
|
Add missing semicolons
|
2012-05-08 15:02:52 -07:00 |
|
|
kristi
|
829c6debbd
|
Merge remote-tracking branch 'upstream/master' into frontend-tweak
|
2012-05-08 14:58:32 -07:00 |
|
|
bootstraponline
|
f2d3ed322e
|
Merge pull request #325 from bootstraponline/ascii_css
Fix AsciiDoc CSS.
|
2012-05-08 12:40:57 -07:00 |
|
|
bootstraponline
|
d90e7db497
|
Fix #278.
|
2012-05-08 13:39:21 -06:00 |
|
 Corey Donohoe
|
26f372a36a
|
this works on 1.9.3 now too
|
2012-05-08 12:25:03 -07:00 |
|
|
bootstraponline
|
b037777f83
|
Fix spacing.
|
2012-05-08 13:18:46 -06:00 |
|
|
bootstraponline
|
35ce35b1e0
|
Default to empty edit window.
|
2012-05-08 13:15:09 -06:00 |
|
|
bootstraponline
|
e1517c2907
|
Merge with upstream.
|
2012-05-08 13:13:36 -06:00 |
|
|
bootstraponline
|
ed5f88daa0
|
Remove unused local var.
|
2012-05-08 13:05:49 -06:00 |
|
|
bootstraponline
|
4afda646f0
|
Merge pull request #324 from bootstraponline/windowsNote
Add windows filename invalid characters notice to readme.
|
2012-05-08 11:36:41 -07:00 |
|
|
bootstraponline
|
e782538777
|
Add windows filename invalid notice to readme.
|
2012-05-08 12:17:36 -06:00 |
|
|
Corey Donohoe
|
4e86be86d9
|
Merge pull request #323 from kristi/frontend-tweak
Fix HR background
|
2012-05-07 21:22:29 -07:00 |
|
|
kristi
|
6c8cfcd7c2
|
Make code border darker
|
2012-05-07 20:47:04 -07:00 |
|
|
kristi
|
9fc7929665
|
uniform spacing for css
|
2012-05-07 20:47:04 -07:00 |
|
|
kristi
|
d590bf7d64
|
Add images from github
|
2012-05-07 20:47:04 -07:00 |
|
|
kristi
|
c0f653340e
|
Fix urls
|
2012-05-07 20:47:04 -07:00 |
|
|
Corey Donohoe
|
ac2bef083b
|
Merge pull request #322 from kristi/header-feature
Header feature
|
2012-05-07 20:42:14 -07:00 |
|
|
kristi
|
42c7d0ca44
|
Fix crazy spacing (sorry, git blame, I couldn't stand it any longer)
|
2012-05-07 20:35:28 -07:00 |
|
|
kristi
|
8a8afcfb24
|
Put gray background on header, fix footer font size
|
2012-05-07 20:28:07 -07:00 |
|
|
kristi
|
5d259bb5aa
|
Use markdown css formatting for header and footer
|
2012-05-07 20:09:59 -07:00 |
|
|
Corey Donohoe
|
d2a24ed4bc
|
Merge pull request #321 from bootstraponline/cleanUp
Remove unused local var.
|
2012-05-07 15:04:04 -07:00 |
|
|
bootstraponline
|
efd2f49484
|
Remove unused local var.
|
2012-05-07 15:37:24 -06:00 |
|
|
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 |
|