Commit Graph

354 Commits

Author SHA1 Message Date
Fabio Niephaus 2812341c37 Merge branch 'master' of https://github.com/jekyll/jekyll into _includes
Conflicts:
	bin/jekyll
2015-08-09 16:22:33 +01:00
Fabio Niephaus ac56e9dd16 Make _includes directory configurable; closes #2684
and rename `plugins`, `layouts` and `data_source` directories for consistency
2015-08-09 16:20:58 +01:00
Veres Lajos aecfe4c160 typofix in site/_docs/plugins.md 2015-08-08 21:27:03 +01:00
Parker Moore 489b9c3639 update contributing documentation to reflect workflow updates 2015-08-05 14:30:35 -07:00
Johan Bové d3c327e184 Further flesh out Continuous Integration guide
More information added after having some trouble getting Travis to execute with the existing explanation.
2015-08-05 10:16:22 -07:00
Parker Moore 627af07c3e Merge pull request #3820 from chrisfinazzo/configuration-docs
Merge pull request 3820
2015-08-04 16:15:59 -07:00
Parker Moore 86696f6322 Merge pull request #3865 from mushishi78/static-publisher-documentation
Merge pull request 3865
2015-08-04 16:13:28 -07:00
Parker Moore 1b88345933 Merge pull request #3880 from probins/patch-1
Merge pull request 3880
2015-08-04 16:12:39 -07:00
Peter Robins 5cfef073a5 Add site.html_files to variables docs and improve site.html_pages 2015-08-04 07:59:03 +00:00
Shannon 432ff579d9 Add Jekyll Portfolio Generator to list of plugins 2015-08-01 13:47:45 -05:00
Vitaly Repin 498ad6e83a Detailed instructions for rsync deployment method
Extended documentation on rsync-approach. It also mentions rrsync wrapper script which restricts access for rsync to the server. Based on my blog post here: http://vrepin.org/vr/JekyllDeploy/

Restored previous version of 'Rsync' section and renamed it to 'scp' to reflect the content

Misspelling corrected: authorized_keys, not auhorized_key
2015-07-31 16:44:53 +03:00
Max White 8c485155ce Added documentation for new Static Publisher tool 2015-07-24 23:38:36 +01:00
chrisfinazzo 5db3b5d709 Use square brackets instead 2015-06-25 17:30:50 -04:00
chrisfinazzo 4dd66e9448 Add missing flag to disable the watcher 2015-06-25 09:54:42 -04:00
Michael Giuffrida 197dd184f9 Update windows.md with Ruby version info
Jekyll dependency hitimes does not support Ruby 2.2 on Windows yet
2015-06-24 13:02:02 -07:00
chrisfinazzo a14f08b2bf Clarify CoffeeScript requirement 2015-06-18 17:55:57 -04:00
chrisfinazzo 872efb0bcc Add Python to requirements for Jekyll 2 2015-06-09 12:07:56 -04:00
Parker Moore 649399dcf8 Merge pull request #3763 from tasken/patch-1
Merge pull request 3763
2015-06-09 08:10:45 -07:00
tasken f00e217448 fix for pagination in a directory different that / 2015-06-06 03:20:56 -03:00
Rafael Picanço 37f373fd38 fixing typo on line 19
- `pagination_path` to `paginate_path`
2015-06-04 17:37:24 -03:00
Matthias Nuessler bbd32980a1 Add asciinema liquid tag plugin 2015-05-31 14:45:49 +02:00
Matt Rogers 6f2e3b8238 Merge pull request #3728 from jordanthornquest/new-website-once-again 2015-05-28 17:59:23 -05:00
Jordan Thornquest f04c9bb469 Moved blog with an article about Jekyll to a new location and updated the resources page to reflect the change. 2015-05-28 15:24:55 -06:00
Parker Moore 60bdc7119a Remove Ozon from jekyllrb.com list of sites for learning
Reverts #3712.
2015-05-28 09:13:34 -07:00
Max f6bc58dd30 Docs now reflect correct redcarpet version 2015-05-28 16:56:57 +02:00
Philippe Loctaux b75fb37b4e Added new website in sites made by jekyll 2015-05-18 20:47:38 +02:00
Parker Moore ce9fcfaebb Merge pull request #3553 from stevecrozz/jekyll-hooks
Merge pull request 3553
2015-05-09 23:58:46 -07:00
Dimitri König 46895b46a6 Added remote_file_content tag plugin 2015-05-09 17:14:20 +02:00
Stephen Crosby 736e6a78f1 address code review feedback from #3553
- change site:reset to site:after_reset
- raise an exception when registering uncallable hook
- set default hook priority at the public API level
2015-05-02 15:56:19 -07:00
Stephen Crosby 245d9677d7 Refine hook implementation
- hooks are registered to symbol owners rather than classes directly
- during registration, add the ability to specify owner as an array to
  register the same hook to multiple owners
- add optional priority during registration as a symbol (:low, :normal,
  :high)
- implement hooks for collections as they are in octopress-hooks, aside
  from post_init
2015-05-01 19:00:37 -07:00
Stephen Crosby 6ca9633354 prototype of jekyll hooks, encapsulated 2015-05-01 14:35:15 -07:00
chrisfinazzo 95a30fa51d Update instructions for Ruby 2.0.0 2015-05-01 11:06:49 -04:00
chrisfinazzo f5351f7268 Use the proper names 2015-05-01 10:34:09 -04:00
nightsense cf778e2be6 Fixes typo on doc page "Directory structure". 2015-04-29 19:55:47 -04:00
Alfred Xing 9ab3c201c8 Remove relative permalinks 2015-04-28 14:03:20 -07:00
Matt Sheehan 786f6e1985 Add "Typescript Generator by Matt Sheehan" to the list of third-party plugins. 2015-04-28 12:53:17 -07:00
Jordon Bedwell 166fdf35a3 Merge pull request #3671 from falkorichter/completeCiInstructions
Added a mention on the Gemfile to complete the instructions
2015-04-26 08:17:35 -05:00
Falko Richter 159dbd0170 feedback on jekyll#3671 2015-04-24 10:28:40 +02:00
chrisfinazzo 987309917a Remove extra space 2015-04-21 17:32:49 -04:00
Falko Richter 76c1dcc791 added a mention on the Gemfile to complete the instructions
travis relies on a Gemfile tp be present.
2015-04-21 10:53:56 +02:00
Parker Moore 7be47c2c48 ci docs: Add note that the .travis.yml assumes bundle install.
Closes #3660
2015-04-20 10:23:04 -07:00
I´m a robot 791b2eccf6 updated documentation on the excerpt_separator 2015-04-20 09:58:38 -07:00
Parker Moore d15e4a9c8a Link things up to the new static files documentation. 2015-04-14 11:52:26 -07:00
Parker Moore ff3edbc16b static files mtime liquid should return a Time obj 2015-04-14 11:52:25 -07:00
Alfred Xing ae039663b9 Remove Maruku and references to it 2015-04-14 10:58:47 -07:00
Parker Moore d870dfedee Merge branch 'jaybe-jekyll-patch-1'
* jaybe-jekyll-patch-1:
  Reformat note in pagination docs to use proper HTML. Ref #3467
  Clarify pagination file index.html may reside in subdirectory
  Update pagination.md - Clarify only index.html
  Clarify pagination works from within HTML files
2015-04-13 12:16:47 -04:00
Parker Moore c916f08aa3 Reformat note in pagination docs to use proper HTML. Ref #3467 2015-04-13 12:15:55 -04:00
chrisfinazzo 9e86650df2 Remove extra word 2015-04-11 23:38:45 -04:00
chrisfinazzo 53ca3446eb Formatting 2015-04-11 18:53:19 -04:00
chrisfinazzo 25af3e785f Cleanup extra space and formatting 2015-04-10 18:14:09 -04:00
Parker Moore 66a9e6909b Merge branch 'davidsilvasmith-origin/patch-3'
* davidsilvasmith-origin/patch-3:
  docs: remove extraneous period from datafiles example.
  updated lsi docs
  changed the codefile name
  forgot a tick around a codefile name
  proofed changes
  removed personal link
  How to access a specific item in the data folder
2015-04-10 17:23:43 -04:00
Parker Moore 2f75ade1b7 docs: remove extraneous period from datafiles example. 2015-04-10 17:23:34 -04:00
Parker Moore 2c316188fe Merge branch 'chrisfinazzo-upgrading-docs'
* chrisfinazzo-upgrading-docs:
  Add further fixes to upgrade doc. #3607
  Use the new commands
  Fix a typo, wrap lines
  Remove reference to the watch command
  Start working on an upgrade guide for Jekyll 3
2015-04-10 16:57:00 -04:00
Parker Moore 20d48fcfe9 Add further fixes to upgrade doc. #3607 2015-04-10 16:56:55 -04:00
Parker Moore 12b16dde52 Merge pull request #3623 from chrisfinazzo/ci-docs
Merge pull request 3623
2015-04-10 16:32:28 -04:00
Andrew Dunning 305a22a5bf Explain how to access collection variables.
This example also demonstrates the use of nested variables.
2015-04-04 18:40:03 -04:00
chrisfinazzo ec7474f55c Only use 3 sections 2015-03-27 16:50:28 -04:00
chrisfinazzo e82cb3115d Line wrapping 2015-03-27 10:42:09 -04:00
chrisfinazzo ebc6dff37e Don't repeat yourself 2015-03-27 10:31:40 -04:00
chrisfinazzo 017a26457c Add a warning label 2015-03-27 10:28:51 -04:00
William Entriken 18209ff78c Fixes #3480 Show how to install and use html-proofer without Gemfile 2015-03-27 09:09:06 -04:00
chrisfinazzo d10c46d4fd Use the new commands 2015-03-26 17:52:35 -04:00
Parker Moore 5a702bfe13 Merge pull request #3586 from x43x61x69/patch-1
Merge pull request 3586
2015-03-23 19:37:11 -07:00
Parker Moore 3a85aa0dac Merge pull request #3581 from daviewales/patch-1
Merge pull request 3581
2015-03-23 19:35:15 -07:00
chrisfinazzo f635f3d34b Fix a typo, wrap lines 2015-03-22 15:22:27 -04:00
chrisfinazzo db0e1a683c Remove reference to the watch command 2015-03-22 15:04:42 -04:00
chrisfinazzo eea4a82dc6 Start working on an upgrade guide for Jekyll 3 2015-03-22 14:47:15 -04:00
Parker Moore 88d9cf4816 Merge pull request #3601 from chrisfinazzo/update-collections-docs
Merge pull request 3601
2015-03-21 17:03:47 -07:00
chrisfinazzo 75afac9bc0 Remove extra spaces, make the last sentence less awkward 2015-03-20 21:02:52 -04:00
Alfred Xing a7dff06175 Merge pull request #3597 from pathawks/jekyll-metadata
Add information .jekyll-metadata
2015-03-20 16:06:23 -07:00
chrisfinazzo a8b7a224c8 Add missing word, phrasing 2015-03-20 12:58:25 -04:00
chrisfinazzo 6e3bba154c Fix formatting 2015-03-20 11:25:09 -04:00
chrisfinazzo 4ef30b3a6f Fixed a typo 2015-03-20 11:14:54 -04:00
Jordon Bedwell 780755a8a5 Merge pull request #3599 from chrisfinazzo/update-site-subpath
Update the subpath
2015-03-20 10:12:49 -05:00
Jordon Bedwell 99a9e0a74d Merge pull request #3600 from pathawks/rspec-docs
RR replaced with RSpec Mocks
2015-03-20 10:07:49 -05:00
chrisfinazzo 55392fd8d2 Add Info labels to sections 2015-03-20 11:05:58 -04:00
Pat Hawks 7630f5408c
RR replaced with RSpec Mocks 2015-03-20 07:50:44 -07:00
Pat Hawks b647037643
Added "liquid-md5" plugin 2015-03-20 07:40:53 -07:00
chrisfinazzo 8d1f8ee7a0 Update the subpath 2015-03-20 10:31:22 -04:00
Pat Hawks d9958de9d1
Add information re: .jekyll-metadata 2015-03-19 18:00:32 -07:00
sonnym e82eaa4b0f Add documentation for collection static files
Any file without valid front matter in a collection is available via
`collection.files`.

Inspired by #3583.
2015-03-19 17:17:16 -07:00
David Wales b02342312b Change phrase 'variable parameter' 2015-03-18 11:52:22 +11:00
Cai⚡️ 06c4b42a5a Add new "Tag" - jekyll-files. 2015-03-18 08:35:40 +08:00
David Wales 16a2cfed49 Change format from all caps to strong. 2015-03-18 10:27:02 +11:00
Eugene Pirogov 4835e9317a Fix accidental line break 2015-03-18 00:07:59 +02:00
David Wales c83b016219 Document variable parameters for include.
The documentation has been updated to demonstrate variable parameters for an include.

    {% include footer.html param="value" variable-param=page.variable %}
2015-03-17 15:02:50 +11:00
David Wales 778429c6cc Document variable parameters for include.
The documentation has been updated to demonstrate variable parameters for an include.

    {% include footer.html param="value" variable-param=page.variable %}
2015-03-17 14:55:13 +11:00
Parker Moore 6a66a3af5a Merge branch 'stkent-patch-1'
* stkent-patch-1:
  Restructure excerpt_separator documentation for clarity
2015-03-16 14:46:07 -07:00
Will Norris 0ca5bd3224 update permalinks docs
This adds docs for two new permalink features coming in Jekyll 3:
 - improved default permalinks for pages and collections (#3538)
 - support for extensionless URLs (#3490)
2015-03-16 13:47:53 -07:00
Parker Moore 29853ab46d Merge pull request #3567 from chrisfinazzo/grammar
Wrap lines
2015-03-14 18:43:24 -07:00
Pat Hawks 00093b91fa Add Jekyll-Smartify plugin 2015-03-14 17:11:29 -07:00
chrisfinazzo 2d0d27da73 Merge 2015-03-13 12:11:49 -04:00
chrisfinazzo 7d93e3fdcd Add the link back in 2015-03-13 11:53:41 -04:00
chrisfinazzo d3bd81361c Remove link to Eduardo's site 2015-03-13 11:52:37 -04:00
Eduardo Bouças eb064b6684 Change Ajax pagination resource link to use HTTPS 2015-03-12 22:04:17 +00:00
chrisfinazzo 59add4737b Use the correct URL 2015-03-12 11:49:19 -04:00
chrisfinazzo b5a73373ff Wrap lines 2015-03-11 20:17:23 -04:00
Parker Moore dac2b17123 Fix link to @recurser's jekyll plugins. [ci skip] 2015-03-09 14:15:30 -07:00
Max Beizer 0d96ad21d2 Fix grammar on collections docs warning 2015-03-09 13:13:21 -05:00
Parker Moore 1100ca0782 Update link to sublime text plugin. 2015-03-07 17:27:17 -08:00