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

2957 Commits

Author SHA1 Message Date
Parker Moore 8d898dafde Add "jekyll_test_plugin_malicious" as gem dep 2013-12-06 00:22:07 -05:00
Parker Moore be5966a2ec Remove option from CLI 2013-12-06 00:21:47 -05:00
Parker Moore 6187861e91 Add test code for 'whitelist' option. 2013-12-06 00:21:34 -05:00
Parker Moore e14fe116db Update history to reflect merge of #1778 2013-12-05 21:43:11 -05:00
Parker Moore 03a254c712 Merge pull request #1778 from mojombo/fix-toml 
Fix 1.8.7 problem with TOML by bumping toml gem to 0.1.0
 2013-12-05 18:42:18 -08:00
Parker Moore aabb3e96cc Upgrade toml gem to 0.1.0 2013-12-05 18:08:32 -05:00
Matt Rogers 654fe6117b Update history to reflect merge of #1682 2013-12-04 20:40:58 -06:00
Matt Rogers 4a2e5af52e Merge pull request #1682 from envygeeks/patch-1 
Sort plugins so people can have "load orders".
 2013-12-04 18:40:04 -08:00
Matt Rogers dc7be86970 Update history to reflect merge of #1765 2013-12-04 20:28:58 -06:00
Matt Rogers 052a577938 Merge pull request #1765 from mojombo/tomlify 
Add support for TOML config files
 2013-12-04 18:28:20 -08:00
Matt Rogers 4076b12400 Update history to reflect merge of #1772 2013-12-04 20:25:34 -06:00
Matt Rogers 4e11ca8b03 Merge pull request #1772 from penibelst/no-x-icon 
Fix favicon’s type
 2013-12-04 18:24:16 -08:00
Matthew Iversen fb9de8cbf6 Fix tests to expect maruku 0.7 output 2013-12-05 12:20:11 +11:00
Matthew Iversen 5ed9d21ec7 Remove extraneous newlines from XHTML output 2013-12-05 12:04:55 +11:00
Matthew Iversen 0bdfed4b25 Update requirements to maruku 0.7 2013-12-05 11:59:36 +11:00
Anatol Broder eab027d03a Fix favicon’s type 2013-12-04 23:06:08 +01:00
Parker Moore 7af757a3fc Update history to reflect merge of #1762 2013-12-02 15:36:55 -05:00
Parker Moore b7fe8cfd62 Merge pull request #1762 from yizeng/master 
fix wrong case for a word
 2013-12-02 12:36:12 -08:00
Parker Moore 6768977c27 Update history to reflect merge of #1755 2013-12-02 15:35:43 -05:00
Parker Moore b637420373 Merge pull request #1755 from gregkare/more_trailing_whitespace 
Remove trailing whitespace
 2013-12-02 12:35:06 -08:00
Parker Moore 9cfe1f0a9c Update history to reflect merge of #1769 2013-12-01 19:27:03 -05:00
Parker Moore 6db32d6635 Merge pull request #1769 from davidsawyer/master 
add a space between "find" and "an"
 2013-12-01 16:26:03 -08:00
David Sawyer 63122fdafc add a space between "find" and "an" 2013-12-01 19:11:16 -05:00
Parker Moore 3b0c8ad654 Add some unit tests for TOML integration. 2013-11-29 23:33:52 -05:00
Parker Moore b8bbc6e08b require the TOML gem, idiot. 2013-11-29 23:33:38 -05:00
Parker Moore 22b95aee38 Give that LoadError a good message. 2013-11-29 23:33:25 -05:00
Parker Moore 1e32af47a6 Better config file parser error if it's not there. 2013-11-29 23:22:13 -05:00
Parker Moore 51706e8da7 Parse TOML or YAML in Jekyll::Configuration. 2013-11-28 22:11:56 -05:00
Yi Zeng 9fa0f2ab26 fix wrong case for a word 2013-11-27 20:19:25 +13:00
Matt Rogers 4f337df2d8 Update the gemspec with the release post 2013-11-26 20:45:57 -06:00
Matt Rogers 04cf28dc05 Release 1.3.1 2013-11-26 20:30:23 -06:00
Matt Rogers 91a4c5611e Prep for the 1.3.1 release 2013-11-26 20:27:27 -06:00
Matt Rogers 4cc0bdf8ff Update history to reflect merge of #1759 2013-11-26 19:46:46 -06:00
Matt Rogers f8ae2ce7d9 Merge pull request #1759 from mojombo/pagination-lowest-priority 
Pagination generator should have :lowest priority
 2013-11-26 17:45:31 -08:00
Parker Moore eceebb23a6 Pagination generator should have :lowest priority 2013-11-26 12:45:00 -05:00
Matt Rogers 47eac96fdc Update history to reflect merge of #1754 2013-11-25 20:56:51 -06:00
Matt Rogers cbfb4e7414 Merge pull request #1754 from gregkare/duplicate_testcase 
Fix duplicate test case name
 2013-11-25 18:56:07 -08:00
Greg Karékinian ce8e271b5d Remove trailing whitespace 2013-11-25 13:31:53 +01:00
Greg Karékinian 9182b1b7ae Fix duplicate test case name 2013-11-25 12:59:27 +01:00
Matt Rogers 7cda916faa Update history to reflect merge of #1448 2013-11-22 23:00:24 -06:00
Matt Rogers 9e9abcb516 Merge pull request #1448 from penibelst/replace-yoursite 
Replace yoursite.com by example.com
 2013-11-22 20:59:27 -08:00
Matt Rogers 33be5b0361 Update history to reflect merge of #1746 2013-11-22 22:30:29 -06:00
Matt Rogers 7cb44fdff1 Merge pull request #1746 from maul-esel/missing-include 
output including file for include tag error
 2013-11-22 20:29:11 -08:00
Matt Rogers 16f4d025ab Update history to reflect merge of #1736 2013-11-22 22:23:27 -06:00
Matt Rogers cf60d5e34e Merge pull request #1736 from gregkare/trailing_whitespace 
Remove extra trailing whitespace
 2013-11-22 20:22:53 -08:00
Matt Rogers 8595ea812c Update history to reflect merge of #1718 2013-11-22 20:32:27 -06:00
Matt Rogers 249642733b Merge pull request #1718 from thomasdao/master 
Add docs for post_url when posts are in subdirectory
 2013-11-22 18:31:09 -08:00
maul.esel c5533e9016 restrict rescue-clause in IncludeTag#render 
As it previously enclosed the whole method, it also
wrapped file validation errors, which is not meant to be.

Fixes #1745.
 2013-11-22 06:58:52 +01:00
maul.esel 3888a24068 output including file for include tag error 2013-11-21 22:03:39 +01:00
Parker Moore ed7fb46b96 Update history to reflect merge of #1741 2013-11-21 15:57:03 -05:00