2f1138cd11
Update history to reflect merge of #2394 [ci skip]
2014-05-11 19:39:37 -04:00
8068702c15
Merge pull request #2394 from penibelst/fix-dates
2014-05-11 19:38:40 -04:00
a5b3104b0c
Change timezone to Los Angeles
2014-05-12 00:47:54 +02:00
8f90ba82a4
Update history to reflect merge of #2393 [ci skip]
2014-05-11 16:42:30 -04:00
9bd6c98320
Merge pull request #2393 from createdbypete/quieter-build-command
2014-05-11 16:42:06 -04:00
6465cd6446
Setting log_level earlier to silence info level configuration output.
2014-05-11 21:14:10 +01:00
d34f1d2c1a
Update history to reflect merge of #2384 [ci skip]
2014-05-10 20:52:04 -04:00
c68d83bce7
Merge pull request #2384 from penibelst/test-sort-utf8
2014-05-10 20:51:21 -04:00
7cd95734df
Fix coding for 1.9.3
2014-05-11 02:22:58 +02:00
06cebb0816
Add ascii+utf8 sort. Props @ixti
2014-05-11 01:34:09 +02:00
b2f30f5bee
Test Russian and Hebrew sort
2014-05-11 01:06:35 +02:00
ab990933a2
Update history to reflect merge of #2383 [ci skip]
2014-05-10 16:15:18 -04:00
9a635f0ce3
Merge pull request #2383 from kleinfreund/patch-1
2014-05-10 16:14:37 -04:00
7756adc75c
Fixing spacing issue for `code` inside `pre`
...
Regular (one-line) code inside a `code` tag has some padding around it. This leads to some weird spacing when dealing with code blocks (e.g. inside `pre`).
Removing the horizontal paddings for these. (Also replacing `border: none;` with `border: 0;` because it's shorter)
2014-05-10 22:05:21 +02:00
5e9b22fbb2
Update history to reflect merge of #2345 [ci skip]
2014-05-10 15:44:35 -04:00
01c09fd7fa
Merge pull request #2345 from penibelst/sort-collection
2014-05-10 15:42:53 -04:00
53b2e1372c
Update history to reflect merge of #2374 [ci skip]
2014-05-09 15:40:11 -04:00
aee7d7327f
Merge pull request #2374 from albertogg/update-ruby
2014-05-09 15:39:46 -04:00
03291eb5f4
Update CI to use Ruby 2.1.2
2014-05-09 14:43:59 -04:30
56b64d688d
Update history to reflect merge of #2369 [ci skip]
2014-05-09 12:33:50 -05:00
50065a2781
Merge pull request #2369 from jekyll/json-data
2014-05-09 12:33:48 -05:00
1315112ab5
dot json;
2014-05-09 10:32:18 -04:00
d3f9da7645
document json support
2014-05-09 10:30:36 -04:00
5129a3ccc3
add tests for json data
2014-05-09 10:29:37 -04:00
bf3a20b2d7
allow json files in _data dir
2014-05-09 10:13:12 -04:00
fb523722b5
Fruity variables
2014-05-09 09:21:24 +02:00
ab3aaebe6d
Resolve second conflict
2014-05-09 08:59:46 +02:00
5dcd84b71b
Resolve conflict
2014-05-09 08:56:04 +02:00
6c48e9bbdf
Simplify config
2014-05-09 08:53:21 +02:00
7f1b916f32
Fix output
2014-05-09 08:53:21 +02:00
df3c163eeb
Use item_property
2014-05-09 08:53:16 +02:00
d96f39360b
Revert "Make it fail"
...
This reverts commit c89e7539b86a483a2f8b14dd766ad90da1eb9773.
2014-05-09 08:53:16 +02:00
fd1778203d
Make it fail
2014-05-09 08:53:16 +02:00
9ba89b9ab1
Try item_property
2014-05-09 08:53:15 +02:00
d8e68bc0e1
No output needed
2014-05-09 08:53:07 +02:00
9f6965c1b5
Add scenario for sorting by title
2014-05-09 08:51:57 +02:00
ae7e485474
Add hash_property
2014-05-09 08:44:40 +02:00
4f20d7ab24
Release 2.0.3
2014-05-08 23:15:37 -04:00
68a39a1d92
Revert "Update history to reflect merge of #2365 [ci skip]"
...
This reverts commit 7d31d44047
2014-05-08 23:15:25 -04:00
7d31d44047
Update history to reflect merge of #2365 [ci skip]
2014-05-08 23:14:58 -04:00
f95aba2f73
Merge pull request #2365 from jekyll/release-2-0-3
2014-05-08 23:14:50 -04:00
f93de58f3b
Link to the changelog.
2014-05-08 23:13:46 -04:00
4e8ddd5fa3
Update history.
2014-05-08 23:12:44 -04:00
5a0eb41d19
Add release post for v2.0.3
2014-05-08 23:12:30 -04:00
036823cd06
Bump to 💎 v2.0.3
2014-05-08 22:43:04 -04:00
2326c509c3
Update history to reflect merge of #2364 [ci skip]
2014-05-08 22:36:55 -04:00
8ba2f770e9
Merge pull request #2364 from jekyll/save-from-errors
2014-05-08 22:36:24 -04:00
2d040c1aaa
Use Jekyll.logger for --watch error message.
2014-05-08 22:27:55 -04:00
81ff5ed7aa
Save --watch from errors.
...
Fixes #2355 .
2014-05-08 22:22:11 -04:00
70a06c9b59
Update site/docs/history.md for #2363 .
2014-05-08 22:17:33 -04:00
Parker Moore
Anatol Broder
Peter Rhoades
Philipp Rudloff
Alberto Grespan
Matt Rogers
Ben Balter