Commit Graph

3029 Commits

Author SHA1 Message Date
Matt Rogers 3b485b4497 Lock Maruku to 0.7.0
This fixes the errors we see in our tests due to the upgrade to Maruku
0.7.1
2014-01-15 23:11:27 -06:00
Matt Rogers 0be62fa2e0 Update history to reflect merge of #1947 2014-01-15 22:13:37 -06:00
Matt Rogers 5dc4c67344 Merge pull request #1947 from jekyll/1-4-3-release-info 2014-01-15 20:13:31 -08:00
Parker Moore ea94e5dd1c Update history to reflect merge of #1949 [ci skip] 2014-01-14 08:56:28 -08:00
Parker Moore b3064a9b7d Forgot #1943 in the line, whoopsie 2014-01-14 08:44:20 -08:00
Parker Moore dc599121a0 Update history to reflect merge of #1943 [ci skip] 2014-01-14 08:43:53 -08:00
Parker Moore 45c0523e55 update dat gemspec 2014-01-14 08:43:29 -08:00
Parker Moore 245597c2db Require Liquid 2.5.5 <= x < 2.6 2014-01-13 22:28:16 -08:00
Parker Moore e87cd8d53c Update History.markdown with 1.4.3 release. 2014-01-13 22:27:41 -08:00
Parker Moore edc9ffcb65 Add 1.4.3 release post by @BenBalter for master branch. 2014-01-13 22:26:38 -08:00
Matt Rogers 750a56d1fe Update history to reflect merge of #1940 2014-01-13 13:13:31 -06:00
Matt Rogers 15ea6eecf9 Merge pull request #1940 from robatron/patch-1 2014-01-13 11:13:28 -08:00
Rob McGuire-Dale 5aeb2733a1 Add link to contributors in README.
Linkify "awesome contributors" in the README, as in the footer of the [Jekyll home page](http://jekyllrb.com/).
2014-01-13 10:19:05 -08:00
Matt Rogers 2c2beb9c1f Update history to reflect merge of #1938 2014-01-13 09:16:29 -06:00
Matt Rogers f9263b6fdf Merge pull request #1938 from jekyll/excludes-relative-to-site-source-docs 2014-01-13 07:15:53 -08:00
Parker Moore 2966606b1a Add docs about the 'new' restriction on excludes. 2014-01-13 00:17:12 -08:00
Parker Moore 0d6db1613f Update history to reflect merge of #1936 [ci skip] 2014-01-12 21:30:18 -08:00
Parker Moore f23952c8ab Merge pull request #1936 from jekyll/branding 2014-01-12 21:29:51 -08:00
Parker Moore 21cef96b5d Branding, baby.
Many thanks to http://patorjk.com/software/taag/ for doing the
ASCII art. 😃
2014-01-12 14:44:40 -08:00
Parker Moore f8c904908a Update history to reflect merge of #1933.
[ci skip]
2014-01-12 13:53:56 -08:00
Rob Muhlestein b053a1edf1 Add note in Posts docs about stripping <p> tags from excerpt.
Fixes #1926. Merges #1933.
2014-01-12 13:52:32 -08:00
Parker Moore 8bc51fdb5c Update history to reflect merge of #1928 [ci skip] 2014-01-11 15:32:12 -08:00
Parker Moore dd2fa1e82d Merge pull request #1928 from jekyll/things-to-content 2014-01-11 15:31:30 -08:00
Matt Rogers 6f394e82b5 Rename read_things to read_content. 2014-01-11 15:29:22 -06:00
Matt Rogers f3e9eb92a9 Update the documentation for the new exclude behavior 2014-01-11 15:05:45 -06:00
Matt Rogers cc2ac99487 Update history to reflect merge of #1916 2014-01-11 12:37:33 -06:00
Matt Rogers d96165e3c4 Merge pull request #1916 from jekyll/gitignore-excludes 2014-01-11 10:37:31 -08:00
Matt Rogers 60524a1b6c Update history to reflect merge of #1923 2014-01-11 12:35:51 -06:00
Matt Rogers 9b0c09ebfb Merge pull request #1923 from mscharley/master 2014-01-11 10:35:50 -08:00
Matt Rogers 649e5a156a Update history to reflect merge of #1927 2014-01-11 12:20:19 -06:00
Matt Rogers d31efc7984 Merge pull request #1927 from jekyll/delegate-silly 2014-01-11 10:20:17 -08:00
Parker Moore 5a52986db0 Use 'Forwardable' module to pass along some attribute calls to @post 2014-01-10 22:54:06 -08:00
Parker Moore 331c7adc08 Move #glob_include? from core_ext to entry_filter 2014-01-08 20:24:21 -08:00
Matthew Scharley 20a6bdf5ec Add jekyll-compass to the list of plugins 2014-01-08 13:38:33 +11:00
Parker Moore 459a4c1e55 Update history to reflect merge of #1883 [ci skip] 2014-01-06 20:55:43 -08:00
Parker Moore 4ef9f9e6d2 Merge pull request #1883 from pathawks/master 2014-01-06 20:51:20 -08:00
Parker Moore 3d67cdc150 Cast to string before duplicating. 2014-01-05 11:02:03 -08:00
Parker Moore 366f9268ee Add tests for new exclude behaviour. 2014-01-05 11:01:51 -08:00
Parker Moore 35868807c1 Ensure leading slashes in path matching. 2014-01-05 10:54:52 -08:00
Parker Moore 42fc5e9ee7 Excludes should be relative to the site source 2014-01-05 10:45:42 -08:00
Parker Moore 437693e744 Update history to reflect merge of #1912 [ci skip] 2014-01-04 14:09:49 -08:00
Parker Moore 17d19146de Merge pull request #1912 from jekyll/cibuild 2014-01-04 14:09:28 -08:00
Parker Moore 52a36fefdc Add script/cibuild. 2014-01-04 14:04:17 -08:00
Matt Rogers b05a44cb2a Update history to reflect merge of #1910 2014-01-04 10:12:24 -06:00
Matt Rogers 883e16acde Merge pull request #1910 from pborreli/typos 2014-01-04 08:12:20 -08:00
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
Pascal Borreli bdda3a8ef6 Fixed typos 2014-01-04 14:17:38 +00:00