github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-30 09:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
702 Commits 60 Branches 160 Tags
8d48992f22faa546b9618a654df258f7babeb7ca
Commit Graph

702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Preston-Werner
8d48992f22 Merge pull request #447 from mking/master 
Fix comment typo
 2012-01-21 19:46:27 -08:00
Tom Preston-Werner
c797d420c4 Merge branch 'patch-1' of https://github.com/hypertexthero/jekyll into hypertexthero-patch-1 2012-01-21 19:45:24 -08:00
Tom Preston-Werner
03ad973523 Update history. 2012-01-21 19:43:32 -08:00
Tom Preston-Werner
65890da3d1 Merge branch 'categories_with_space' of https://github.com/spk/jekyll into spk-categories_with_space 2012-01-21 19:36:09 -08:00
Tom Preston-Werner
fa6d013791 Update history. 2012-01-15 21:08:21 -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
c14eb346a3 Allow [+.#-] in highlight lang shortnames. Fixes #282. 2012-01-15 20:35:09 -08:00
Tom Preston-Werner
4fe5e6ba99 Update history and fix up style. 2012-01-14 20:17:35 -08:00
Tom Preston-Werner
1f44e1ad64 Merge branch 'master' of https://github.com/RJ/jekyll into RJ-master 2012-01-14 20:15:31 -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 v0.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. v0.11.1 2011-12-27 17:48:00 -07:00
Tom Preston-Werner
febb31ba3e Release 0.11.1 2011-12-27 10:59:18 -07:00
Tom Preston-Werner
8754a024b5 Update history. 2011-12-27 10:57:20 -07:00
Simon Griffee
06d9446ade Added missing <code>require 'yaml'</code>, without which the TextPattern migrator script was failing. 2011-12-04 23:35:36 +01:00
Matthew King
14d51bfd25 Fix typo "destintation" => "destination" 2011-12-03 22:36:18 -05:00
Thomas Laumann
d80c773b01 New solution for passing restrictions to RedCloth - all tests pass with ruby 1.8 (just invoking rake) 2011-11-28 14:05:34 +01:00
Tom Preston-Werner
1da88bb30a Update and clarify dependencies. 2011-11-26 18:48:51 -08:00
Tom Preston-Werner
3fa51d5da9 Ignore .DS_Store files. 2011-11-26 10:05:46 -08:00
Tom Preston-Werner
ebc8ab5b53 Remove accidentally added doc stuff and change rakefile to prevent this. 2011-11-26 10:05:15 -08:00
Thomas Laumann
ab3927499f Forgot to remove debugging code :-/ 2011-11-04 17:41:47 +01:00
Thomas Laumann
8c4edb655e Have TextileConverter pass any arguments set to true in config's redcloth section to RedCloth constructor as an array of symbols. 
This means explicitly setting (for example):

  redcloth:
    hard_breaks: false
    lite_mode: true
    no_span_caps: true

will cause RedCloth to be invoked thusly:

  RedCloth.new(content, [:lite_mode, :no_span_caps])

(Notice that hard_breaks is ignored.) This means, however, anything set to true in the redcloth section in _config.yml _will_ be passed to RedCloth. Mayhem may ensue.
 2011-11-04 17:33:53 +01:00
Thomas Jespersen
bb9f1064d3 Merge pull request #1 from cgroner/master 
(cgroner) Missing test cases for defaults.
 2011-11-04 09:24:30 -07:00
Carl Groner
69e7f4abef Add test cases for default values with no explicit config. for hard_breaks. 2011-11-03 11:54:49 -07:00
Thomas Laumann
a78f86f1ac Merge github.com:mojombo/jekyll 2011-11-03 11:47:47 +01:00
Aman Gupta
9fbf90ce59 Merge pull request #409 from wagenet/master 
Fix non-pygments code highlighting
 2011-09-27 07:06:38 -07:00
Peter Wagenet
4a9094f2d4 Fix non-pygments code highlighting 2011-09-26 23:47:04 -07:00
Tom Preston-Werner
72b7b1f056 Release 0.11.0 v0.11.0 2011-07-10 15:14:25 -07:00
Laurent Arnoud
1356e75811 Generate escaped url for categories with space. 
Space in URLs should be encoded.

Signed-off-by: Laurent Arnoud <laurent@spkdev.net>
 2011-07-10 23:56:56 +02:00
Thomas Laumann
ed7f914459 removed unused code 2011-07-07 11:29:40 +02:00
Thomas Laumann
0aab73e156 Merge https://github.com/mojombo/jekyll 2011-07-07 11:14:32 +02:00
Tom Preston-Werner
3241d882b5 Merge remote-tracking branch 'kou/fix-error-message' 2011-07-05 22:31:25 -07:00
Tom Preston-Werner
3c94ff3480 Merge remote-tracking branch 'richbecks/master' 2011-07-05 22:25:51 -07:00
Richard Jones
00a0d14702 Tidied up indentation 2011-07-04 05:09:50 -07:00
Richard Jones
8c35cc957b Create import_hash with .new(0) so that we don't have to check if 
a hash exists before incrementing it.
 2011-07-04 04:59:40 -07:00
Aman Gupta
f6b5d827e7 Merge pull request #356 from mpalmer/yaml-exception-message 
Give name of file that generated YAML exception message
 2011-07-01 17:42:49 -07:00
Matt Palmer
eebeaf5dfb Give name of file that generated YAML exception message 
It's not much good saying "hey, there was a problem" if you don't know where
the problem *is*.  Hunting through several hundred YAML files is no fun.
 2011-07-02 10:35:41 +10:00
Thomas Laumann
fccb6c7f74 Merge git://github.com/mojombo/jekyll 2011-06-29 12:07:21 +02:00
Richard Jones
eb6a2b9bd0 Now creates _<directory> for each post type (e.g. _posts, _pages, _attachments) 2011-06-28 07:21:45 -07:00
Richard Jones
29c4808f2a Drafts are now marked as published:false 2011-06-28 06:31:03 -07:00
Richard Jones
3389c6d508 Sometimes wp:post_name can be empty (e.g. when a post is still draft), in this case we make up an appropriate permalink_title that will be used as the filename. The importer can always rename the file later on, and at least the file is unlikely to have been overwritten by another draft on the same day. 2011-06-28 02:31:42 -07:00
Richard Jones
365f57e8b3 Added meta tag import goodness. This for instance allows you to preserve all your hard-worked on WP SEO keywords, images, alternative images and other yummy-ness. 
Replaced PubDate with wp:post_date, this is better than PubDate since some of the posts you import could be a draft (in this case the pubDate is invalid and contains a non-sensical value).
Added wp:status so we now know whether the post is published, draft or in the trash.
Added wp:post_type so we differentiate between posts and image or other post types
 2011-06-28 02:05:51 -07:00
Aman Gupta
e679729ac7 Merge pull request #354 from juliangruber/patch-1 
fixed redcarpet typo
 2011-06-26 14:11:35 -07:00
Julian Gruber
89f48927ad fixed redcarpet typo 2011-06-26 07:09:01 -07:00
Kouhei Sutou
70aaded1e9 fix path name in syntax error message. 2011-06-20 22:46:38 +09:00
Lee Jarvis
6a756881f9 clean up some warnings 2011-06-03 23:38:39 +01:00
Tom Preston-Werner
851172b5ef Replace rdiscount filter with config-aware markdownify. 2011-05-31 14:40:21 -07:00
Tom Preston-Werner
cae0eaf19c Merge remote-tracking branch 'mjschultz/master' 
Conflicts:
	lib/jekyll/filters.rb
 2011-05-30 12:27:11 -07:00
Tom Preston-Werner
70b1112cca Update history. 2011-05-30 11:45:30 -07:00
Tom Preston-Werner
da9930657e Merge remote-tracking branch 'derekprior/configurable_coverter_file_extensions' 2011-05-30 11:38:59 -07:00