Commit Graph

103 Commits

Author SHA1 Message Date
Matt Rogers f3f181484d Merge remote-tracking branch 'upstream/master' into issue-653 2013-01-10 20:41:32 -06:00
Tom Preston-Werner d58a0c1088 Release 0.12.0 2012-12-22 16:46:30 -07:00
Tom Preston-Werner 22f4b12836 Clean up default config spec. 2012-12-15 22:09:21 -08: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
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
Tom Preston-Werner f8484570b7 Merge remote branch 'christianhellsten/master' into next 2010-06-22 16:01:48 -07:00
Tom Preston-Werner 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
Christian Hellsten 46a95bc036 git merge mojombo/master 2010-06-22 15:42:51 +03:00
Tom Preston-Werner cb77a5287b load plugins under safe mode 2010-06-18 17:55:17 -07:00
Tom Preston-Werner 31c65c56f4 Extension -> Plugin 2010-06-18 15:47:01 -07:00
Tom Preston-Werner 03cb12aeb3 convert to use rakegem 2010-04-21 13:55:01 -07:00
Tom Preston-Werner 3efe008544 better docs for jekyll.rb 2010-04-21 13:32:46 -07:00
Tom Preston-Werner 08bc63289d clean up globbed requires 2010-04-21 13:27:39 -07:00
Kris Brown 18545ddf71 pagination is now a generator extension 2010-02-28 11:17:03 +00:00
Kris Brown fc86c9dd85 extended concept to extensions in general, providing both converters and generators 2010-02-28 10:10:10 +00:00