1e209c9bf3
Upgrade --config to accept an array of files
2013-04-10 11:38:49 -07:00
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
cfcbe1f830
Refactor URL processing/generation into separate module
...
This is done to prepare for improved permalink generation
for URLs containing special characters, as proposed in
issue #782
2013-04-09 23:53:46 +02: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
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
5e997cae21
Release 0.6.2
2010-06-25 15:56:57 -07:00
a56eeb8289
Add support for rdiscount extensions
...
Specify extensions at your _config.yml file:
...
rdiscount:
extensions: [smart, autolink]
Available extensions can be found here:
http://rdoc.info/projects/rtomayko/rdiscount
closes #173
2010-06-25 16:38:45 +03:00
44015665b9
Release 0.6.1
2010-06-23 15:52:56 -07:00
99ee0c4803
Release 0.6.0
2010-06-22 17:56:16 -07:00
de3ee99d30
Use Dir.pwd for other default paths as well (reverts fix in #101 )
2010-06-22 16:22:58 -07:00
f8484570b7
Merge remote branch 'christianhellsten/master' into next
2010-06-22 16:01:48 -07:00
de8bd48154
Maruku is now the only processor dependency installed by default. Closes #57 .
...
Other processors will be lazy-loaded when necessary (and prompt the
user to install them when necessary).
2010-06-22 15:17:39 -07:00
46a95bc036
git merge mojombo/master
2010-06-22 15:42:51 +03:00
cb77a5287b
load plugins under safe mode
2010-06-18 17:55:17 -07:00
31c65c56f4
Extension -> Plugin
2010-06-18 15:47:01 -07:00
03cb12aeb3
convert to use rakegem
2010-04-21 13:55:01 -07:00
3efe008544
better docs for jekyll.rb
2010-04-21 13:32:46 -07:00
08bc63289d
clean up globbed requires
2010-04-21 13:27:39 -07:00
18545ddf71
pagination is now a generator extension
2010-02-28 11:17:03 +00:00
fc86c9dd85
extended concept to extensions in general, providing both converters and generators
2010-02-28 10:10:10 +00:00
315f4c9222
allow converters to be registered through subclassing much like railties in rails
2010-02-27 23:31:54 +00:00
cedda3afa3
move converters to classes
2010-02-27 22:14:27 +00:00
98fa570c86
added support for consistent site.time in payload, generating the site at a specific time and limiting future posts
...
squish
2010-02-26 20:52:41 +00:00
6b74454a07
resetting to upstream
2010-01-10 10:11:44 +00:00
2a7b1cbd98
merged 'mojombo/master' at 'v0.5.6'
2010-01-09 09:03:59 +00:00
473f3ffc11
Merge commit '597c7a7904198d92aa5eacad356019165685c311'
2010-01-08 18:08:17 -08:00
b8c04dfb6d
Merge branch 'jamie/master'
2010-01-05 22:59:43 +00:00
0cb1ebcda1
split process handling into phases to allow pages to have access to full and complete site payload and added some test improvements
2010-01-05 17:05:44 +00:00
fab5a715c5
safely allow loading jekyll customizations from inside a site
2009-11-29 13:25:00 -05:00
597c7a7904
changes to stdout and -err - tests and behaviour
...
By using $stdin adn $stderr instead of STDIN and
STDERR it is possible to capture or redirect them
using in process ruby code without the need
to manage pipes and external processes
2009-11-24 21:42:22 +01:00
52342fe6e1
Fixed bug where including includes from an include threw an exception.
2009-10-28 02:12:47 +02:00
414dfbe26e
Ruby 1.9 issue, must explicitly run to_s on the err object. Closes #14 .
...
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-06-22 17:41:51 -04:00
486ae25fc1
Validating the configuration loads properly and is a hash, based on jrk's implementation. Closes #22 .
2009-05-31 21:33:27 -04:00
e1dbda47ed
Merging in calavera's pagination branch
2009-05-09 11:44:34 -04:00
d948e0da91
Removing RedCloth gem lock and adding notes in for deps
2009-05-06 12:41:16 -07:00
26f9ad3d98
Testing for RedCloth notextile issue and locking to 4.1.0, which parses the tag correctly
2009-04-29 09:07:29 -04:00
563933f114
Update the help message and comments to use config.yml
2009-04-23 18:24:52 -04:00
808d6c6a62
posts' pagination
2009-04-04 12:43:46 +02:00
73d42b24ad
Huge refactor to move all config into Jekyll::Site
...
This commit makes Jekyll threadsafe (or at least makes it possible to be so).
It also makes it a ton easier to use Jekyll as a library for scripted site
transformation. I did, however, break all the tests. =(
2009-03-12 19:05:43 -07:00
4b39c44664
configure now sets the source and dest fields so the Liquid include filter works again
2009-03-12 20:51:12 +11:00
6edfae8c26
Refactored configuration and command-line option code
2009-03-12 20:51:11 +11:00
6fec047631
Added ability to set Jekyll parameters via _config.yaml file
2009-03-12 20:46:33 +11:00
e72cde12fa
Added option to not put file date in permalink URL
2009-03-12 20:46:33 +11:00
bb4d1ee119
add --version
2009-02-03 18:43:53 -08:00
5311b71a5c
fix accessor line conflict
2009-01-21 15:25:55 -08:00
0b78c32771
Added option to not put file date in permalink URL
2009-01-19 19:58:53 +11:00
5cfa956448
Fixed an issue with pygments, markdown, and newlines.
2009-01-11 12:03:46 -07:00
e7b2df1156
up to 0.3.0
2008-12-24 22:10:22 -08:00
dd8054411c
deep merge hashes so as to not lose data
2008-12-24 22:06:42 -08:00
10bc499ce2
Merge commit '8d08a2'
2008-12-21 17:48:41 -08:00
3a8f7a8e3a
Added post categories based on directories containing _posts
2008-12-16 17:52:00 +11:00
ed60ad6f72
up to 0.2.1
2008-12-15 12:34:34 -08:00
59080271ed
allow use of rdiscount if --rdiscount is set and gem is installed
2008-12-15 12:27:57 -08:00
bcb67ecc23
Merge commit 'b094b9'
2008-12-15 11:58:52 -08:00
b094b93301
Replaced rdiscount with Maruku for Markdown with equation support
2008-12-15 16:17:45 +11:00
6502f865a6
Merge branch 'master' of git@github.com:pjhyett/jekyll
2008-12-14 18:41:00 -08:00
bf9dda6c9a
don't require directory_watcher unless it's needed
2008-12-14 18:40:45 -08:00
de2959b8ea
up to 0.2.0
2008-12-14 15:16:16 -08:00
0d84487d79
up to 0.1.6
2008-12-13 18:21:14 -08:00
1006583628
only load classifier gem if necessary
2008-12-13 17:16:01 -08:00
8b2aedc951
implement include tag
2008-12-13 17:12:38 -08:00
906ccbb873
up to 0.1.5
2008-12-12 21:09:45 -08:00
b1bf818c6d
disable true LSI by default, enable with --lsi
2008-12-12 21:03:16 -08:00
f00272ea52
use pygments for code highlighting if --pygments is specified
2008-12-12 20:01:40 -08:00
3fe1381dca
Merge commit '767d99b5bffc9fd188b1fbd1b67aef20014bc1b7'
2008-12-10 15:56:00 -08:00
cc047da660
up to 0.1.4
2008-12-08 16:13:18 -08:00
767d99b5bf
Fixing that the rdiscount require rescue didn't catch.
2008-12-07 23:08:26 -08:00
c58d4e71ba
up to 0.1.3
2008-12-06 16:14:40 -08:00
5b0ce6dddc
add directory_watcher dep
2008-12-06 16:09:52 -08:00
e2678114d9
Trys to require RDiscount and falls back gracefully, added require for the new blocks module
2008-11-23 14:52:02 -08:00
c742fb7701
implement a real related posts feature. up to 0.1.2
2008-11-22 12:36:32 -08:00
1838d91902
up to 0.1.1
2008-11-22 00:19:40 -08:00
bffdeee637
rename to Jekyll
2008-11-17 11:07:54 -08:00
Alex Kessinger
Lucas Jenss
Parker Moore
Aleksey V Zapparov
Tom Preston-Werner
Matt Rogers
scribu
Ben Toews
Tom Bell
edeustace
Dane Harrigan
Thomas Laumann
MattHall
Derek Prior
Aman Gupta
lukebayes
Jason Graham
Christos Trochalakis
Christian Hellsten
Kris Brown
Jamie Macey
Gregor Schmidt
Bjørn Arild Mæland
Nick Quaranto
David Calavera
mreid
Mark
Zachary Pinter
Mark Reid
PJ Hyett
Jack Danger Canty
Chris Van Pelt