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

2772 Commits

Author SHA1 Message Date
Eric Mill 3fe261f91c Mention the 'input' option to use a GFM parser in the kramdown options documentation. 2013-12-08 20:13:52 -05:00
Parker Moore d2e948600f Update history to reflect merge of #1787 2013-12-08 01:05:10 -05:00
Parker Moore d2dc52bcb0 Merge pull request #1787 from mojombo/css-includes-2 
Move jekyllrb.com CSS to includes & Update Normalize.css to v2.1.3
 2013-12-07 22:02:35 -08:00
Parker Moore 6c23751a4a Upgrade to normalize.css v2.1.3 2013-12-08 01:00:55 -05:00
Anatol Broder d089923271 Move CSS files to includes. 2013-12-08 01:00:40 -05:00
Parker Moore fa3476dd2a Update history to reflect merge of #1657 2013-12-08 00:43:44 -05:00
Parker Moore b58cd5c132 Merge pull request #1657 from mojombo/safe-whitelist 
A gem-based plugin whitelist for `safe` mode
 2013-12-07 21:41:55 -08:00
Matt Rogers d4bbe3c997 Release 1.4.0 2013-12-07 19:10:02 -06:00
Parker Moore 446e3e4409 Merge pull request #1785 from mojombo/release-1.4.0-updates 2013-12-07 16:37:58 -08:00
Parker Moore c20c09d2a4 1.4.0 release post fixes 2013-12-07 19:34:52 -05:00
Parker Moore 315fb0cf20 Use YYYY-MM-DD in History file :) 2013-12-07 19:31:48 -05:00
Matt Rogers 3788c08b13 prep the gemspec for 1.4.0 2013-12-07 17:59:21 -06:00
Matt Rogers 350c9b3ab5 bump the version number in the code 2013-12-07 17:59:16 -06:00
Matt Rogers 84722ded3e Update the site for the 1.4.0 release 
Add a release announcement and update the History file
 2013-12-07 17:59:05 -06:00
Matt Rogers 7da676bcc2 Update History.markdown for the 1.4.0 release 2013-12-07 17:58:51 -06:00
Matt Rogers & Persa Zula 8b0ea62535 Update history to reflect merge of #1779 2013-12-06 23:03:59 -06:00
Matt Rogers 362d28f11d Merge pull request #1779 from mojombo/no-duplication 
Refactor post and draft object creation
 2013-12-06 20:58:24 -08:00
Matt Rogers 9f1593299a Merge pull request #1775 from Ivoz/maruku 
Update to maruku 0.7
 2013-12-06 20:56:52 -08:00
Persa Zula 6a13f7dd57 Modifying enumerator for 1.8.7 2013-12-06 01:28:21 -05:00
Matt Rogers & Persa Zula e69d77b4df Refactor post and draft object creation 
De-duplicate object creation between posts and drafts. Inject the name
dependency through a parameter
 2013-12-06 01:28:21 -05:00
Parker Moore e91db82d26 I mean the argument and the local variable should be the same thing 2013-12-06 01:07:34 -05:00
Parker Moore 5591ff2a6b Whoops, it's called 'jekyll_run_output' 2013-12-06 00:57:19 -05:00
Parker Moore bce2c2efb4 Print the output of Jekyll if the command fails 2013-12-06 00:52:33 -05:00
Parker Moore f0fbc8f356 Refactor conditions for allowing plugins into a new method: Site#plguin_allowed? 2013-12-06 00:26:44 -05:00
Parker Moore 249b13a98a Hm, shouldn't need that call to 'rescue' in Site#whitelist 2013-12-06 00:24:59 -05:00
Parker Moore 5c9f9a4de8 The whitelist should be an array (not a file) 
Default to `[]` if the key’s value is falsey
 2013-12-06 00:23:22 -05:00
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