Commit Graph

210 Commits

Author SHA1 Message Date
jekyllbot 062072bcd4 Update history to reflect merge of #149 [ci skip] 2017-01-13 10:18:08 -05:00
jekyllbot 9bd61a3ba1 Merge pull request #149 from jekyll/pr/exclude-spec
Merge pull request 149
2017-01-13 10:18:07 -05:00
Pat Hawks 311f25d06d
Don't worry if tests are too long 2017-01-12 23:34:49 -06:00
Ben Balter 72f0432c25 Update history to reflect v2.1.0 2016-11-02 16:48:55 -04:00
Ben Balter 97c5bf0e63 Bump to 2.1.0 2016-11-02 16:47:37 -04:00
jekyllbot 9272d98f64 Update history to reflect merge of #139 [ci skip] 2016-10-28 13:00:08 -07:00
jekyllbot 21e5bc2b4d Merge pull request #139 from DirtyF/patch-1
Merge pull request 139
2016-10-28 13:00:07 -07:00
Frank Taillandier a9bbb7935d
fix indentation 2016-10-28 19:32:33 +02:00
Frank Taillandier 781b0c7399 add example usage of social profiles
fix #138
2016-10-28 17:12:17 +02:00
Ben Balter 23b7e0bba2 Update history to reflect prior commits 2016-10-23 16:59:07 -04:00
jekyllbot 01bb0432a2 Update history to reflect merge of #133 [ci skip] 2016-10-23 13:49:49 -07:00
jekyllbot 5163c0cbc9 Merge pull request #133 from daviddarnes/patch-1
Merge pull request 133
2016-10-23 13:49:49 -07:00
Pat Hawks f90fb32d25
Update tests for new position of logo 2016-10-23 14:48:11 -05:00
David Darnes d999dc0a7e Wraps logo image json data in a publisher property
Fixes #89
2016-10-23 20:19:59 +01:00
jekyllbot ebb94f5b25 Update history to reflect merge of #132 [ci skip] 2016-10-23 09:18:23 -07:00
jekyllbot 970f750219 Merge pull request #132 from DirtyF/default-image
Merge pull request 132
2016-10-23 09:18:22 -07:00
Frank Taillandier 753173df76
Add front matter default example for image 2016-10-23 16:28:56 +02:00
Ben Balter 6d133fd352 Merge pull request #126 from jekyll/pull/dont-mangle-text
Don't mangle text with newlines
2016-10-20 11:39:53 -04:00
Pat Hawks d7a67b563f Don't mangle text with newlines
Fixes #117
2016-10-19 19:04:42 -05:00
Pat Hawks 39c2e06232 Merge pull request #125 from jekyll/pr/regex
Simplify minify regex
2016-10-17 12:59:24 -05:00
Pat Hawks 07eeffb6d9
Simplify minify regex 2016-10-15 14:24:13 -05:00
Pat Hawks 7b5ade75ae Merge pull request #123 from jekyll/pr/newfilters
Use new URL filters
2016-10-06 16:14:12 -05:00
Pat Hawks df09740757
Take advantage of Jekyll 3.3.0 URL filters 2016-10-06 15:56:15 -05:00
Pat Hawks b019a653af
Fix broken test 2016-10-06 15:47:49 -05:00
Ben Balter 2631e3ea77 run rubocop -a 2016-09-08 11:33:03 -04:00
Ben Balter e38becb779 Merge pull request #112 from SuriyaaKudoIsc/patch-1
Correct spelling in .travis.yml
2016-08-16 11:43:53 -04:00
Suriyaa Kudo 6844fd5ad0 Correct spelling in .travis.yml 2016-08-16 17:29:00 +02:00
Ben Balter 4dce0bcb3f Merge pull request #109 from jekyll/jekyll-rubocop
Inherit Jekyll's rubocop config for consistency
2016-08-15 09:37:21 -04:00
Ben Balter 3c2d2f1a7e Exclude vendor from Rubocop 2016-08-14 14:29:25 -04:00
Ben Balter 53e807a99a Inherit Jekyll's rubocop config for consistency 2016-08-11 11:35:31 -04:00
Ben Balter daf0a4b013 Merge pull request #106 from gmile/patch-1
Fix tiny typo
2016-08-03 10:47:58 -04:00
Eugene Pirogov 27aee681c3 Fix tiny typo 2016-08-03 11:01:50 +03:00
Ben Balter fe10f7900b Merge pull request #93 from toshimaru/master
Fix duplicated escape_once
2016-06-01 15:14:57 -04:00
toshi e6dffb9c5f Fix duplicated escape_once 2016-06-02 01:13:20 +09:00
Ben Balter d5e7d06599 Bump to 2.0.0 2016-05-31 11:28:46 -04:00
Pat Hawks af56759d92 Merge pull request #90 from jekyll/pr/smartify
Use SmartyPants for titles
2016-05-29 11:51:07 -05:00
Pat Hawks 3f82f1c42e Use SmartyPants 2016-05-28 14:06:50 -05:00
Ben Balter 43786da92a Merge pull request #87 from tfe/use-prev-next-for-pagination
Different philosophy for rel prev/next links based on recommendations from Google
2016-05-28 13:09:03 -05:00
Todd Eichel 73608f8ca1
Appease rubocop. 2016-05-27 15:09:59 -07:00
Todd Eichel c58f44d9a3
Oops, that wasn't as backwards compatible as I thought. 2016-05-27 15:04:56 -07:00
Todd Eichel 7fefcdef3f
Specs for pagination. 2016-05-27 15:00:15 -07:00
Todd Eichel edd65c3f14
Allow passing custom environments when making Liquid contexts for testing. Backwards-compatible with previous implementation. 2016-05-27 14:59:39 -07:00
Todd Eichel b55105813a
Move this individual spec up with other individual ones. 2016-05-27 12:17:52 -07:00
Todd Eichel 9a23b7f41b Merge branch 'master' into use-prev-next-for-pagination 2016-05-11 17:35:30 -07:00
Todd Eichel 220901c140
Different philosophy for rel prev/next links based on recommendations from Google.
Details here: https://webmasters.googleblog.com/2011/09/pagination-with-relnext-and-relprev.html.

This replaces the per-page prev/next links with general ones that will be output whenever there is a paginator with a previous or next page to show.
2016-05-11 17:26:23 -07:00
Ben Balter 87e755c1ac Merge pull request #86 from miguelfrde/facebook-admins-meta
Facebook admins meta tag and Facebook options spec
2016-05-11 18:58:44 -04:00
Miguel Flores Ruiz de Eguino 79e9f3f599 Improve README facebook options readability 2016-05-11 13:10:29 -05:00
Miguel Flores Ruiz de Eguino f772747728 Add facebook admins meta tag to template and facebook spec 2016-05-11 13:05:40 -05:00
Ben Balter ddb96a01ca Bump to 1.4.0 2016-04-25 13:08:47 -04:00
Pat Hawks 5403b7e20d Remove hard wrap (#79)
This was unintentionally introduced in #76
2016-04-25 10:00:10 -07:00