github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-30 09:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
824 Commits 60 Branches 160 Tags
f7eacb7666ca2b5c2088f6451799b889bbdca7fc
Commit Graph

465 Commits

Author SHA1 Message Date
Tom Preston-Werner
72c8ceba4e Merge pull request #651 from alagu/master 
Posterous importer update
 2012-12-31 18:24:43 -08:00
stereobooster
a5a6900948 fix error for case with broken encoding 2012-12-30 00:07:21 +02:00
stereobooster
2dbce8ca9f fix error for case with wrong encoding or error in YAML 2012-12-29 23:32:34 +02:00
Tom Preston-Werner
c23302f4fa Merge branch 'deletion_protection' of https://github.com/jasonroelofs/jekyll into jasonroelofs-deletion_protection 2012-12-26 14:02:41 -07:00
Tom Preston-Werner
d58a0c1088 Release 0.12.0 2012-12-22 16:46:30 -07:00
Tom Preston-Werner
3a8ebb4b71 Merge branch 'fix/front-matter-regexp' of https://github.com/zimbatm/jekyll into zimbatm-fix/front-matter-regexp 2012-12-15 22:09:41 -08:00
Tom Preston-Werner
22f4b12836 Clean up default config spec. 2012-12-15 22:09:21 -08:00
Tom Preston-Werner
583f9e0019 Merge branch 'master' of https://github.com/Neil-Smithline/jekyll into Neil-Smithline-master 2012-12-15 16:42:26 -08:00
Tom Preston-Werner
26f8d60542 Merge branch 'master' of https://github.com/wbrady/jekyll into wbrady-master 2012-12-15 16:35:45 -08:00
Tom Bell
38ac55381b Only pass first class to Pygments 
This prevents an exception if something like the following is used:

~~~ {foo bar}
some code
~~~
 2012-11-13 07:59:36 +00:00
Alagu
2726a5f27c Merge branch 'master' of git://github.com/mojombo/jekyll 2012-10-03 19:33:21 -07: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
Neil-Smithline
3904fd9257 make yaml parsing errors more informative 2012-06-29 12:08:57 -04: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
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
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
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
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
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
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