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

2087 Commits

Author SHA1 Message Date
Parker Moore 9d814a4eb7 Add method String#force_encoding to 1.8.7 2013-03-17 23:35:46 +01:00
Parker Moore e3192792cd Merge branch 'master' of github.com:mojombo/jekyll 
* 'master' of github.com:mojombo/jekyll:
  Added note to highlight common pitfall/misconception regarding Pagination's capabilities.
 2013-03-17 22:31:50 +01:00
Parker Moore 036fce8799 Update history to reflect merge of #555. Closes #555. 2013-03-17 22:29:50 +01:00
Dave Wasmer f7f64576e5 Force encoding of the rdiscount TOC to UTF8 to avoid conversion errors 2013-03-17 22:28:52 +01:00
Parker Moore dd7cf6511e Merge pull request #853 from davecranwell/master 
Pagination can't be filtered by tag or category, but this isn't clear and is often found out too late by an implementer
 2013-03-17 14:24:57 -07:00
Parker Moore 677a87e437 Update history to reflect #861 2013-03-17 21:34:35 +01:00
Parker Moore a054ce2788 Merge pull request #861 from danielgrieve/gist-tag 
display single files from gist
 2013-03-17 13:33:10 -07:00
Parker Moore 309e03b1d3 Update history to reflect merge of #871. 2013-03-17 21:31:30 +01:00
Parker Moore 7ba5a27a74 Merge pull request #871 from mojombo/gh-pages-mime-types 
Use GH Pages MIME types.
 2013-03-17 13:22:51 -07:00
Parker Moore 4400e89898 Expect a 'baseurl' to be passed in to Site 2013-03-17 21:18:45 +01:00
Parker Moore 0765d07730 Added sanity tests for #869. 2013-03-17 21:15:17 +01:00
Tom Preston-Werner 8c6c33a6c8 Use GH Pages MIME types. 2013-03-17 13:14:35 -07:00
Parker Moore ee697a6308 Add Jekyll::DEFAULTS['baseurl'] and set the default pygments option to _true_ 2013-03-17 21:09:58 +01:00
Parker Moore 92a2a9ff61 Update gemspec so bundler doesn't complain. 2013-03-17 21:07:27 +01:00
Parker Moore 69edec8559 Update history to reflect merge of #869. 2013-03-17 20:54:52 +01:00
Parker Moore ebcf3eb385 Merge pull request #869 from mojombo/baseurl-in-liquid 
Expose site.baseurl to Liquid templates.
 2013-03-17 12:53:27 -07:00
Parker Moore b3c319743c Update history to reflect merge of #862. 2013-03-17 20:49:58 +01:00
Parker Moore 6c1a08ce87 Merge pull request #862 from mojombo/fix-autogen-dest-prob 
Stop DirectoryWatcher from watching the destination directory
 2013-03-17 12:48:30 -07:00
Parker Moore d5ed4fc5d0 Add baseurl to Site attr_accessor list. 2013-03-17 20:42:11 +01:00
Parker Moore eef13d7d43 Expose site.baseurl to Liquid templates. 2013-03-17 17:26:33 +01:00
Daniel Grieve b9cbce5e5f fix regex 2013-03-17 15:04:03 +00:00
Parker Moore 88f59c6154 Update history to reflect merge of #837. 2013-03-17 15:54:47 +01:00
Parker Moore 936ed1f849 Merge pull request #837 from ixti/feature-excerpt 
Adds excerpt to posts
 2013-03-17 07:53:41 -07:00
Parker Moore 43213c2e79 Update history to reflect merge of #764 2013-03-17 15:50:01 +01:00
Parker Moore e2d0697f30 Merge pull request #764 from mojombo/jekyll-new 
`jekyll new`: scaffold site generator
 2013-03-17 07:47:56 -07:00
Parker Moore a15e0c811b Remove git poop. 2013-03-17 15:47:26 +01:00
Parker Moore 9726bd625d Whitespace issue in bin/jekyll 2013-03-17 15:46:46 +01:00
Parker Moore aa7a234c18 Merge master into jekyll-new 2013-03-17 15:45:37 +01:00
Aleksey V Zapparov 66c5ef2556 Fix typos and remove some obtrusive code 2013-03-17 13:42:46 +01:00
Daniel Grieve 22d1fdab54 tie down the regex match on gist filenames 2013-03-17 11:29:42 +00:00
Parker Moore 9ae7ca008b Update history to reflect merge of #723. 2013-03-16 21:21:13 +01:00
paco 23a01e7766 Patch for multibyte URI problem. Closes #723. 2013-03-16 21:20:11 +01:00
Daniel Grieve 6c5d001986 replace \s with space 2013-03-16 19:20:54 +00:00
Parker Moore df7b9f4f01 Update history to reflect merge of #864. 2013-03-16 20:11:11 +01:00
Parker Moore 5d34a4c533 Merge pull request #864 from mojombo/prioritize_plugins 
Prioritize plugins & DRY subclass instantiation
 2013-03-16 12:09:43 -07:00
Parker Moore bdc3d67799 Update history to reflect merge of #863 2013-03-16 20:09:22 +01:00
Parker Moore d091cfe3fc Merge pull request #863 from mojombo/accept-custom-config 
Accept custom configuration
 2013-03-16 12:07:31 -07:00
Parker Moore 39f144ed01 Newline. 2013-03-16 20:06:50 +01:00
Parker Moore 1d05e0be81 Added tests for generators. 2013-03-16 20:06:40 +01:00
Tommy Sullivan caa6a4ebfd Sort instantiated subclasses in Site. 2013-03-16 15:24:34 +01:00
Matt Rogers 10ee5c8999 Remove the duplication when creating Converters and Generators 
Encapsulate it in a method and give the method the class to walk the
subclass tree for to create new objects.
 2013-03-16 15:20:11 +01:00
Tommy Sullivan 7425b2c32e Add test to ensure plugins are executed in order of priority. 2013-03-16 15:12:57 +01:00
Parker Moore 7a57451962 Add --config switch to build and serve commands. 2013-03-16 14:54:44 +01:00
Parker Moore 9100967ebd Add unit tests for custom configuration. 2013-03-16 14:46:26 +01:00
Parker Moore 7e1100962c Load in config from --config switch 2013-03-16 14:44:49 +01:00
Parker Moore 8acb1b29bd Using 1.8.7-compliant File.expand_path instead of >1.9 File.realpath 2013-03-16 14:24:34 +01:00
Parker Moore 52efb71aa2 Added directory_with_contents() to DRY up test code and ensure folders exist in TestCommand. 2013-03-16 14:09:53 +01:00
Parker Moore d93faac3b8 Rudimentary tests for Jekyll::Command 2013-03-16 13:59:59 +01:00
Parker Moore a0c0d983bf Using a test_dir helper method for tests. 2013-03-16 13:59:40 +01:00
Parker Moore 1d920f52f1 Fix bug where Command.globs didn't delete the destination directory. 
There was often a mix between absolute and relative paths and in the
previous version, the destination argument was usually an absolute
path where the glob array (from Dir['*']) was a relative path.
 2013-03-16 13:57:28 +01:00