dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,271 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

1271 Commits

Author SHA1 Message Date
Parker Moore 282a3bce73 Updated history 2013-01-12 22:26:05 -08:00
Parker Moore 6a7a030eee Fixed failing Cucumber test 2013-01-12 22:25:55 -08:00
Parker Moore 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
Parker Moore e383bfe65d Merge pull request #743 from mccxj/master 
add glob support to include, exclude option
 2013-01-12 22:16:07 -08:00
Parker Moore fbda85210a Added html_report profile to cucumber 2013-01-12 21:55:59 -08:00
Parker Moore 45f10a22da Update number of Jekyll-powered blogs on Sites page 2013-01-12 15:36:11 -08:00
Parker Moore 078972de4b Remove Octopress site from list of Jekyll-powered Sites 2013-01-12 15:35:21 -08:00
Parker Moore 4bb5158b09 New sub-titles for sub-command options table 2013-01-12 15:34:05 -08:00
Parker Moore 5a3e05dbff Ensuring that layout is only set to the default value if layout is not specified 2013-01-12 15:31:14 -08:00
Parker Moore 11ca1dfa78 Updated history to reflect merging of #580. 2013-01-12 15:15:32 -08:00
7rans e8c74fe7a8 Layouts default to page or post depending upon type. 2013-01-12 13:49:45 -08:00
Parker Moore d9bc6b57d5 Updated gemspec to include new command and fixture files in manifest 2013-01-12 13:19:29 -08:00
Parker Moore e2affb2257 Added passing tests for #616 2013-01-12 00:14:00 -08:00
Parker Moore 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
Parker Moore 3d093f0035 Using new command structure in Rakefile 2013-01-11 23:59:21 -08:00
Parker Moore 42fa1046db Using internal links for homepage 2013-01-11 23:51:32 -08:00
Parker Moore 5db1bba6fd auto => watch 2013-01-11 23:51:22 -08:00
Parker Moore 64cbaa1d85 Configuration docs updated with new structure 2013-01-11 23:51:06 -08:00
Parker Moore 39b159c258 Return of the "sites" page - for learning purposes 2013-01-11 23:50:36 -08:00
Parker Moore 9fc89482b3 Using build and serve sub-commands in docs 2013-01-11 23:50:13 -08:00
Parker Moore 14cabab254 Merge pull request #690 from tombell/jekyll-command-redux 
The Big Jekyll Command Cleanup
 2013-01-11 21:47:59 -08:00
Tom Bell 7f072ed578 Merge branch 'master' 2013-01-12 01:18:41 +00:00
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
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