0fa55418e9
merge lastest from mojombo/jekyll master
2013-01-11 12:23:53 +01:00
6253f79de2
Added space between arguments in Convertible errors
2013-01-10 22:11:13 -08:00
ba48870ead
outputting full path when file does not parse
2013-01-10 12:29:04 -08:00
6eed91871f
Changes based on @mojombo's feedback
2013-01-08 23:17:06 +01:00
dd0e208daa
Merge branch 'patch-1' of https://github.com/jlecour/jekyll into jlecour-patch-1
2013-01-03 22:26:09 -08:00
4c70c036e7
TomDoc lib/jekyll/post.rb.
2013-01-03 22:20:42 -08:00
9328a1a0dd
Merge branch 'docs' of https://github.com/icco/jekyll into icco-docs
2013-01-03 22:06:50 -08:00
72c8ceba4e
Merge pull request #651 from alagu/master
...
Posterous importer update
2012-12-31 18:24:43 -08:00
a5a6900948
fix error for case with broken encoding
2012-12-30 00:07:21 +02:00
2dbce8ca9f
fix error for case with wrong encoding or error in YAML
2012-12-29 23:32:34 +02:00
c23302f4fa
Merge branch 'deletion_protection' of https://github.com/jasonroelofs/jekyll into jasonroelofs-deletion_protection
2012-12-26 14:02:41 -07:00
d58a0c1088
Release 0.12.0
2012-12-22 16:46:30 -07:00
934495b272
Adds some random docs for stuff I saw while skimming the code.
2012-12-18 22:42:42 -08:00
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
22f4b12836
Clean up default config spec.
2012-12-15 22:09:21 -08:00
583f9e0019
Merge branch 'master' of https://github.com/Neil-Smithline/jekyll into Neil-Smithline-master
2012-12-15 16:42:26 -08:00
26f8d60542
Merge branch 'master' of https://github.com/wbrady/jekyll into wbrady-master
2012-12-15 16:35:45 -08:00
4bae42a671
use Array.join instead of Array.inject, add .svn to defaults
2012-12-09 11:43:49 +01:00
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
2726a5f27c
Merge branch 'master' of git://github.com/mojombo/jekyll
2012-10-03 19:33:21 -07:00
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
336ea66983
Better error reporting on Liquid exceptions
2012-08-14 17:35:41 -04:00
7f706f47fc
Update redcarpet support to version 2
2012-08-13 15:03:33 +01:00
3904fd9257
make yaml parsing errors more informative
2012-06-29 12:08:57 -04:00
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
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
47090ffd2a
Fix up a few TomDocs.
2012-06-06 11:59:49 -07:00
0e9e7fbc85
Simplify Site#read_layouts.
2012-06-06 11:59:49 -07:00
b2a1d61c04
Swap out albino for pygments.rb
2012-05-31 15:51:34 -04:00
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
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
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
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
8a0fbf02f5
Cleanup for RDiscount TOC support. Closes #333 .
2012-04-23 16:15:55 -07:00
f5b2acf8cd
Added support for inline TOCs with RDiscount
2012-04-23 15:56:28 -07:00
e29490c1c6
Allow setting of Kramdown smart_quotes. Fixes #482 .
2012-04-23 15:34:54 -07:00
604b60c9ba
Add checks to prevent accidental deletion of the source directory
2012-04-03 22:05:18 -05:00
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
316cc8559c
moved paginate_path to default config
2012-02-26 20:58:14 -08:00
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
4499df8033
Shorten plugin loading code and update history.
2012-01-29 12:49:57 -08:00
02366ae5ff
Merge branch 'PluginsAsArray' of https://github.com/simensen/jekyll into simensen-PluginsAsArray
2012-01-29 12:32:59 -08:00
9d70088f01
Properly select dotfiles during directory scan.
...
Fixes #363 .
Fixes #431 .
Fixes #377 .
2012-01-23 00:21:08 -08:00
e6d89c6a0f
More testing, whitespace and comment cleanup.
2012-01-22 22:17:25 -08:00
dcf546275b
Tweaked plugin directory handling, tests.
2012-01-22 22:10:12 -08:00
0284b8b22f
Handle Posterous rate limiting
2012-01-22 20:58:56 -08:00
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
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
16a4855200
Merge branch 'post_url' of https://github.com/thatguystone/jekyll into thatguystone-post_url
2012-01-22 16:03:10 -08:00
c04a9549ea
Make note of self.name requirement for Convertible.
2012-01-22 15:02:41 -08:00
edeustace
Parker Moore
Eric Theise
Tom Preston-Werner
Tom Preston-Werner
stereobooster
Nat Welch
Tom Bell
Alagu
Will Brady
Neil-Smithline
Jonas Pfenniger
Luca Grulla
Michishige Kaito
Jason Roelofs
Dane Harrigan
Jérémy Lecour
Beau Simensen