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
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
82bd83fe7f
More TomDoc and formatting cleanup.
2011-05-08 23:40:35 -07:00
cf779b2760
Added Redcarpet for MD conversion
2011-04-20 10:04:42 +01:00
d2377b2581
Fixed mistake in default markdown extensions
2011-04-12 17:30:56 -04:00
5801220a98
Added the ability to configure the file extensions to be processed by each converter. Test cases included.
2011-04-12 17:03:28 -04:00
a31780a1ec
Move require to jekyll.rb and update history.
2011-03-10 21:15:29 -08:00
08725eb234
use the new albino gem
2011-03-06 01:57:08 -08:00
3468f0a2c3
expanded config yaml to allow setting hard_breaks=false on RedCloth, modified textile converter to take this option into account
2011-02-09 01:37:30 +01:00
717a2540e1
Added support for 'include' configuration parameter. This parameter
...
should work just like 'exclude', except it gives us the ability
to enumerate any files that should not be ignored - even if they
begin with the dastardly dot or underscore.
2010-12-30 16:41:34 -08:00
13df722073
Release 0.10.0
2010-12-16 16:29:48 -08:00
a8a837cc8e
Release 0.9.0
2010-12-15 15:36:15 -08:00
31901ee15b
Release 0.8.0
2010-11-22 23:08:56 -08:00
dca30c3ad1
Add kramdown's support for coderay
...
- no test added so that coderay isn't added to list of developer
dependencies
2010-11-20 17:46:16 -08:00
f85e229a9e
Add support for kramdown HTML converter options
...
http://kramdown.rubyforge.org/converter/html.html#options
Example: In the _config.yaml,
markdown: kramdown
kramdown:
auto_ids: true
2010-11-20 17:40:27 -08:00
3fa9af17fa
Release 0.7.0
2010-08-24 15:35:18 -07:00
391d1a9677
Merge remote branch 'ctrochalakis/rdiscount_extensions'
2010-08-24 15:19:47 -07:00
Matt Rogers
Parker Moore
Ben Toews
Tom Bell
edeustace
Tom Preston-Werner
Dane Harrigan
Thomas Laumann
MattHall
Derek Prior
Aman Gupta
lukebayes
Jason Graham