963721fb46
Merge branch 'master' of github.com:mojombo/jekyll
...
* 'master' of github.com:mojombo/jekyll:
add Enumerable#glob_include?
fixed a syntax error
use any? instead
update test for include,exclude glob support
Update test/test_site.rb
Update lib/jekyll/site.rb
add regexp support for option 'include','exclude'
2013-01-12 22:16:28 -08:00
e383bfe65d
Merge pull request #743 from mccxj/master
...
add glob support to include, exclude option
2013-01-12 22:16:07 -08:00
fbda85210a
Added html_report profile to cucumber
2013-01-12 21:55:59 -08:00
5a3e05dbff
Ensuring that layout is only set to the default value if layout is not specified
2013-01-12 15:31:14 -08:00
11ca1dfa78
Updated history to reflect merging of #580 .
2013-01-12 15:15:32 -08:00
e8c74fe7a8
Layouts default to page or post depending upon type.
2013-01-12 13:49:45 -08:00
d9bc6b57d5
Updated gemspec to include new command and fixture files in manifest
2013-01-12 13:19:29 -08:00
e2affb2257
Added passing tests for #616
2013-01-12 00:14:00 -08:00
a05b9159d9
Merge pull request #616 from hokaccha/fix_pygments_opt
...
fixed pygments linenos options for pygments.rb
2013-01-12 00:11:18 -08:00
3d093f0035
Using new command structure in Rakefile
2013-01-11 23:59:21 -08:00
14cabab254
Merge pull request #690 from tombell/jekyll-command-redux
...
The Big Jekyll Command Cleanup
2013-01-11 21:47:59 -08:00
7f072ed578
Merge branch 'master'
2013-01-12 01:18:41 +00:00
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
8b9baeee0e
Revert "Specific patch version of 1.9.3: 362."
...
This reverts commit e4517c42af
2013-01-11 16:45:17 -08:00
e4517c42af
Specific patch version of 1.9.3: 362.
2013-01-11 16:26:06 -08:00
a8d07dd5f5
Updating travis configuration to explicitly run 'rake' behind bundle exec.
2013-01-11 16:21:31 -08:00
36ba434115
Updated history to reflected merged PRs, #745 and #685 .
2013-01-11 16:17:03 -08:00
4336b6dd4e
Added Travis CI badge to README
2013-01-11 15:55:14 -08:00
d2e750cc74
removed extraneous whitespace in test_site.rb
2013-01-11 15:54:57 -08:00
418ef419dd
Merge pull request #685 from edeustace/keep_files_feature
...
Keep files feature
2013-01-11 15:47:26 -08:00
0fa55418e9
merge lastest from mojombo/jekyll master
2013-01-11 12:23:53 +01:00
660e5e0e14
Merge remote-tracking branch 'jekyll/master'
2013-01-11 15:45:54 +08:00
3cf29eeee2
add Enumerable#glob_include?
2013-01-11 15:33:11 +08:00
6253f79de2
Added space between arguments in Convertible errors
2013-01-10 22:11:13 -08:00
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
c729fbb5c9
Merge pull request #746 from mattr-/contributor-guidelines
...
Add a CONTRIBUTING file
2013-01-10 21:35:23 -08:00
7782e0b1a1
Add a CONTRIBUTING file
...
This uses the content of the 'Contribute' wiki page.
2013-01-10 21:44:08 -06:00
9c517c6d7d
Rename migrate command to import
2013-01-11 00:32:39 +00:00
e210a0603f
Revert "Remove migrators"
...
This reverts commit b9da30bc8f
2013-01-11 00:30:17 +00:00
a5c908ac3f
no good reason for making 'name' an instance variable
2013-01-10 14:13:11 -08:00
cf42c56630
stick to good coding standards
2013-01-10 14:07:10 -08:00
3e7f00ae19
test the path, not the parts
2013-01-10 13:01:50 -08:00
ba48870ead
outputting full path when file does not parse
2013-01-10 12:29:04 -08:00
b3e27f2c5d
fixed a syntax error
2013-01-10 19:41:11 +08:00
c627cd3519
use any? instead
2013-01-10 09:16:09 +08:00
e3bd250e69
Remove old jekyll command
2013-01-09 23:42:57 +00:00
b70b57cb89
Merge branch 'master' into 'jekyll-command-redux'
2013-01-09 23:40:27 +00:00
adba101734
update test for include,exclude glob support
2013-01-09 16:44:53 +08:00
655cf3b3a8
Update test/test_site.rb
2013-01-09 16:23:58 +08:00
1e892678bc
Update lib/jekyll/site.rb
2013-01-09 16:06:43 +08:00
6eed91871f
Changes based on @mojombo's feedback
2013-01-08 23:17:06 +01:00
44822a252e
add regexp support for option 'include','exclude'
2013-01-06 21:23:31 +08: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
Parker Moore
7rans
Tom Bell
edeustace
mccxj
Matt Rogers
Eric Theise
Tom Preston-Werner
Tom Preston-Werner
Nick Quaranto