Commit Graph

2980 Commits

Author SHA1 Message Date
Matt Rogers
6184c4e44b Update history to reflect merge of #1899 2014-01-04 10:04:24 -06:00
Matt Rogers
a33e86630d Merge pull request #1899 from soimort/preview-404 2014-01-04 08:04:20 -08:00
Matt Rogers
bbcd94e7fa Update history to reflect merge of #1875 2014-01-04 10:01:58 -06:00
Matt Rogers
7d8c01dbf4 Merge pull request #1875 from jekyll/benbalter-where-filter 2014-01-04 08:01:53 -08:00
Parker Moore
a5f1bc0341 Fixed the tests... I guess Hash literals aren't ok. 2014-01-03 21:23:02 -08:00
Parker Moore
b4383a5c42 Flesh out tests for where filter for @mattr- 😃 2014-01-03 21:23:02 -08:00
Parker Moore
6ca731c13b Use idiomatic #is_a? method instead of #class == 2014-01-03 21:23:02 -08:00
Ben Balter
39e4d6b3ba add where filter to filter arrays of objects 2014-01-03 21:23:02 -08:00
Parker Moore
60a231f16d Line -q up with the other flags. [ci skip] 2014-01-03 21:14:55 -08:00
Parker Moore
32b952803e Update history to reflect merge of #1898 2014-01-03 21:14:12 -08:00
Parker Moore
35948fa55c Merge pull request #1898 from ahazem/add-quiet-flag 2014-01-03 21:13:44 -08:00
Parker Moore
eb67894e0f Update history to reflect merge of #1900 2014-01-03 11:12:48 -08:00
Parker Moore
2c81d25c72 Merge pull request #1900 from jekyll/ruby-2-1 2014-01-03 11:12:27 -08:00
Matt Rogers
c574ac6670 Merge pull request #1906 from afeld/upgrade-shoulda
Loosen dependency on Shoulda
2014-01-03 06:38:51 -08:00
Aidan Feldman
716b8ede0e Loosen dependency on Shoulda
Fixes build for Ruby 2.1.0.
2014-01-03 05:44:47 -05:00
Mort Yao
99b36c7c30 Routing 404 errors to custom 404 page for development server 2014-01-03 03:23:46 +01:00
Parker Moore
c8dacbadc0 Test under Ruby 2.1.0 2014-01-02 14:39:00 -08:00
Parker Moore
b273ac38a6 Update history to reflect merge of #1902 2014-01-02 13:26:08 -08:00
Parker Moore
986f9aa640 Merge pull request #1902 from troyswanson/utf-8-note 2014-01-02 13:25:46 -08:00
Troy Swanson
c7e5c3f8d8 Add a note about character sets 2014-01-02 14:53:03 -06:00
Parker Moore
c7b649f792 Update test_generated_site.rb to know about new post 2014-01-01 19:53:42 -08:00
Ahmed Hazem
fdcf1f4526 Add --quiet flag 2014-01-01 18:50:27 +02:00
Parker Moore
36495487a3 Update history to reflect merge of #1889 2013-12-31 18:52:24 -08:00
Parker Moore
c00c8c208c Merge pull request #1889 from penibelst/site-link-license 2013-12-31 18:51:56 -08:00
Parker Moore
29720674dc Update history to reflect merge of #1896 2013-12-31 18:50:07 -08:00
Parker Moore
c437d8ec38 Merge pull request #1896 from georgeanderson/master 2013-12-31 18:49:25 -08:00
Parker Moore
b0ca19c67b Update history to reflect merge of #1897 2013-12-31 18:48:46 -08:00
Parker Moore
60dec88882 Merge pull request #1897 from nschonni/patch-1 2013-12-31 18:48:22 -08:00
Nick Schonning
10235aeb66 Fix Tom Preston-Werner blog source link 2013-12-31 14:03:46 -05:00
George Anderson
cb80a849e4 Added paginate default to nil
I found this missing property in the default configuration description.
2013-12-31 14:41:06 -02:00
Anatol Broder
d11b6d7ffd Change literal to HTML entity 2013-12-31 13:40:25 +01:00
Matt Rogers
012387396a Merge pull request #1859 from robin850/rouge 2013-12-30 22:45:07 -06:00
Matt Rogers
47e4e81053 Update history to reflect merge of #1849 2013-12-30 22:32:21 -06:00
Matt Rogers
a2fd8ba7c3 Merge pull request #1849 from afeld/sort-attributes 2013-12-30 20:31:45 -08:00
Parker Moore
7c276c6f64 Update history to reflect merge of #1894 2013-12-30 16:35:48 -08:00
Parker Moore
a8a7f032ef Merge pull request #1894 from CHH/patch-1 2013-12-30 16:34:53 -08:00
Christoph Hochstrasser
dd919751ac Update kramdown to 1.3 2013-12-30 22:14:41 +01:00
Parker Moore
ac9bca80c8 Update history to reflect merge of #1893 2013-12-30 11:07:50 -08:00
Parker Moore
a50a858c86 Merge pull request #1893 from rrgayhart/testing-additions 2013-12-30 11:03:17 -08:00
Meeka
1da8f04aaa Removes assert_includes to pass Travis 2013-12-30 12:57:23 -05:00
Meeka
9652b7ef80 adds to_s method testing on Excerpt 2013-12-30 12:23:41 -05:00
Meeka
3a0733deb9 Adds tests for the Excerpt include?, id, and inspect methods 2013-12-30 12:15:13 -05:00
Anatol Broder
f59895425e Don’t break things 2013-12-29 23:58:01 +01:00
Anatol Broder
3489b43cb8 Thank you, Tom 2013-12-29 23:57:12 +01:00
Anatol Broder
95fdc2c2c5 Remove the team 2013-12-29 23:52:24 +01:00
Anatol Broder
5cb38dc4d7 Fix typo. Change license link 2013-12-29 10:26:49 +01:00
Anatol Broder
60541437e3 Revert "Add license page"
This reverts commit 8e9437199c.
2013-12-29 10:24:13 +01:00
Anatol Broder
95e4707fd1 Add Jekyll Team to the license text 2013-12-29 01:17:25 +01:00
Anatol Broder
8e9437199c Add license page 2013-12-29 01:10:31 +01:00
Anatol Broder
ee8d509d39 Change footer 2013-12-29 00:49:48 +01:00