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 |
Piotr Usewicz
|
9b8b5b2bda
|
Dont test kramdown
It should have it's own tests for that
|
2013-01-11 11:02:07 +00:00 |
Jashank Jeremy
|
68333cd221
|
Slight stylistic tweak to LSI initialisation.
Recommended-by: parkr
|
2013-01-11 20:02:31 +11:00 |
mccxj
|
660e5e0e14
|
Merge remote-tracking branch 'jekyll/master'
|
2013-01-11 15:45:54 +08:00 |
|
mccxj
|
3cf29eeee2
|
add Enumerable#glob_include?
|
2013-01-11 15:33:11 +08: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
|
151275d09e
|
Add TomDoc
|
2013-01-10 21:53:21 -06: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 |
|
Matt Rogers
|
92eb926bf8
|
Look for plugins under the source directory by default
|
2013-01-10 21:24:28 -06:00 |
|
Matt Rogers
|
f3f181484d
|
Merge remote-tracking branch 'upstream/master' into issue-653
|
2013-01-10 20:41:32 -06:00 |
Tom Bell
|
9c517c6d7d
|
Rename migrate command to import
|
2013-01-11 00:32:39 +00:00 |
|
Tom Bell
|
e210a0603f
|
Revert "Remove migrators"
This reverts commit b9da30bc8f.
|
2013-01-11 00:30:17 +00: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 |
|
Piotr Usewicz
|
5d48c5390d
|
Add test/unit
|
2013-01-10 20:47:55 +00:00 |
|
Eric Theise
|
ba48870ead
|
outputting full path when file does not parse
|
2013-01-10 12:29:04 -08:00 |
|
xiaojian cai
|
b3e27f2c5d
|
fixed a syntax error
|
2013-01-10 19:41:11 +08:00 |
|
xiaojian cai
|
c627cd3519
|
use any? instead
|
2013-01-10 09:16:09 +08:00 |
|
Tom Bell
|
e3bd250e69
|
Remove old jekyll command
|
2013-01-09 23:42:57 +00:00 |
|
Tom Bell
|
b70b57cb89
|
Merge branch 'master' into 'jekyll-command-redux'
|
2013-01-09 23:40:27 +00:00 |
|
Piotr Usewicz
|
50b4a8c0ab
|
Bump kramdown, rake, shoulda, cucumber, redcarpet
|
2013-01-09 10:29:40 +00:00 |
|
xiaojian cai
|
adba101734
|
update test for include,exclude glob support
|
2013-01-09 16:44:53 +08:00 |
|
xiaojian cai
|
655cf3b3a8
|
Update test/test_site.rb
|
2013-01-09 16:23:58 +08:00 |
|
xiaojian cai
|
1e892678bc
|
Update lib/jekyll/site.rb
|
2013-01-09 16:06:43 +08:00 |
|
edeustace
|
6eed91871f
|
Changes based on @mojombo's feedback
|
2013-01-08 23:17:06 +01:00 |
|
xiaojian cai
|
44822a252e
|
add regexp support for option 'include','exclude'
|
2013-01-06 21:23:31 +08: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 |