Commit Graph

7741 Commits

Author SHA1 Message Date
Parker Moore dc8c6e0e43
Merge branch 'master' into build-the-site
* master:
  Update history to reflect merge of #5152 [ci skip]
  Missing trailing |
  Update history to reflect merge of #5158 [ci skip]
  Also include LICENSE and README
  note that themes have been released
  Update history to reflect merge of #5143 [ci skip]
  Update history to reflect merge of #5150 [ci skip]
  Revert "Readability: lib/jekyll/static_file.rb."
  include theme directories in default gemspec
  [site] enable excerpts
  Centre align text and use nav styles on helpful links.
  Puns FTW
  Add helpful links and minor alignment tweak.
  Create error template that has no main nav or footer.
  Use more generic wording.
  sitemap: false so that the error page is not indexed
  Initial 404 page
2016-08-01 17:28:05 -07:00
Parker Moore 4d0d528fd5 script/default-site: give debug output 2016-08-01 14:49:52 -07:00
Ben Balter 4dab0c7da6 Only build default site once 2016-08-01 13:10:23 -04:00
jekyllbot 3b2bbcb70f Update history to reflect merge of #5152 [ci skip] 2016-07-28 14:02:11 -07:00
jekyllbot 8e25b8bffb Merge pull request #5152 from jekyll/theme-dir-regex-fix
Merge pull request 5152
2016-07-28 14:02:10 -07:00
Ben Balter 909800839c Missing trailing | 2016-07-28 16:31:20 -04:00
jekyllbot 27cfa00a43 Update history to reflect merge of #5158 [ci skip] 2016-07-28 13:22:20 -07:00
jekyllbot ff80d2f2b5 Merge pull request #5158 from jekyll/release-the-themes
Merge pull request 5158
2016-07-28 13:22:19 -07:00
Ben Balter 9220c5a634 Also include LICENSE and README 2016-07-28 15:43:45 -04:00
Ben Balter b22fa7ce4e note that themes have been released 2016-07-28 15:39:41 -04:00
jekyllbot 94af8ca75a Update history to reflect merge of #5143 [ci skip] 2016-07-28 11:58:26 -07:00
jekyllbot f29ebc4911 Merge pull request #5143 from adampetrie/jekyllrb-404
Merge pull request 5143
2016-07-28 11:58:26 -07:00
jekyllbot 16ff4c12bb Update history to reflect merge of #5150 [ci skip] 2016-07-28 11:57:21 -07:00
jekyllbot e01f1ece48 Merge pull request #5150 from jekyll/add-excerpts
Merge pull request 5150
2016-07-28 11:57:20 -07:00
Ben Balter bd96ca4ab6 bundle install before running bundle exec 2016-07-28 14:15:48 -04:00
Jordon Bedwell 54281530fb
Revert "Readability: lib/jekyll/static_file.rb."
This reverts commit 26f1ea2487.
2016-07-28 13:15:29 -05:00
Ben Balter 4278f856ef add default site test to travis 2016-07-28 10:50:45 -04:00
Ben Balter ca03a41564 add test to build the default site 2016-07-28 10:43:46 -04:00
Ben Balter 1bf47ec394 include theme directories in default gemspec 2016-07-28 10:21:30 -04:00
Ben Balter 6292476482 [site] enable excerpts 2016-07-28 09:52:30 -04:00
Jordon Bedwell 26f1ea2487
Readability: lib/jekyll/static_file.rb. 2016-07-27 23:59:50 -05:00
Parker Moore dd82c72e14
New latest version for Jekyll. 2016-07-27 18:40:28 -07:00
Parker Moore b9017f8b81
Release 💎 3.2.0 2016-07-27 17:18:20 -07:00
Parker Moore 09570623f2
Release 💎 3.2.0 2016-07-27 17:18:11 -07:00
Parker Moore 07518d9540
Release 💎 3.2.0 2016-07-27 17:17:14 -07:00
Parker Moore d9b8360d96 Merge pull request #5140 from jekyll/3.2.0-release-post
3.2.0 release post
2016-07-27 16:59:06 -07:00
Parker Moore f4c3c5afd6 Merge pull request #5141 from jekyll/remove-example-from-theme
ThemeBuilder: Remove example site from theme
2016-07-27 16:55:07 -07:00
Parker Moore 59c8f02129 3.2.0 release post: remove duplicate contributor 2016-07-27 16:54:22 -07:00
Adam Petrie 989fc9c3db Centre align text and use nav styles on helpful links. 2016-07-27 19:54:07 -04:00
Adam Petrie 1155371f4e Puns FTW 2016-07-27 19:53:36 -04:00
Adam Petrie 83456e7cd2 Add helpful links and minor alignment tweak. 2016-07-27 19:09:20 -04:00
Adam Petrie 142957ff49 Create error template that has no main nav or footer. 2016-07-27 19:08:37 -04:00
Adam Petrie 954c0bfe07 Use more generic wording. 2016-07-27 18:33:16 -04:00
Adam Petrie ea185f11af sitemap: false so that the error page is not indexed 2016-07-27 18:32:49 -04:00
Adam Petrie b65aa4748b Initial 404 page 2016-07-27 17:00:19 -04:00
Parker Moore 7e34be945a
Remove mention of rake preview for theme README. 2016-07-26 17:34:52 -07:00
Parker Moore a31766d329
ThemeBuilder: do not create example site & Rakefile
They're unnecessary -- the theme _is_ a Jekyll site. Just use jekyll build.
2016-07-26 17:32:18 -07:00
Parker Moore 058f9e8533 Remove DirtyF from 3.2.0 contributors list due to duplication 2016-07-26 17:24:35 -07:00
Parker Moore deab138f23
site template: update link to jglovier/jekyll-new to jekyll/minima 2016-07-26 15:37:26 -07:00
Parker Moore edec81ef96
Update History to reflect release of v3.2.0 2016-07-26 15:29:15 -07:00
Parker Moore 823a8630b6
Added post: v3.2.0 Released 2016-07-26 15:29:06 -07:00
Parker Moore 55317817d1
Backport #5138 to .github/CONTRIBUTING.markdown 2016-07-26 09:54:33 -07:00
jekyllbot dbf312eec0 Update history to reflect merge of #5138 [ci skip] 2016-07-26 09:53:01 -07:00
jekyllbot c83246bfe2 Merge pull request #5138 from chrisfinazzo/note-about-fmt
Merge pull request 5138
2016-07-26 09:53:00 -07:00
jekyllbot 2c224b0990 Update history to reflect merge of #5139 [ci skip] 2016-07-26 09:52:44 -07:00
jekyllbot a3ecce7cc1 Merge pull request #5139 from cdubz/patch-1
Merge pull request 5139
2016-07-26 09:52:43 -07:00
Chris Wells 087b763478 Removed confusing word repetition.
Deleted both instances of "yourself" in the first sentence under "Self-managed web server".
2016-07-26 09:09:57 -04:00
Parker Moore 4b476f70e6
script/fmt: prefix rubocop version with "Rubocop"
This makes it obvious what those mysterious numbers are.
2016-07-25 21:08:56 -07:00
Parker Moore 30e34a72c0
script/cibuild: if no TEST_SUITE is defined, run fmt, test, cucumber
/cc #5136
2016-07-25 21:08:05 -07:00
jekyllbot 9b0532a3c4 Update history to reflect merge of #5137 [ci skip] 2016-07-25 17:45:52 -07:00