df1efeff25
Accept multiple config files from command line
...
Parse config as if it can contain multiple references to config files.
This allows you to pass in multiple config files from the command line
Helps with issues #514 and #703
2013-04-10 10:19:48 -07:00
1319b823f8
Release 1.0.0.beta4
2013-04-09 21:31:23 +02:00
dbb3dd3a1a
Move port and host configuration options to Jekyll::DEFAULTS so Commander doesn't override in serving awkwardly.
2013-04-07 23:55:04 +02:00
1526aa3b1d
Fix cascade problem with site.baseurl. Fixes #931 .
2013-04-07 22:47:55 +02:00
ae462afb76
Backwards-compatibility for 'auto'. Fixes #821 .
2013-04-07 22:29:30 +02:00
28097a9ebb
Updated version to 1.0.0.beta3.
2013-04-04 16:14:54 +02:00
de8f0c986c
Update version for 1.0.0.beta2.
2013-03-19 00:08:56 +01:00
ee697a6308
Add Jekyll::DEFAULTS['baseurl'] and set the default pygments option to _true_
2013-03-17 21:09:58 +01:00
936ed1f849
Merge pull request #837 from ixti/feature-excerpt
...
Adds excerpt to posts
2013-03-17 07:53:41 -07:00
7e1100962c
Load in config from --config switch
2013-03-16 14:44:49 +01:00
5c35a84662
Updated version and gemspec to reflect 1.0.0.beta1 release
2013-03-14 21:26:06 +01:00
dbc356f9f4
Bump version to 1.0.0.pre.
2013-03-14 21:23:34 +01:00
22dcc4e20f
Adds excerpt to posts
2013-03-04 17:13:25 +01:00
4caf613be8
Merge branch 'drafts' of https://github.com/scribu/jekyll into scribu-drafts
2013-03-03 12:57:55 -08:00
d2c79a8841
Merge branch 'master' into issue-653
2013-02-25 13:08:23 -06:00
5d8e012899
Fixed merge with new log output in lib/jekyll.rb
2013-02-20 23:10:42 +01:00
bf79b0ac37
Fixed merge with new log output in lib/jekyll.rb
2013-02-20 23:09:34 +01:00
11eb1ecae1
Safe loading of files and YAML.
2013-02-10 19:07:38 +01:00
1ac46b17c4
Don't require date in draft filenames.
2013-02-09 21:35:41 +02:00
1528cfe1cd
adding safe_yaml to protect against object instantiation from yaml
2013-01-23 11:30:24 -06:00
f460a6cf71
Merge branch 'master' into issue-653
2013-01-16 21:52:32 -06:00
7f072ed578
Merge branch 'master'
2013-01-12 01:18:41 +00:00
0fa55418e9
merge lastest from mojombo/jekyll master
2013-01-11 12:23:53 +01:00
f3f181484d
Merge remote-tracking branch 'upstream/master' into issue-653
2013-01-10 20:41:32 -06:00
b70b57cb89
Merge branch 'master' into 'jekyll-command-redux'
2013-01-09 23:40:27 +00:00
d58a0c1088
Release 0.12.0
2012-12-22 16:46:30 -07:00
a151a16f09
Remove command options from default config
...
Removing command line options from the config is a path towards cleaning up the
configuration file and not including options which don't really belong there.
2012-12-19 18:23:34 +00:00
dc139e2ac9
Update the sym->str key conversion
2012-12-18 22:13:17 +00:00
bd1c8fe760
Update Jekyll.configuration to convert symbol keys
...
Because Commander uses symbol keys in the options hash and I don't want to go
back backport every hash string key to symbols in Jekyll. ⭐
2012-12-18 21:55:00 +00:00
14766497c8
Add bin/jekyll2 and initial BuildCommand
...
The `BuildCommand` class is responsible for handling the building of the site.
It can also optionally watch for changes to files and regenerate the site if
needed.
The `Command` class holds any methods which are used by any command
implementation.
2012-12-18 20:34:09 +00:00
22f4b12836
Clean up default config spec.
2012-12-15 22:09:21 -08:00
4bae42a671
use Array.join instead of Array.inject, add .svn to defaults
2012-12-09 11:43:49 +01:00
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
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
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
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
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
e29490c1c6
Allow setting of Kramdown smart_quotes. Fixes #482 .
2012-04-23 15:34:54 -07:00
316cc8559c
moved paginate_path to default config
2012-02-26 20:58:14 -08:00
d0d143452a
Merge branch 'master' of https://github.com/laumann/jekyll
2012-01-15 20:39:55 -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
b66840ca46
Release 0.11.2
2011-12-27 17:53:50 -07:00
4ece77300b
Gah, did not commit these for v0.11.1 version release.
2011-12-27 17:48:00 -07:00
a78f86f1ac
Merge github.com:mojombo/jekyll
2011-11-03 11:47:47 +01:00
72b7b1f056
Release 0.11.0
2011-07-10 15:14:25 -07:00
fccb6c7f74
Merge git://github.com/mojombo/jekyll
2011-06-29 12:07:21 +02:00
da9930657e
Merge remote-tracking branch 'derekprior/configurable_coverter_file_extensions'
2011-05-30 11:38:59 -07:00
2ad0fbc8ff
Merge remote-tracking branch 'MattHall/redcarpet'
2011-05-29 21:38:34 -07:00
20d1bd1f10
Merge https://github.com/mojombo/jekyll
2011-05-09 12:01:17 +02:00
Alex Kessinger
Parker Moore
Aleksey V Zapparov
Tom Preston-Werner
Matt Rogers
scribu
Ben Toews
Tom Bell
edeustace
Dane Harrigan
Thomas Laumann