Commit Graph

40 Commits

Author SHA1 Message Date
Jamie Oliver b989f160cf Merge branch 'master' into feature/gollum-lib
Conflicts:
	lib/gollum/markup.rb
	test/test_gitcode.rb
2013-03-20 07:46:11 +00:00
Jamie Oliver 1f79126b27 Move gollum back end to gollum-lib #647 2013-03-19 22:11:09 +00:00
Simon Williams 846ebb285e Add option for custom js (like custom css)
* Add a new 'js' flag to indicate you want to embed a file named 'custom.js'
  which should exist at the root of the wiki
2013-03-17 18:42:01 -06:00
Yoichi Imai 2b5e017aa1 Pass the value of --host parameter to Rack::Server 2012-11-17 19:42:28 +09:00
bootstraponline bda3b7b24d Fix --user-icons 2012-11-13 22:56:30 -07:00
Daniel Kimsey ee8ec78da7 Add --user-icons option: none, gravatar, and identicon. 2012-11-13 21:17:23 -05:00
bootstraponline 470a7b8f52 Fix #579 2012-11-11 14:40:47 -07:00
bootstraponline 7c4052906c Add custom css 2012-11-07 19:40:52 -07:00
Adrian Knoth c7a9534ed9 Add --collapse-tree command line option 2012-10-23 14:27:15 +02:00
bootstraponline fbc0548b43 Add --show-all
--show-all will show all files in file view (not just valid pages). Default is false.
2012-10-22 19:03:21 -06:00
bootstraponline fa97b57a96 Define default map as suggested on #460
Base path now sets a default map without having to use an external config.ru.
2012-10-14 20:57:27 -06:00
Neal Pisenti 0bcd616668 fix mathjax option, fixes #509 2012-09-09 11:50:48 -06:00
bootstraponline 1e768734ef Disable MathJax by default.
GitHub.com doesn't support MathJax. The parser is not MathJax aware which causes problems.

--mathjax enables MathJax.
2012-08-22 13:31:21 -06:00
bootstraponline 7392bce5dc Restore livepreview.
Improvements include:
- UTF-8 aware
- Undo and redo support
- Code highlighting fixes
- New tests ensure output matches native sundown

Use jquery 1.7.2
2012-07-18 18:11:19 -06:00
bootstraponline ccdbd71517 Fix style. 2012-07-17 11:19:54 -06:00
Adam Hamsik ab9d8fb3db Add option to define gollum path from command line. This way we can use different git repo for wiki files and different repo for
gollum.
2012-07-17 15:25:55 +02:00
bootstraponline d7f3acfd05 Disable live preview until a robust JavaScript based markdown parser is found. 2012-07-13 00:42:26 -06:00
Arran Cudbard-Bell 3c709a27ac Add commandline option for disabling livepreview 2012-06-07 18:05:15 +02:00
bootstraponline 01e1c92813 Add --base-path option. 2012-05-24 20:45:33 -06:00
bootstraponline ff8b892ebe Add mathjax using SSL CDN. 2012-05-24 17:18:55 -06:00
Randy Merrill a71ab7c418 Changing from using branch as the variable to using ref. 2011-01-27 11:38:48 -08:00
Randy Merrill 2bb1937fa9 Fixing the docs for the default branch. 2011-01-27 11:29:21 -08:00
Randy Merrill 3c44205be7 Adding the logic to accept a command line flag for the branch to use to retrieve pages. 2011-01-27 11:24:15 -08:00
rick f6f8428daf merge page-file-dir_option branch 2011-01-17 10:05:21 -08:00
Eston Bond e8f0f01a1d Merge branch 'redesign' of github.com:eston/gollum into redesign 2010-11-27 13:04:40 -08:00
eston 4b6eb34504 Make help and gollum action work the same, bind to 0.0.0.0 2010-11-27 12:59:29 -08:00
Asher Van Brunt 738d171f6b Resolve Issue 15: Allow passing configuration option 2010-10-14 19:09:22 -07:00
Hiroshi Saito fcdffc39ff Added --page-file-dir option to gollum command 2010-10-07 17:55:40 +09:00
Tom Preston-Werner 42985dc5c1 Explicitly set default port to 4567. 2010-09-29 14:42:24 -07:00
Tom Preston-Werner ee6b71ff80 Change 'bind' CLI option to 'host'. Set default to 127.0.0.1. Closes #47. 2010-09-29 14:40:36 -07:00
Emilien Taque 48bfe954d1 add Sinatra --bind option through gollum binary 2010-09-15 22:53:15 +02:00
rick 7c70174725 handle invalid options 2010-08-30 18:50:02 -07:00
Jon Frisby 515f8610c4 Make --version not cough up a furball.
Commit 8c625419b8 moved the require down,
which broke --version.
2010-08-31 08:59:56 +08:00
rick 05283347b0 more descriptive irb output
also, code poetry arguments
2010-08-23 16:35:17 -07:00
rick 99995f7364 convert $path global to a gollum_path sinatra setting 2010-08-23 16:16:39 -07:00
rick 8c625419b8 add irb option for the cli script 2010-08-23 16:13:38 -07:00
Tom Preston-Werner 4fc446b8a3 Pass port through to gollum executable. 2010-07-29 23:04:35 -04:00
Tom Preston-Werner daa633379d Port default is 4567. 2010-07-13 13:25:40 -07:00
Tom Preston-Werner 450c168383 Allow custom dir. 2010-07-12 18:00:11 -07:00
Tom Preston-Werner c88a1ca5a5 Gollum executable. 2010-07-12 17:54:13 -07:00