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 |
Parker Moore
|
1297ed5c1d
|
Remove weird 1.8.7 workarounds in features env
|
2013-12-06 01:42:37 -05:00 |
|
Parker Moore
|
96ecfb30ef
|
Require Ruby version >= 1.9.2 in gemspec
|
2013-12-06 01:42:23 -05:00 |
|
Parker Moore
|
c5ff3fec39
|
Remove 1.8.7 from Travis build spec
|
2013-12-06 01:42:04 -05: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 |
maul.esel
|
f1869cda98
|
Merge branch 'master' into frontmatter-defaults
|
2013-12-05 19:29:57 +01:00 |
|
maul.esel
|
960e01cba8
|
move self.type to convertible
|
2013-12-05 09:14:31 +01: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 |