eaf02f5a79
Update history to reflect merge of #2373 [ci skip]
2014-05-21 01:11:26 -04:00
b9c3d8ba03
Merge pull request #2373 from tschmidt/handle-categories-in-site-config-defaults
2014-05-21 01:10:37 -04:00
c0e333af53
Update history to reflect merge of #2389 [ci skip]
2014-05-21 01:10:11 -04:00
f416c686af
Merge pull request #2389 from kleinfreund/patch-1
2014-05-21 01:09:54 -04:00
581f34dced
Update history to reflect merge of #2395 [ci skip]
2014-05-21 01:09:27 -04:00
3c6377d665
Merge pull request #2395 from rdumont/data-subdirectories
2014-05-21 01:09:15 -04:00
b178960704
Update history to reflect merge of #2431 [ci skip]
2014-05-21 01:07:24 -04:00
65275e5841
Merge pull request #2431 from jekyll/remove-collections-from-layouts
2014-05-21 01:07:01 -04:00
e37b3ca8e1
Any assets read in as Pages shall not be rendered or layout'd
2014-05-21 00:52:21 -04:00
1241f2debd
Update history to reflect merge of #2418 [ci skip]
2014-05-20 22:52:50 -04:00
5aefaa1c48
Merge pull request #2418 from mathbruyen/collections_permalink
2014-05-20 22:52:29 -04:00
c7fb38b606
Update history to reflect merge of #2420 [ci skip]
2014-05-20 22:36:12 -04:00
7e05b6e0b3
Merge pull request #2420 from albertogg/fix-encoding-issue
2014-05-20 22:35:50 -04:00
879184fe37
Update unescaped string test
...
Nothing was being tested without explicitly making the string
encoding ASCII.
2014-05-20 17:04:08 -04:30
cbe7e3e80e
Don't place asset files or yaml files in layouts
...
Ref: #2402
2014-05-20 17:11:34 -04:00
ebd87bfb78
WE WANT DOCS! Plz. ❤️
2014-05-20 16:52:22 -04:00
beeca433ae
Update history to reflect merge of #2424 [ci skip]
2014-05-20 15:36:18 -04:00
d3f9427e37
Merge pull request #2424 from kleinfreund/patch-2
2014-05-20 15:35:47 -04:00
c76e41d157
Update `Utils#pluralized_array_from_hash` and `Utils#value_from_singular_key` per suggestion from @parkr
...
Switched to using the `#tap` method for more concise code. Also returning the value from
`value_from_singular_key` instead of returning an array wrapped presentation of the value.
This allows for a one-liner in `pluralized_array_from_hash`.
2014-05-20 12:32:59 -05:00
f695603dec
Merge pull request #2430 from ivantsepp/doc_fix
...
Extra period in collections documentation
2014-05-20 12:13:22 -04:00
5bb7c7eb9a
Update history to reflect merge of #2429 [ci skip]
2014-05-20 12:13:01 -04:00
395d65454c
Merge pull request #2429 from jshawl/code-overflow-fix
2014-05-20 12:12:36 -04:00
27381b7f07
Remove extra period. [ci skip]
2014-05-20 09:58:43 -04:00
e7c4fa0e5f
Prevent code overflowing container
2014-05-20 09:51:57 -04:00
7ce849a2b6
Revert changes and add encoding to the test file
...
* Add encoding to the test file as Ruby 1.9.3 doesn’t defaults to utf-8.
* Remove the forced encoding as encode seems too aggressive.
2014-05-20 00:03:40 -04:30
a07f690509
Update history to reflect merge of #2406 [ci skip]
2014-05-20 00:16:58 -04:00
54fba9af4b
Merge pull request #2406 from yihangho/config-yaml
2014-05-20 00:15:58 -04:00
2a1054b1a8
Change test to make it pass in Ruby 1.9.3
2014-05-19 22:08:14 -04:30
77cef764d6
Force encoding before escaping or unescaping
...
This will reassure not having any errors when escaping or
unescaping.
2014-05-19 18:50:25 -04:30
2f3390750d
Add tests to validate encoding of URLs
...
Added tests to validate the encoding of returned URL strings
after been escaped or unescaped.
2014-05-19 18:45:47 -04:30
936a00a974
Prevent table from extending parent width
...
The table containing the _Permalink style examples_ [in the docs](http://jekyllrb.com/docs/permalinks/#permalink-style-examples ) extends the width of the content container.
The solution I propose is a bit dirty, because I remove `permalink: ` in the left column to make the table fit.
Another way would be using `white-space: normal;` for code inside tables. That would lead to _ugly_ line-breaks within the code.
What do you think?
2014-05-19 16:41:33 +02:00
658a4d0b47
Try to load _config.yaml if _config.yml is nonexistent.
2014-05-19 09:06:55 +08:00
5b281a06d6
Update history to reflect merge of #2421 [ci skip]
2014-05-18 15:29:51 -04:00
45c9b82fb3
Merge pull request #2421 from chezou/fix-broken-link
2014-05-18 15:29:09 -04:00
755088dbf0
Fix broken link on installation.md
2014-05-19 00:13:40 +09:00
9932eb667b
Encode URLs in utf-8 when escaping and unescaping
...
There is a problem while returning a path that has some special and possible Non-ASCII characters that may lead jekyll to break while doing the unescaping process. This is can be addressed by “forcing” ASCII to UTF-8.
2014-05-17 17:53:40 -04:30
921dbe0547
Override collection url template
2014-05-17 10:40:52 +02:00
ab679cbe26
Update history to reflect merge of #2417 [ci skip]
2014-05-17 00:54:29 -04:00
4147e92561
Merge pull request #2417 from jekyll/jekyll-env
2014-05-17 00:53:55 -04:00
3413c96845
Add test for Jekyll.env
2014-05-17 00:47:03 -04:00
780cff46b3
Add jekyll.environment to site_payload.
2014-05-17 00:38:21 -04:00
5d6f6b0571
Update history to reflect merge of #2377 [ci skip]
2014-05-16 03:51:12 -04:00
04b0fe0160
Merge pull request #2377 from jekyll/numeric
2014-05-16 03:50:50 -04:00
4d1c84aa2b
date_to_xmlschema does some weird things with timezones, but whatever it's not important.
2014-05-16 03:42:35 -04:00
1c11afd78d
Fix #2413 and setup a Jekyll.env.
2014-05-15 16:28:37 -05:00
8b5fe24cb2
Update history to reflect merge of #2408 [ci skip]
2014-05-15 12:38:33 -04:00
ba905a2c18
Merge pull request #2408 from quinn/patch-1
2014-05-15 12:37:56 -04:00
bd51b250be
Update history to reflect merge of #2411 [ci skip]
2014-05-15 12:37:28 -04:00
996bf25aee
Merge pull request #2411 from mathbruyen/patch-1
2014-05-15 12:37:02 -04:00
2a5336b93a
Update history to reflect merge of #2410 [ci skip]
2014-05-15 12:33:25 -04:00
Parker Moore
Alberto Grespan
Terry Schmidt
Ivan Tse
Jesse shawl
Philipp Rudloff
Yihang Ho
Chezou
Mathieu Bruyen
Jordon Bedwell