Commit Graph

213 Commits

Author SHA1 Message Date
Lucas Jenss 2ac98a7358 Merge branch 'master' into permalink-special-characters
Conflicts:
	lib/jekyll/page.rb
	lib/jekyll/post.rb
2013-07-14 23:58:22 +02:00
Parker Moore d572e588e8 Release 1.1.0 2013-07-14 19:52:44 +02:00
Parker Moore 015ace6773 Shuffle around rendering of extracted excerpt so it can be liquified. 2013-07-13 16:18:20 +02:00
Parker Moore 700d840a06 Release 1.0.3 2013-06-07 21:02:13 +02:00
Parker Moore 14a4e32bbe Use singleton instance variable instead of class variable 2013-05-29 12:04:50 +02:00
Parker Moore 1f59e9c757 Use Jekyll.logger instead of Jekyll::Stevenson to log things. 2013-05-29 11:58:35 +02:00
Parker Moore ef48cbefec Merge pull request #1057 from mojombo/refactor-related-posts
Move the building of related posts into their own class
2013-05-15 07:25:53 -07:00
Parker Moore 5258e3afa3 Logger ~> Stevenson and don't inherit from Ruby Logger. #1106. 2013-05-15 15:15:00 +02:00
Matt Rogers ff600bfcd9 Merge branch 'master' into refactor-related-posts 2013-05-14 21:54:12 -05:00
Parker Moore 8051df0f4c Release 1.0.2 2013-05-12 15:26:45 +02:00
Matt Rogers 64f8a7b228 Move the require for related_posts to jekyll.rb 2013-05-08 07:39:00 -05:00
Parker Moore c758f8d24f Release 1.0.1 2013-05-08 01:03:14 +02:00
Parker Moore 06beb4b72b Bump version for 1.0.0. 2013-05-05 23:02:45 +02:00
Parker Moore 3c218d2dcd Only require pygments where it's needed. 2013-05-04 15:04:57 +02:00
Parker Moore c0c0150bb5 Release 1.0.0.rc1 2013-04-16 00:47:31 +02:00
Parker Moore b4f68baafb Jekyll.set_timezone accepts just the timezone, not the config 2013-04-15 15:39:36 +02:00
Parker Moore b249289b9d Set the timezone for the process 2013-04-15 00:42:13 +02:00
Parker Moore 398cd633b6 Merge pull request #959 from mojombo/deprecator
Refactor Logging and Deprecation Messaging
2013-04-14 11:05:07 -07:00
Parker Moore 4ef107f3e8 Remove Logger methods from main Jekyll module. 2013-04-14 19:27:19 +02:00
Parker Moore 81e44bf5f4 Merge pull request #955 from mojombo/refactor-markdown
Refactor Markdown Parser Logic
2013-04-13 20:25:37 -07:00
Parker Moore 7a7990fb9a Moved markdown converters into lib/jekyll/converters/markdown 2013-04-14 05:23:42 +02:00
Parker Moore b99baeae27 Colorize warns as yellow 2013-04-13 19:58:41 +02:00
Parker Moore c5f6e527b5 Bring Logger and Deprecator into the fold 2013-04-13 18:05:03 +02:00
Parker Moore 63cdd21353 Move initialization of parsers to separate classes 2013-04-13 01:47:40 +02:00
Parker Moore bd8d271ce3 Moving the backwards-compatibilizing to Configuration#read_config_files. @mattr- 2013-04-12 23:11:38 +02:00
Parker Moore e2967c96cd Jekyll.configuration should use the new Jekyll::Configuration class 2013-04-12 21:20:30 +02:00
Parker Moore 04fd68a232 Move Jekyll::DEFAULTS to Jekyll::Configuration::DEFAULTS 2013-04-12 21:19:20 +02:00
Alex Kessinger 14a669530e Fixing tests, and making it more ruby friendly 2013-04-11 10:17:59 -07:00
Alex Kessinger 1e209c9bf3 Upgrade --config to accept an array of files 2013-04-10 11:38:49 -07:00
Alex Kessinger 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
Lucas Jenss 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
Parker Moore 1319b823f8 Release 1.0.0.beta4 2013-04-09 21:31:23 +02:00
Parker Moore 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
Parker Moore 1526aa3b1d Fix cascade problem with site.baseurl. Fixes #931. 2013-04-07 22:47:55 +02:00
Parker Moore ae462afb76 Backwards-compatibility for 'auto'. Fixes #821. 2013-04-07 22:29:30 +02:00
Parker Moore 28097a9ebb Updated version to 1.0.0.beta3. 2013-04-04 16:14:54 +02:00
Parker Moore de8f0c986c Update version for 1.0.0.beta2. 2013-03-19 00:08:56 +01:00
Parker Moore ee697a6308 Add Jekyll::DEFAULTS['baseurl'] and set the default pygments option to _true_ 2013-03-17 21:09:58 +01:00
Parker Moore 936ed1f849 Merge pull request #837 from ixti/feature-excerpt
Adds excerpt to posts
2013-03-17 07:53:41 -07:00
Parker Moore 7e1100962c Load in config from --config switch 2013-03-16 14:44:49 +01:00
Parker Moore 5c35a84662 Updated version and gemspec to reflect 1.0.0.beta1 release 2013-03-14 21:26:06 +01:00
Parker Moore dbc356f9f4 Bump version to 1.0.0.pre. 2013-03-14 21:23:34 +01:00
Aleksey V Zapparov 22dcc4e20f Adds excerpt to posts 2013-03-04 17:13:25 +01:00
Tom Preston-Werner 4caf613be8 Merge branch 'drafts' of https://github.com/scribu/jekyll into scribu-drafts 2013-03-03 12:57:55 -08:00
Matt Rogers d2c79a8841 Merge branch 'master' into issue-653 2013-02-25 13:08:23 -06:00
Parker Moore 5d8e012899 Fixed merge with new log output in lib/jekyll.rb 2013-02-20 23:10:42 +01:00
Parker Moore bf79b0ac37 Fixed merge with new log output in lib/jekyll.rb 2013-02-20 23:09:34 +01:00
Parker Moore 11eb1ecae1 Safe loading of files and YAML. 2013-02-10 19:07:38 +01:00
scribu 1ac46b17c4 Don't require date in draft filenames. 2013-02-09 21:35:41 +02:00
Ben Toews 1528cfe1cd adding safe_yaml to protect against object instantiation from yaml 2013-01-23 11:30:24 -06:00
Matt Rogers f460a6cf71 Merge branch 'master' into issue-653 2013-01-16 21:52:32 -06:00
Tom Bell 7f072ed578 Merge branch 'master' 2013-01-12 01:18:41 +00:00
edeustace 0fa55418e9 merge lastest from mojombo/jekyll master 2013-01-11 12:23:53 +01:00
Matt Rogers f3f181484d Merge remote-tracking branch 'upstream/master' into issue-653 2013-01-10 20:41:32 -06:00
Tom Bell b70b57cb89 Merge branch 'master' into 'jekyll-command-redux' 2013-01-09 23:40:27 +00:00
Tom Preston-Werner d58a0c1088 Release 0.12.0 2012-12-22 16:46:30 -07:00
Tom Bell 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
Tom Bell dc139e2ac9 Update the sym->str key conversion 2012-12-18 22:13:17 +00:00
Tom Bell 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
Tom Bell 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
Tom Preston-Werner 22f4b12836 Clean up default config spec. 2012-12-15 22:09:21 -08:00
edeustace 4bae42a671 use Array.join instead of Array.inject, add .svn to defaults 2012-12-09 11:43:49 +01:00
Matt Rogers 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
edeustace 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
Tom Preston-Werner 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
Tom Bell b2a1d61c04 Swap out albino for pygments.rb 2012-05-31 15:51:34 -04:00
Tom Bell 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
Tom Preston-Werner 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
Tom Preston-Werner e29490c1c6 Allow setting of Kramdown smart_quotes. Fixes #482. 2012-04-23 15:34:54 -07:00
Dane Harrigan 316cc8559c moved paginate_path to default config 2012-02-26 20:58:14 -08:00
Tom Preston-Werner d0d143452a Merge branch 'master' of https://github.com/laumann/jekyll 2012-01-15 20:39:55 -08:00
Tom Preston-Werner 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 b66840ca46 Release 0.11.2 2011-12-27 17:53:50 -07:00
Tom Preston-Werner 4ece77300b Gah, did not commit these for v0.11.1 version release. 2011-12-27 17:48:00 -07:00
Thomas Laumann a78f86f1ac Merge github.com:mojombo/jekyll 2011-11-03 11:47:47 +01:00
Tom Preston-Werner 72b7b1f056 Release 0.11.0 2011-07-10 15:14:25 -07:00
Thomas Laumann fccb6c7f74 Merge git://github.com/mojombo/jekyll 2011-06-29 12:07:21 +02:00
Tom Preston-Werner da9930657e Merge remote-tracking branch 'derekprior/configurable_coverter_file_extensions' 2011-05-30 11:38:59 -07:00
Tom Preston-Werner 2ad0fbc8ff Merge remote-tracking branch 'MattHall/redcarpet' 2011-05-29 21:38:34 -07:00
Thomas Laumann 20d1bd1f10 Merge https://github.com/mojombo/jekyll 2011-05-09 12:01:17 +02:00
Tom Preston-Werner 82bd83fe7f More TomDoc and formatting cleanup. 2011-05-08 23:40:35 -07:00
MattHall cf779b2760 Added Redcarpet for MD conversion 2011-04-20 10:04:42 +01:00
Derek Prior d2377b2581 Fixed mistake in default markdown extensions 2011-04-12 17:30:56 -04:00
Derek Prior 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
Tom Preston-Werner a31780a1ec Move require to jekyll.rb and update history. 2011-03-10 21:15:29 -08:00
Aman Gupta 08725eb234 use the new albino gem 2011-03-06 01:57:08 -08:00
laumann 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
lukebayes 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
Tom Preston-Werner 13df722073 Release 0.10.0 2010-12-16 16:29:48 -08:00
Tom Preston-Werner a8a837cc8e Release 0.9.0 2010-12-15 15:36:15 -08:00
Tom Preston-Werner 31901ee15b Release 0.8.0 2010-11-22 23:08:56 -08:00
Jason Graham 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
Jason Graham 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
Tom Preston-Werner 3fa9af17fa Release 0.7.0 2010-08-24 15:35:18 -07:00
Tom Preston-Werner 391d1a9677 Merge remote branch 'ctrochalakis/rdiscount_extensions' 2010-08-24 15:19:47 -07:00
Tom Preston-Werner 5e997cae21 Release 0.6.2 2010-06-25 15:56:57 -07:00
Christos Trochalakis 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
Tom Preston-Werner 44015665b9 Release 0.6.1 2010-06-23 15:52:56 -07:00
Tom Preston-Werner 99ee0c4803 Release 0.6.0 2010-06-22 17:56:16 -07:00
Tom Preston-Werner de3ee99d30 Use Dir.pwd for other default paths as well (reverts fix in #101) 2010-06-22 16:22:58 -07:00