Commit Graph

7992 Commits

Author SHA1 Message Date
Alagu 67f403a9d6 Merge branch 'alagu-posterous-importer-rebased' of git://github.com/simensen/jekyll 2012-10-03 19:33:01 -07:00
edeustace 3da0bb3a74 removed puts 2012-08-23 12:13:04 +02:00
edeustace 7c800d3b07 Added a configuration variable: keep_files (default: ['.git']), based on this pull request: https://github.com/mojombo/jekyll/pull/556 2012-08-23 12:07:30 +02:00
Will Brady 336ea66983 Better error reporting on Liquid exceptions 2012-08-14 17:35:41 -04:00
Tom Bell 7f706f47fc Update redcarpet support to version 2 2012-08-13 15:03:33 +01:00
hokaccha 3d2664d983 pygments options for pygments.rb 2012-08-09 00:34:44 +09:00
Neil-Smithline 3904fd9257 make yaml parsing errors more informative 2012-06-29 12:08:57 -04:00
Tom Preston-Werner fa8400ab61 Merge pull request #574 from tombell/remove-rbx-travisci
Update travis-ci configuration file
2012-06-11 16:53:45 -07:00
Tom Bell 49a4be44cd Update travis-ci configuration file 2012-06-12 00:35:21 +01:00
Tom Preston-Werner ee402dd18a Merge branch 'switch-to-pygmentsrb' of https://github.com/tombell/jekyll into tombell-switch-to-pygmentsrb 2012-06-11 15:53:44 -07:00
Tom Preston-Werner 88428a8eb1 Merge pull request #568 from tombell/travis-ci
Add travis-ci configuration file
2012-06-11 15:52:58 -07:00
Tom Preston-Werner 202894c196 Merge branch 'custom-layout-directory' of https://github.com/tombell/jekyll into tombell-custom-layout-directory
Conflicts:
	lib/jekyll/site.rb
2012-06-11 15:40:22 -07:00
Tom Preston-Werner 47090ffd2a Fix up a few TomDocs. 2012-06-06 11:59:49 -07:00
Tom Preston-Werner 0e9e7fbc85 Simplify Site#read_layouts. 2012-06-06 11:59:49 -07:00
Tom Bell 58654176de No longer need pygments locally 2012-05-31 16:06:49 -04:00
Tom Bell b2a1d61c04 Swap out albino for pygments.rb 2012-05-31 15:51:34 -04:00
Tom Bell c71d7d5290 Add travis-ci configuration file
* Tests against: 1.9.3, 1.9.2, 1.8.7, rbx-18mode
* Fixes #387
2012-05-31 14:55:16 -04:00
Tom Bell df2ad2ac59 Allow a custom 'layouts' directory
* Add 'layouts' option to change the dir from '_layouts' to anything relative
  to the source directory
* Add cucumber scenario for testing an alternative directory '_theme'
* Closes #563
2012-05-30 21:39:43 -04:00
Jonas Pfenniger da4e8f2ee1 Front-matter should be at start of file
It's the theme of the moment ; regexp checking.

Just in case we have two line start with --- in the file, we want to
make sure it's not interpreted as a front-matter.
2012-05-25 18:59:26 +01:00
Luca Grulla 7d88f72409 avoiding to call site_payload one time per each post and page. Speed site creation up of a 20%. 2012-04-29 00:27:11 -07:00
Tom Preston-Werner 305695398c Update History. 2012-04-23 17:23:11 -07:00
Tom Preston-Werner 4533e60489 Merge branch 'master' of https://github.com/daneharrigan/jekyll into daneharrigan-master
Conflicts:
	lib/jekyll.rb
2012-04-23 16:48:18 -07:00
Tom Preston-Werner 8a0fbf02f5 Cleanup for RDiscount TOC support. Closes #333. 2012-04-23 16:15:55 -07:00
Michishige Kaito 6471ebf0ef Fixed helper inclusion in redcarpet test 2012-04-23 15:57:06 -07:00
Michishige Kaito fd5447a6e6 Added a test case for rdiscount toc rendering. 2012-04-23 15:56:46 -07:00
Michishige Kaito f5b2acf8cd Added support for inline TOCs with RDiscount 2012-04-23 15:56:28 -07:00
Tom Preston-Werner e29490c1c6 Allow setting of Kramdown smart_quotes. Fixes #482. 2012-04-23 15:34:54 -07:00
Fotos Georgiadis 4090500c5a Added path in url.
Page#dir was returning the wrong dir ('/') for pages in directories.
2012-04-09 03:08:41 +03:00
Jason Roelofs 604b60c9ba Add checks to prevent accidental deletion of the source directory 2012-04-03 22:05:18 -05:00
Jason Roelofs 8368485fa0 Remove deletion of dot files on cleanup.
This is a potentially very dangerous action that's impossible to test that it's correct.
If the '..' check line ever disappears, even running the tests will start deleting
everything accessible on the person's computer.

All dot-files that are generated are already known by Jekyll as either a static file or
a page (yaml front matter), only remove those files.
2012-04-03 21:33:35 -05:00
Charles Stuart cb336dbb71 fix issue 457: Custom destination in _config.yml causes jekyll server to auto-regenerate continuously 2012-03-20 13:58:32 -06:00
Dane Harrigan 316cc8559c moved paginate_path to default config 2012-02-26 20:58:14 -08:00
Jérémy Lecour 41f2805b7f No need to have a variable assignment, especially if it has the same name as the method parameter. 2012-02-11 09:05:59 +01:00
dunsmoreb 5fb801474e Truncate post slugs when importing from Tumblr.
Fixes #481.
2012-02-01 06:44:01 -06:00
Tom Preston-Werner 4499df8033 Shorten plugin loading code and update history. 2012-01-29 12:49:57 -08:00
Tom Preston-Werner 02366ae5ff Merge branch 'PluginsAsArray' of https://github.com/simensen/jekyll into simensen-PluginsAsArray 2012-01-29 12:32:59 -08:00
Tom Preston-Werner 9d70088f01 Properly select dotfiles during directory scan.
Fixes #363.
Fixes #431.
Fixes #377.
2012-01-23 00:21:08 -08:00
Beau Simensen e6d89c6a0f More testing, whitespace and comment cleanup. 2012-01-22 22:17:25 -08:00
Beau Simensen dcf546275b Tweaked plugin directory handling, tests. 2012-01-22 22:10:12 -08:00
Beau Simensen 0284b8b22f Handle Posterous rate limiting 2012-01-22 20:58:56 -08:00
Beau Simensen 5d6e87bbf3 Merge remote-tracking branch 'origin/alagu-master' into alagu-posterous-importer-rebased
Conflict created due to #472.

Conflicts:
	lib/jekyll/migrators/posterous.rb
2012-01-22 19:35:25 -08:00
Tom Preston-Werner e27e2554d9 Merge pull request #472 from nfm/patch-1
Update Posterous migrator to take an api_token
2012-01-22 16:27:32 -08:00
Tom Preston-Werner 2da64d9c44 Update history. 2012-01-22 16:25:15 -08:00
Tom Preston-Werner 16a4855200 Merge branch 'post_url' of https://github.com/thatguystone/jekyll into thatguystone-post_url 2012-01-22 16:03:10 -08:00
Tom Preston-Werner c04a9549ea Make note of self.name requirement for Convertible. 2012-01-22 15:02:41 -08:00
Tom Preston-Werner ac41b459fc Merge pull request #446 from ossxp-com/patch-1
Invalid migrator for WordPress because of a typo.
2012-01-22 15:02:09 -08:00
Tom Preston-Werner 3c2519f07d Merge pull request #419 from vjt/master
Exception handler in Convertible references nonexisting method .name
2012-01-22 00:25:55 -08:00
Tom Preston-Werner 613a7a46a3 Merge pull request #460 from kendagriff/master
RSS Migrator
2012-01-22 00:20:33 -08:00
Tom Preston-Werner 8adfaea339 Merge pull request #426 from joshbrown/master
Added a Joomla migrator
2012-01-22 00:19:35 -08:00
Tom Preston-Werner 22159b3d61 Merge pull request #368 from jacius/wordpress
Greatly improved and extended the wordpress.rb migrator.
2012-01-22 00:18:33 -08:00