Commit Graph

7752 Commits

Author SHA1 Message Date
Parker Moore
52f5dc154c Merge branch 'master' into build-the-site
* master:
  Update history to reflect merge of #5156 [ci skip]
  Update history to reflect merge of #5177 [ci skip]
  Update history to reflect merge of #5173 [ci skip]
  Minor updates and corrections
  Future True on GitHub Pages note
  resolve theme root before sanitizing
  dont double sanitize theme folder paths
2016-08-01 17:28:19 -07:00
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
jekyllbot
8540487997 Update history to reflect merge of #5156 [ci skip] 2016-08-01 17:27:02 -07:00
jekyllbot
95e9774100 Merge pull request #5156 from jekyll/theme-source-fix
Merge pull request 5156
2016-08-01 17:27:02 -07:00
jekyllbot
e735e45156 Update history to reflect merge of #5177 [ci skip] 2016-08-01 17:25:44 -07:00
jekyllbot
ae72c64441 Merge pull request #5177 from gep13/patch-1
Merge pull request 5177
2016-08-01 17:25:43 -07:00
Parker Moore
4d0d528fd5 script/default-site: give debug output 2016-08-01 14:49:52 -07:00
jekyllbot
26b827a536 Update history to reflect merge of #5173 [ci skip] 2016-08-01 13:14:07 -07:00
jekyllbot
1374a6c84c Merge pull request #5173 from danayel/patch-1
Merge pull request 5173
2016-08-01 13:14:06 -07:00
Gary Ewan Park
c5bd075bc7 Minor updates and corrections
- Corrected highlighting on multi-line sections
- Replace `cinst` with `choco install` for consistency
2016-08-01 19:20:59 +01:00
Ben Balter
4dab0c7da6 Only build default site once 2016-08-01 13:10:23 -04:00
Daniel Chapman
65d1dc48f3 Future True on GitHub Pages note 2016-08-01 11:05:12 +09: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
Ben Balter
8b69c6f0b5 resolve theme root before sanitizing 2016-07-28 15:12:31 -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
2351ef6bbe dont double sanitize theme folder paths 2016-07-28 14:46:05 -04: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 v3.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