Commit Graph

381 Commits

Author SHA1 Message Date
Randy Merrill a71ab7c418 Changing from using branch as the variable to using ref. 2011-01-27 11:38:48 -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
Brian Lopez f708dc7002 fix bug due to the way Array#to_s works in 1.9 2011-01-20 15:06:21 -08:00
rick a78964ae30 upgrade to sanitize 2.0 2011-01-20 14:14:40 -08:00
rick 8ddb781588 yield the created SHA1 in the after_commit callback 2011-01-19 05:51:16 -08:00
rick 2b1510af11 edit a page, sidebar, and footer all in one commit 2011-01-19 05:20:58 -08:00
rick aae9eb1883 refactor wiki commit logic into Gollum::Committer class 2011-01-19 05:16:16 -08:00
rick a9d4e117aa fix markup formatting edge case 2011-01-17 10:17:14 -08:00
rick feff07ae9c Merge branch 'org-mode-file-links' of https://github.com/hugoduncan/gollum into hugoduncan-org-mode-file-links 2011-01-17 10:12:50 -08:00
rick f6f8428daf merge page-file-dir_option branch 2011-01-17 10:05:21 -08:00
rick 11fcf0c784 fix whitespace, remove old no_follow code (nokogiri to the rescue) 2011-01-17 09:15:21 -08:00
rick ca2aaa543a Merge branch 'mediawiki_fixups' of https://github.com/qmx/gollum into qmx-mediawiki_fixups 2011-01-17 09:06:00 -08:00
rick e2a4514be5 add the ability to revert whole commits that touch multiple files 2011-01-13 15:50:35 -08:00
rick 002fe8d409 add method for getting the reverse diff without a page path 2011-01-13 13:32:15 -08:00
rick daa07326df docs for some of the diffing methods 2011-01-13 13:21:14 -08:00
rick 9a4e2e39a8 update albino to 1.2.3, handle bad code blocks gracefully 2011-01-12 15:00:58 -08:00
Douglas Campos 0a1ecde7b6 typo 2011-01-12 01:00:01 -02:00
Douglas Campos 2dbb4e9fa7 fixed mediawiki link handling 2011-01-12 00:57:21 -02:00
rick c5e4935e85 tweak code markup parser so that blocks without a language are just output in pre tags 2011-01-11 01:00:51 -08:00
rick 45765eb161 add proper shell escaping for Albino 2011-01-11 00:58:04 -08:00
rick 992ec36295 accidental removal 2011-01-11 00:04:38 -08:00
rick 41a21efe9f don't attempt to serve public assets from sinatra 2011-01-10 16:44:20 -08:00
rick 0fd639a149 whitespace plugin 2011-01-10 16:44:07 -08:00
Hugo Duncan 32d1f9eb2f Add parsing of org-mode [[file:path.org][label]] links 2011-01-07 23:59:36 -05:00
eston cc85879810 Don't short circuit now 2011-01-04 17:15:13 -08:00
eston 74a58ce8b5 Turn off debug mode in editor by default 2011-01-04 17:10:42 -08:00
eston a93a2fb53d Merge branch 'master' of github.com:github/gollum 2011-01-04 13:49:16 -08:00
Eston Bond ea49ef806b Fail nicely with a malformed language definition, play by Crockford's rules 2011-01-03 16:48:42 -08:00
rick 21332010ab new textmate whitespace killa 2011-01-03 15:52:27 -08:00
rick f7b7d0d965 add mediawiki support 2011-01-03 15:52:13 -08:00
rick 4fa3951718 fix tests for normalize_dir 2010-12-31 12:30:23 -06:00
jondot 096edd20da fixing dir normalization under windows 2010-12-31 19:21:54 +02:00
Eston Bond 58a680ab6d Merge branch 'master' of git://github.com/github/gollum 2010-12-21 02:36:43 -08:00
Eston Bond ed38357ac8 Reset type size for syntax highlighting 2010-12-21 02:33:57 -08:00
Eston Bond 3a6d98aa37 Fix font size in sidebar 2010-12-21 02:33:20 -08:00
Eston Bond 8b032f03f2 Adding absent link color 2010-12-13 14:34:44 -08:00
Eston Bond 87be3ff414 Fix line heights of captions 2010-12-13 14:27:22 -08:00
Eston Bond 55aaa5ee08 Fix deprecated style classes 2010-12-13 14:25:43 -08:00
Eston Bond d934ed9d80 Fix checkbox selector 2010-12-13 14:07:48 -08:00
Eston Bond 6a60bd9544 Put revert action where it should be 2010-12-13 13:58:01 -08:00
rick 32b938905e better html structure for the compare action menu 2010-12-09 18:26:27 -08:00
rick 0f15a05ee6 search page has no edit/history links 2010-12-09 18:23:47 -08:00
rick 17a57b8071 show appropriate error message when revert wont apply 2010-12-09 18:11:46 -08:00
rick d0475a45ed add revert button, omg its fugly 2010-12-09 18:06:11 -08:00
rick 19ef3710c3 fix compare view if there is no diff between 2 versions 2010-12-09 17:52:01 -08:00
rick 8769e3475b it does not assume you want to revert the parent of the first sha when reverting 2 shas 2010-12-09 17:21:09 -08:00
rick 979d89a23f add revert action 2010-12-09 17:19:18 -08:00
rick 79a1fb860d add ability to change footer and sidebar of page 2010-12-09 16:49:03 -08:00
rick 6edd327ff0 refactor page update logic 2010-12-09 16:29:43 -08:00
rick f5480c21d2 fix previews 2010-12-09 16:15:28 -08:00