github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-04-28 03:01:03 -04:00
Code Issues Packages Projects Releases Wiki Activity
773 Commits 62 Branches 160 Tags
bab29f64f741de58681539b279eb0f72f7911983
Commit Graph

445 Commits

Author SHA1 Message Date
Matt Rogers
bab29f64f7 Look for plugins under the source directory 
When generating the site, Jekyll will now look for plugins under the
source directory by default. The plugin location can still be changed in
_config.yml
 2012-10-12 22:43:20 -05: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
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
b2a1d61c04 Swap out albino for pygments.rb 2012-05-31 15:51:34 -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
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
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
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
Dane Harrigan
316cc8559c moved paginate_path to default config 2012-02-26 20:58:14 -08: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
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
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
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
Tom Preston-Werner
1292c02ec0 Merge pull request #384 from voxpelli/drupal-alias-redirect 
Added redirects for Drupal posts' URL-aliases
 2012-01-21 20:04:40 -08:00
Tom Preston-Werner
6e921c5852 Merge pull request #383 from voxpelli/drupal-db-prefix 
Added table prefix option to Drupal migration
 2012-01-21 20:03:09 -08:00
Tom Preston-Werner
574e933d81 Merge branch 'master' of https://github.com/jpravetz/jekyll into jpravetz-master 2012-01-21 19:59:05 -08:00
Tom Preston-Werner
d36a1064a7 Merge pull request #437 from stephenmcd/master 
Improved Tumblr Support
 2012-01-21 19:54:00 -08:00
Tom Preston-Werner
d00bc8e8fe Merge branch 'master' of https://github.com/tmtk75/jekyll into tmtk75-master 2012-01-21 19:49:08 -08:00
Tom Preston-Werner
c797d420c4 Merge branch 'patch-1' of https://github.com/hypertexthero/jekyll into hypertexthero-patch-1 2012-01-21 19:45:24 -08:00
Tom Preston-Werner
03ad973523 Update history. 2012-01-21 19:43:32 -08:00
Tom Preston-Werner
65890da3d1 Merge branch 'categories_with_space' of https://github.com/spk/jekyll into spk-categories_with_space 2012-01-21 19:36:09 -08:00
Nicholas Firth-McCoy
19fc8cb488 Oops, still need email and pass. Update usage comment 2012-01-18 11:08:02 +11:00
Nicholas Firth-McCoy
c3b12457a0 Update Posterous migrator to take an api_token instead of email and pass 
The Posterous API call for retrieving a user's API token (`/api/2/auth/token`) is no longer supported and returns 410 GONE. This patch updates the #process method to accept an API token instead of an email address and password. A user's API token can be retrieved from http://posterous.com/api.
 2012-01-18 10:55:58 +11:00
Tom Preston-Werner
d0d143452a Merge branch 'master' of https://github.com/laumann/jekyll 2012-01-15 20:39:55 -08:00
Tom Preston-Werner
c14eb346a3 Allow [+.#-] in highlight lang shortnames. Fixes #282. 2012-01-15 20:35:09 -08:00
Tom Preston-Werner
89180169a4 Merge branch 'include' of https://github.com/lukebayes/jekyll into lukebayes-include 
Conflicts:
	lib/jekyll.rb
	lib/jekyll/site.rb
 2012-01-14 19:48:04 -08:00
Stephen McDonald
f2502dfab2 Added handling for Tumblr missing image extensions. 2011-12-30 23:25:09 +11:00
Stephen McDonald
c26bd30318 Fix photo link URL. 2011-12-29 11:58:11 +11:00
Stephen McDonald
bab178d9f8 Strip HTML from any caption-based titles. 2011-12-29 11:37:46 +11:00
Stephen McDonald
743e01f231 Fixed a change in Tumblr's API whereby photos no longer have a single URL field. 2011-12-29 11:37:06 +11:00
Tom Preston-Werner
b66840ca46 Release 0.11.2 2011-12-27 17:53:50 -07:00
Tom Preston-Werner
4ece77300b Gah, did not commit these for v0.11.1 version release. 2011-12-27 17:48:00 -07:00
Stephen McDonald
3ab7658d1f Fixed Tumblr URL redirects. 2011-12-28 08:16:19 +11:00
Stephen McDonald
886b9740f2 Fixed grab_images handling. 2011-12-27 10:09:59 +11:00
Kendall Buchanan
9523c3990e Adding migrator for RSS feeds. 2011-12-22 12:33:15 -07:00
Simon Griffee
06d9446ade Added missing <code>require 'yaml'</code>, without which the TextPattern migrator script was failing. 2011-12-04 23:35:36 +01:00
jpravetz
9a3429dc74 Update lib/jekyll/convertible.rb 2011-12-04 08:37:42 -08:00
Stephen McDonald
0f51c81cfa Added support for rewriting Tumblr URLs to Jekyll URLs in posts, meta redirects for Github pages, and automatic addition of Pygments highlight tags. 2011-12-04 12:01:37 +11:00