fa6d013791
Update history.
2012-01-15 21:08:21 -08:00
d0d143452a
Merge branch 'master' of https://github.com/laumann/jekyll
2012-01-15 20:39:55 -08:00
c14eb346a3
Allow [+.#-] in highlight lang shortnames. Fixes #282 .
2012-01-15 20:35:09 -08:00
4fe5e6ba99
Update history and fix up style.
2012-01-14 20:17:35 -08:00
1f44e1ad64
Merge branch 'master' of https://github.com/RJ/jekyll into RJ-master
2012-01-14 20:15:31 -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
febb31ba3e
Release 0.11.1
2011-12-27 10:59:18 -07:00
8754a024b5
Update history.
2011-12-27 10:57:20 -07:00
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
1da88bb30a
Update and clarify dependencies.
2011-11-26 18:48:51 -08:00
3fa51d5da9
Ignore .DS_Store files.
2011-11-26 10:05:46 -08:00
ebc8ab5b53
Remove accidentally added doc stuff and change rakefile to prevent this.
2011-11-26 10:05:15 -08:00
ab3927499f
Forgot to remove debugging code :-/
2011-11-04 17:41:47 +01:00
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
bb9f1064d3
Merge pull request #1 from cgroner/master
...
(cgroner) Missing test cases for defaults.
2011-11-04 09:24:30 -07:00
69e7f4abef
Add test cases for default values with no explicit config. for `hard_breaks`.
2011-11-03 11:54:49 -07:00
a78f86f1ac
Merge github.com:mojombo/jekyll
2011-11-03 11:47:47 +01:00
9fbf90ce59
Merge pull request #409 from wagenet/master
...
Fix non-pygments code highlighting
2011-09-27 07:06:38 -07:00
4a9094f2d4
Fix non-pygments code highlighting
2011-09-26 23:47:04 -07:00
72b7b1f056
Release 0.11.0
2011-07-10 15:14:25 -07:00
ed7f914459
removed unused code
2011-07-07 11:29:40 +02:00
0aab73e156
Merge https://github.com/mojombo/jekyll
2011-07-07 11:14:32 +02:00
3241d882b5
Merge remote-tracking branch 'kou/fix-error-message'
2011-07-05 22:31:25 -07:00
3c94ff3480
Merge remote-tracking branch 'richbecks/master'
2011-07-05 22:25:51 -07:00
00a0d14702
Tidied up indentation
2011-07-04 05:09:50 -07:00
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
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
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
fccb6c7f74
Merge git://github.com/mojombo/jekyll
2011-06-29 12:07:21 +02:00
eb6a2b9bd0
Now creates _<directory> for each post type (e.g. _posts, _pages, _attachments)
2011-06-28 07:21:45 -07:00
29c4808f2a
Drafts are now marked as published:false
2011-06-28 06:31:03 -07:00
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
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
e679729ac7
Merge pull request #354 from juliangruber/patch-1
...
fixed redcarpet typo
2011-06-26 14:11:35 -07:00
89f48927ad
fixed redcarpet typo
2011-06-26 07:09:01 -07:00
70aaded1e9
fix path name in syntax error message.
2011-06-20 22:46:38 +09:00
6a756881f9
clean up some warnings
2011-06-03 23:38:39 +01:00
851172b5ef
Replace rdiscount filter with config-aware markdownify.
2011-05-31 14:40:21 -07:00
cae0eaf19c
Merge remote-tracking branch 'mjschultz/master'
...
Conflicts:
lib/jekyll/filters.rb
2011-05-30 12:27:11 -07:00
70b1112cca
Update history.
2011-05-30 11:45:30 -07:00
da9930657e
Merge remote-tracking branch 'derekprior/configurable_coverter_file_extensions'
2011-05-30 11:38:59 -07:00
13f1cf5832
Merge pull request #328 from shoaibkamil/master
...
Bugfix in tumblr importer
2011-05-30 11:22:23 -07:00
5568e5698c
Merge remote-tracking branch 'vazexqi/patch-1'
2011-05-30 11:20:29 -07:00
14f371c792
Update gemspec so bundler installs work.
2011-05-30 11:18:15 -07:00
56ddf6a3c8
Merge branch 'next'
2011-05-29 22:46:10 -07:00
897d3e4e30
Update history.
2011-05-29 22:44:04 -07:00
e7135a669f
Require cucumber 0.10.3 to fix tests with Ruby 1.9.2.
2011-05-29 22:43:36 -07:00
2ad0fbc8ff
Merge remote-tracking branch 'MattHall/redcarpet'
2011-05-29 21:38:34 -07:00
Tom Preston-Werner
Thomas Laumann
Carl Groner
Aman Gupta
Peter Wagenet
Richard Jones
Matt Palmer
Julian Gruber
Kouhei Sutou
Lee Jarvis