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
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
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
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
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
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
3c2519f07d
Merge pull request #419 from vjt/master
...
Exception handler in Convertible references nonexisting method .name
2012-01-22 00:25:55 -08:00
613a7a46a3
Merge pull request #460 from kendagriff/master
...
RSS Migrator
2012-01-22 00:20:33 -08:00
8adfaea339
Merge pull request #426 from joshbrown/master
...
Added a Joomla migrator
2012-01-22 00:19:35 -08:00
22159b3d61
Merge pull request #368 from jacius/wordpress
...
Greatly improved and extended the wordpress.rb migrator.
2012-01-22 00:18:33 -08:00
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
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
574e933d81
Merge branch 'master' of https://github.com/jpravetz/jekyll into jpravetz-master
2012-01-21 19:59:05 -08:00
d36a1064a7
Merge pull request #437 from stephenmcd/master
...
Improved Tumblr Support
2012-01-21 19:54:00 -08:00
d00bc8e8fe
Merge branch 'master' of https://github.com/tmtk75/jekyll into tmtk75-master
2012-01-21 19:49:08 -08:00
c797d420c4
Merge branch 'patch-1' of https://github.com/hypertexthero/jekyll into hypertexthero-patch-1
2012-01-21 19:45:24 -08:00
03ad973523
Update history.
2012-01-21 19:43:32 -08:00
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
19fc8cb488
Oops, still need email and pass. Update usage comment
2012-01-18 11:08:02 +11:00
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
d0d143452a
Merge branch 'master' of https://github.com/laumann/jekyll
2012-01-15 20:39:55 -08:00
c14eb346a3
Allow [+.#-] in highlight lang shortnames. Fixes #282 .
2012-01-15 20:35:09 -08:00
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
Tom Preston-Werner
Tom Bell
Will Brady
Neil-Smithline
Jonas Pfenniger
Luca Grulla
Michishige Kaito
Jason Roelofs
Dane Harrigan
Beau Simensen
Nicholas Firth-McCoy
Nicholas Firth-McCoy