Parker Moore
9414281521
Merge pull request #750 from mojombo/update-travis-config
...
Updating travis configuration to explicitly run 'rake' behind bundle exec
2013-01-11 16:52:00 -08:00
Parker Moore
8b9baeee0e
Revert "Specific patch version of 1.9.3: 362."
...
This reverts commit e4517c42af
.
2013-01-11 16:45:17 -08:00
Parker Moore
e4517c42af
Specific patch version of 1.9.3: 362.
2013-01-11 16:26:06 -08:00
Parker Moore
a8d07dd5f5
Updating travis configuration to explicitly run 'rake' behind bundle exec.
2013-01-11 16:21:31 -08:00
Parker Moore
36ba434115
Updated history to reflected merged PRs, #745 and #685 .
2013-01-11 16:17:03 -08:00
Parker Moore
4336b6dd4e
Added Travis CI badge to README
2013-01-11 15:55:14 -08:00
Parker Moore
d2e750cc74
removed extraneous whitespace in test_site.rb
2013-01-11 15:54:57 -08:00
Parker Moore
418ef419dd
Merge pull request #685 from edeustace/keep_files_feature
...
Keep files feature
2013-01-11 15:47:26 -08:00
edeustace
0fa55418e9
merge lastest from mojombo/jekyll master
2013-01-11 12:23:53 +01:00
Parker Moore
6253f79de2
Added space between arguments in Convertible errors
2013-01-10 22:11:13 -08:00
Parker Moore
824df94066
Merge pull request #745 from erictheise/master
...
output full path & name for files that don't parse
2013-01-10 21:44:10 -08:00
Parker Moore
c729fbb5c9
Merge pull request #746 from mattr-/contributor-guidelines
...
Add a CONTRIBUTING file
2013-01-10 21:35:23 -08:00
Matt Rogers
7782e0b1a1
Add a CONTRIBUTING file
...
This uses the content of the 'Contribute' wiki page.
2013-01-10 21:44:08 -06:00
Eric Theise
a5c908ac3f
no good reason for making 'name' an instance variable
2013-01-10 14:13:11 -08:00
Eric Theise
cf42c56630
stick to good coding standards
2013-01-10 14:07:10 -08:00
Eric Theise
3e7f00ae19
test the path, not the parts
2013-01-10 13:01:50 -08:00
Eric Theise
ba48870ead
outputting full path when file does not parse
2013-01-10 12:29:04 -08:00
edeustace
6eed91871f
Changes based on @mojombo's feedback
2013-01-08 23:17:06 +01:00
Tom Preston-Werner
dd0e208daa
Merge branch 'patch-1' of https://github.com/jlecour/jekyll into jlecour-patch-1
2013-01-03 22:26:09 -08:00
Tom Preston-Werner
4c70c036e7
TomDoc lib/jekyll/post.rb.
2013-01-03 22:20:42 -08:00
Tom Preston-Werner
9328a1a0dd
Merge branch 'docs' of https://github.com/icco/jekyll into icco-docs
2013-01-03 22:06:50 -08:00
Tom Preston-Werner
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
Parker Moore
6ec1c45d5d
Added support for .ruby-version to ensure congruent dev environment
2013-01-02 19:59:20 -05:00
Nick Quaranto
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
Nick Quaranto
0776078487
If we're going to use Launchy, let's use Dir.chdir
2013-01-01 19:46:56 -05:00
Parker Moore
f7eacb7666
Using local jekyll bin to generate docs site
2013-01-01 19:44:11 -05:00
Tom Preston-Werner
72c8ceba4e
Merge pull request #651 from alagu/master
...
Posterous importer update
2012-12-31 18:24:43 -08:00
Tom Preston-Werner
ff04018275
Update history.
2012-12-31 16:41:38 -08:00
Tom Preston-Werner
b36c9788ac
Merge branch 'master' of https://github.com/enure/jekyll into enure-master
2012-12-31 14:22:24 -08:00
Tom Preston-Werner
a041d7a19a
Merge pull request #721 from mrueg/patch-1
...
Update Dependencies in Readme, alphabetize
2012-12-31 14:09:46 -08:00
Tom Preston-Werner
d32f655716
Update history.
2012-12-31 14:04:02 -08:00
Tom Preston-Werner
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
Tom Preston-Werner
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
Tom Preston-Werner
43216ac629
Make sure we do not forget to merge #583 in the future.
2012-12-31 13:10:15 -08:00
Tom Preston-Werner
00d979759e
Update history.
2012-12-31 13:01:40 -08:00
Tom Preston-Werner
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
Tom Preston-Werner
62c8ba089a
Update history.
2012-12-31 12:18:03 -08:00
Manuel Rüger
ea0d111362
Update Dependencies in Readme, alphabetize
2012-12-31 03:14:30 +01:00
stereobooster
da096f307b
Add testcases for YAML syntax error and non UTF-8 encoding
2012-12-30 02:39:02 +02:00
Tom Preston-Werner
83b3b2a340
More robust site:publish.
2012-12-29 16:24:26 -08:00
Tom Preston-Werner
95b07a3c2b
Use Launchy for cross platform site:preview. Thx @ixti.
2012-12-29 15:29:56 -08:00
stereobooster
a5a6900948
fix error for case with broken encoding
2012-12-30 00:07:21 +02:00
stereobooster
2dbce8ca9f
fix error for case with wrong encoding or error in YAML
2012-12-29 23:32:34 +02:00
Tom Preston-Werner
88bdb15338
Add site namespace and rename site preview/publish rake tasks.
2012-12-28 16:09:42 -06:00
Tom Preston-Werner
6c02483255
Do not copy _site dir to gh-pages dir on release.
2012-12-26 15:42:39 -07:00
Tom Preston-Werner
708ae28d8a
A better way to preview and release the Jekyll site.
2012-12-26 15:13:57 -07:00
Tom Preston-Werner
b56a2d1ab1
Update history.
2012-12-26 14:21:22 -07:00
Tom Preston-Werner
c23302f4fa
Merge branch 'deletion_protection' of https://github.com/jasonroelofs/jekyll into jasonroelofs-deletion_protection
2012-12-26 14:02:41 -07:00
nitoyon
6a78eb9f5b
Add pull request #569 to history
2012-12-24 00:43:06 +09:00
Tom Preston-Werner
d58a0c1088
Release 0.12.0
2012-12-22 16:46:30 -07:00