Commit Graph

9108 Commits

Author SHA1 Message Date
Don Denton 52742e0496 Fix bad config YAML in collections example
If you add the previous version to your config file, you'd get an error on build/serve.
2016-11-17 01:12:41 -06:00
jekyllbot 575c23e547 Update history to reflect merge of #5582 [ci skip] 2016-11-15 13:55:41 -08:00
jekyllbot a8a29b63ca Merge pull request #5582 from DirtyF/docs-windows
Merge pull request 5582
2016-11-15 13:55:41 -08:00
Frank Taillandier 5defc4782a
remove instructions for Jekyll 2 2016-11-15 20:35:48 +01:00
Parker Moore 7c44c5a56d
Release 💎 3.3.1 2016-11-14 14:36:05 -08:00
jekyllbot cd3831296a Update history to reflect merge of #5572 [ci skip] 2016-11-14 14:28:37 -08:00
jekyllbot 88a338d345 Merge pull request #5572 from jekyll/fix-underscore-in-permalink
Merge pull request 5572
2016-11-14 14:28:36 -08:00
Parker Moore d3e387d146
Fix typo. 2016-11-14 13:30:14 -08:00
Ashwin Maroli 365ecb7c37 a few more edits 2016-11-13 07:41:50 +05:30
Frank Taillandier 5d1f2bceea update directory structure documentation 2016-11-12 20:56:14 +01:00
Ashwin Maroli 15bdd81499 bring docs on 'structure' up-to-date 2016-11-12 23:37:45 +05:30
Parker Moore cb6724046d
Dates are _the worst_ 2016-11-11 16:30:53 -08:00
Parker Moore ff012e795a
Fix fmt error. 2016-11-11 16:30:53 -08:00
Parker Moore d50ef0e3dd
Add useful comment. 2016-11-11 16:30:53 -08:00
Parker Moore 347651e571
URL#generate_url_from_drop: be smarter about replacing *just* the keys 2016-11-11 16:30:53 -08:00
Parker Moore 9f8f031469
Whoops, an *actually useful* failing test. 2016-11-11 16:30:53 -08:00
Parker Moore f27eb77d0b
Add failing test for permalink templates with trailing underscores 2016-11-11 16:30:53 -08:00
jekyllbot 51d04cbd00 Update history to reflect merge of #5571 [ci skip] 2016-11-10 15:22:13 -08:00
jekyllbot 2713716d55 Merge pull request #5571 from DirtyF/docs-github-pages
Merge pull request 5571
2016-11-10 15:22:13 -08:00
jekyllbot 07d4333579 Update history to reflect merge of #5464 [ci skip] 2016-11-10 15:05:42 -08:00
jekyllbot f8ec71af3b Merge pull request #5464 from jekyll/allow-regular-windows-watchers
Merge pull request 5464
2016-11-10 15:05:41 -08:00
jekyllbot dbfe0cdf56 Update history to reflect merge of #5570 [ci skip] 2016-11-10 14:50:39 -08:00
jekyllbot 1e0697a258 Merge pull request #5570 from DirtyF/fix-pinboard-plugin-link
Merge pull request 5570
2016-11-10 14:50:39 -08:00
Frank Taillandier 3e504f0837 mention `docs` folder to deploy on GitHub Pages
fix #5543
2016-11-10 23:42:01 +01:00
jekyllbot 262ebbb9f0 Update history to reflect merge of #5559 [ci skip] 2016-11-10 14:32:55 -08:00
jekyllbot 810f0e93d0 Merge pull request #5559 from ryandesign/use-baseurl-before-link-tag
Merge pull request 5559
2016-11-10 14:32:54 -08:00
Frank Taillandier e515ddeb29 fix link to jekyll-pinboard plugin 2016-11-10 23:13:34 +01:00
Parker Moore d050f6de10
Update history to reflect merge of #5493 [ci skip] 2016-11-10 13:18:17 -08:00
Parker Moore b7cbfc0fb7
Merge branch 'mattg-master'
* mattg-master:
  Add two plugins to the plugins page
2016-11-10 13:16:27 -08:00
Parker Moore 09ec7c81f2
Update history to reflect merge of #5507 2016-11-10 13:15:57 -08:00
Parker Moore 09548c3d96
Merge branch 'spencerbyw-patch-3'
* spencerbyw-patch-3:
  Update 2-to-3.md
2016-11-10 13:15:31 -08:00
Parker Moore fcbbc4d0bc
Update history to reflect merge of #5514 2016-11-10 13:15:20 -08:00
Parker Moore 6744921f69
Merge branch 'georgemandis-patch-1'
* georgemandis-patch-1:
  Added jekyll-pinboard.
2016-11-10 13:14:14 -08:00
Parker Moore 6110002d1e
Fix history reference to #5532. 2016-11-10 13:13:11 -08:00
Parker Moore bafe37cc9d
Update history to reflect merge of #5520 2016-11-10 13:12:29 -08:00
Parker Moore cc3197856b
Merge branch 'clorichel-patch-1'
* clorichel-patch-1:
  no more invalid US-ASCII on lines 30 and 97
2016-11-10 13:11:29 -08:00
jekyllbot fc66991243 Update history to reflect merge of #5526 [ci skip] 2016-11-10 13:02:49 -08:00
jekyllbot 3e1fad273b Merge pull request #5526 from ashmaroli/fix-win-tests
Merge pull request 5526
2016-11-10 13:02:48 -08:00
jekyllbot 4268301071 Update history to reflect merge of #5546 [ci skip] 2016-11-10 13:02:10 -08:00
jekyllbot 1254ffc593 Merge pull request #5546 from ashmaroli/win-cucumber
Merge pull request 5546
2016-11-10 13:02:09 -08:00
jekyllbot 2d1a50c212 Update history to reflect merge of #5564 [ci skip] 2016-11-10 13:00:40 -08:00
jekyllbot c7b301709c Merge pull request #5564 from jekyll/vendor-bundle
Merge pull request 5564
2016-11-10 13:00:39 -08:00
Parker Moore df45f26187
Builder.watch: only warn for Bash on Windows, still try watching. 2016-11-10 12:55:00 -08:00
Jordon Bedwell d71dff74ae
Fix #5462: Only shutdown watch in Bash On Windows. 2016-11-10 12:55:00 -08:00
Frank Taillandier 830836e314 appease script/proof --disable-external
appease script/proof --disable-external
2016-11-10 00:30:39 +01:00
Frank Taillandier 820b704e3f appease script/proof --disable-external 2016-11-10 00:00:26 +01:00
Frank Taillandier 47e400549a [docs] info about the help command usage 2016-11-09 22:46:26 +01:00
Parker Moore 7bf4627046
Add vendor/gems to the list of excluded & do some refactoring. 2016-11-09 09:42:26 -08:00
Parker Moore b194211a32
Be much more specific about ignoring vendored directories. 2016-11-09 09:42:26 -08:00
Parker Moore 74a5297c19
Lock to codeclimate-test-reporter ~> 0.6.0. /cc #5565 2016-11-09 09:42:01 -08:00