f3f181484d
Merge remote-tracking branch 'upstream/master' into issue-653
2013-01-10 20:41:32 -06:00
dd0e208daa
Merge branch 'patch-1' of https://github.com/jlecour/jekyll into jlecour-patch-1
2013-01-03 22:26:09 -08:00
4c70c036e7
TomDoc lib/jekyll/post.rb.
2013-01-03 22:20:42 -08:00
9328a1a0dd
Merge branch 'docs' of https://github.com/icco/jekyll into icco-docs
2013-01-03 22:06:50 -08:00
c4a43d748f
Merge pull request #728 from mojombo/ruby-version-file
...
Added support for .ruby-version to ensure congruent dev environment
2013-01-03 20:55:04 -08:00
6ec1c45d5d
Added support for .ruby-version to ensure congruent dev environment
2013-01-02 19:59:20 -05:00
c0ae646cdc
Kill sites page on the new docs site. It's a moshpit of slightly useful content, and really there should be a featured site list or an actual directory separate from the docs site
2013-01-01 19:57:06 -05:00
0776078487
If we're going to use Launchy, let's use Dir.chdir
2013-01-01 19:46:56 -05:00
f7eacb7666
Using local jekyll bin to generate docs site
2013-01-01 19:44:11 -05:00
72c8ceba4e
Merge pull request #651 from alagu/master
...
Posterous importer update
2012-12-31 18:24:43 -08:00
ff04018275
Update history.
2012-12-31 16:41:38 -08:00
b36c9788ac
Merge branch 'master' of https://github.com/enure/jekyll into enure-master
2012-12-31 14:22:24 -08:00
a041d7a19a
Merge pull request #721 from mrueg/patch-1
...
Update Dependencies in Readme, alphabetize
2012-12-31 14:09:46 -08:00
d32f655716
Update history.
2012-12-31 14:04:02 -08:00
2c0b3b33d9
Merge branch 'message-for-yaml-error' of https://github.com/stereobooster/jekyll into stereobooster-message-for-yaml-error
2012-12-31 13:25:05 -08:00
a6c79396ab
Merge pull request #699 from nitoyon/0-12-0-history
...
Add pull request #569 to history
2012-12-31 13:11:16 -08:00
43216ac629
Make sure we do not forget to merge #583 in the future.
2012-12-31 13:10:15 -08:00
00d979759e
Update history.
2012-12-31 13:01:40 -08:00
cc73f04eb7
Update site dir with contents of #583 at rev cb19367.
...
This is the big site redesign by @cobyism. To work with the new
site deployment mechanism, it is being copied from the gh-pages
branch of that PR into the existing site dir. Before we finally
deploy the new site, we should remember to merge #583 so that we
keep all the history from that PR.
2012-12-31 12:48:04 -08:00
62c8ba089a
Update history.
2012-12-31 12:18:03 -08:00
ea0d111362
Update Dependencies in Readme, alphabetize
2012-12-31 03:14:30 +01:00
da096f307b
Add testcases for YAML syntax error and non UTF-8 encoding
2012-12-30 02:39:02 +02:00
83b3b2a340
More robust site:publish.
2012-12-29 16:24:26 -08:00
95b07a3c2b
Use Launchy for cross platform site:preview. Thx @ixti.
2012-12-29 15:29:56 -08:00
a5a6900948
fix error for case with broken encoding
2012-12-30 00:07:21 +02:00
2dbce8ca9f
fix error for case with wrong encoding or error in YAML
2012-12-29 23:32:34 +02:00
88bdb15338
Add site namespace and rename site preview/publish rake tasks.
2012-12-28 16:09:42 -06:00
6c02483255
Do not copy _site dir to gh-pages dir on release.
2012-12-26 15:42:39 -07:00
708ae28d8a
A better way to preview and release the Jekyll site.
2012-12-26 15:13:57 -07:00
b56a2d1ab1
Update history.
2012-12-26 14:21:22 -07:00
c23302f4fa
Merge branch 'deletion_protection' of https://github.com/jasonroelofs/jekyll into jasonroelofs-deletion_protection
2012-12-26 14:02:41 -07:00
6a78eb9f5b
Add pull request #569 to history
2012-12-24 00:43:06 +09:00
d58a0c1088
Release 0.12.0
2012-12-22 16:46:30 -07:00
934495b272
Adds some random docs for stuff I saw while skimming the code.
2012-12-18 22:42:42 -08:00
ffc68bdd48
Update history.
2012-12-15 22:21:25 -08:00
3a8ebb4b71
Merge branch 'fix/front-matter-regexp' of https://github.com/zimbatm/jekyll into zimbatm-fix/front-matter-regexp
2012-12-15 22:09:41 -08:00
22f4b12836
Clean up default config spec.
2012-12-15 22:09:21 -08:00
583f9e0019
Merge branch 'master' of https://github.com/Neil-Smithline/jekyll into Neil-Smithline-master
2012-12-15 16:42:26 -08:00
e8d68551af
Update history.
2012-12-15 16:38:20 -08:00
26f8d60542
Merge branch 'master' of https://github.com/wbrady/jekyll into wbrady-master
2012-12-15 16:35:45 -08:00
0b62b37122
Remove newline to fix failing Redcarpet test.
2012-12-15 16:34:32 -08:00
db96a88cee
Update history.
2012-12-15 14:25:37 -08:00
098da3d3fa
Merge branch 'redcarpet-update' of https://github.com/tombell/jekyll into tombell-redcarpet-update
2012-12-15 14:09:55 -08:00
5b5341ff9f
Merge pull request #683 from petedmarsh/master
...
Add license to gemspec
2012-12-15 11:25:17 -08:00
a2dd4bf203
Add license to gemspec
2012-12-07 15:24:33 +00:00
38ac55381b
Only pass first class to Pygments
...
This prevents an exception if something like the following is used:
~~~ {foo bar}
some code
~~~
2012-11-13 07:59:36 +00:00
a78b587e25
Update pygments.rb version
2012-11-13 07:54:53 +00: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
2726a5f27c
Merge branch 'master' of git://github.com/mojombo/jekyll
2012-10-03 19:33:21 -07:00
67f403a9d6
Merge branch 'alagu-posterous-importer-rebased' of git://github.com/simensen/jekyll
2012-10-03 19:33:01 -07:00
Matt Rogers
Tom Preston-Werner
Tom Preston-Werner
Parker Moore
Nick Quaranto
Manuel Rüger
stereobooster
nitoyon
Nat Welch
petedmarsh
Tom Bell
Alagu