github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-02-04 11:45:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,479 Commits 60 Branches 160 Tags
52d32a643ee9505ab01176adb100b0836bf89653
Commit Graph

7479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
0d288c54da Merge pull request #3576 from jekyll/fix-proofer 
script/proof: ignore eduardoboucas.com
 2015-03-15 18:05:29 -07:00
Parker Moore
41fb36a36f script/proof: ignore eduardoboucas.com 2015-03-15 18:05:13 -07:00
Jordon Bedwell
c6d62828ba Remove loader.rb and utilize "modernize" script/test. Fixes: #3573 2015-03-15 10:08:27 -05:00
Parker Moore
29853ab46d Merge pull request #3567 from chrisfinazzo/grammar 
Wrap lines
 2015-03-14 18:43:24 -07:00
Jordon Bedwell
f4a14b60ba Reflect the merge of #3572 in History.md 2015-03-14 19:23:18 -05:00
Jordon Bedwell
045f38d467 Merge pull request #3572 from pathawks/jekyll-smartify 
Add Jekyll-Smartify plugin
 2015-03-14 19:22:17 -05: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
Parker Moore
06785f2bfd Update history to reflect merge of #3570 [ci skip] 2015-03-12 16:17:45 -07:00
Jordon Bedwell
d36c3b0073 Merge pull request #3570 from eduardoboucas/master 
Change Ajax pagination resource link to use HTTPS
 2015-03-12 17:19:54 -05:00
Eduardo Bouças
eb064b6684 Change Ajax pagination resource link to use HTTPS 2015-03-12 22:04:17 +00:00
Eduardo Bouças
d3e23c2fae Merge pull request #2 from jekyll/master 
Get latest master
 2015-03-12 21:58:39 +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
Parker Moore
007c059315 Update history to reflect merge of #3560 [ci skip] 2015-03-09 11:38:56 -07:00
Parker Moore
7a7ecbadea Merge pull request #3560 from maxbeizer/maxbeizer/fix-collections-docs-grammar 
Fix grammar on collections docs warning
 2015-03-09 11:38:21 -07:00
Max Beizer
0d96ad21d2 Fix grammar on collections docs warning 2015-03-09 13:13:21 -05:00
Parker Moore
3a3b528014 Merge branch 'master' of github.com:jekyll/jekyll 
* 'master' of github.com:jekyll/jekyll:
  Update history to reflect merge of #3552 [ci skip]
  Use rspec-mock instead of rr
 2015-03-07 18:11:40 -08:00
Parker Moore
1100ca0782 Update link to sublime text plugin. 2015-03-07 17:27:17 -08:00
Parker Moore
0e10503259 Update history to reflect merge of #3552 [ci skip] 2015-03-06 18:29:10 -08:00
Parker Moore
9021e98721 Merge pull request #3552 from arthurnn/rm_rr 
Use rspec-mock instead of rr
 2015-03-06 18:28:47 -08:00
Arthur Neves
67ba8ad0cb Use rspec-mock instead of rr 2015-03-06 20:13:07 -05:00
Parker Moore
269bcbb7a8 Update history to reflect merge of #3551 [ci skip] 2015-03-06 16:23:36 -08:00
Parker Moore
50a41100e7 Merge pull request #3551 from corysimmons/cs/add-pagination-warning 
Add permalink warning to pagination docs
 2015-03-06 16:23:06 -08:00
Martin Jorn Rogalla
b178358cf9 Merge branch 'master' into site_extract_readers 
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-06 17:28:45 +01:00
Martin Jorn Rogalla
00cdcbc184 Separated some more readers from the main reader.rb file. 
- Draft Reader
 - Collection Reader
 - Page Reader
 - Post Reader
 - Static File Reader

Fixed references and ran tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-06 17:20:25 +01:00
Martin Jorn Rogalla
bebd80342e Extracted draft, post reader into external classes. 
Organized the draft, post and layout reader into the *readers* classes.
Fixed all references and ran tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-06 12:39:50 +01:00
Cory Simmons
013f7edc83 Add permalink warning to pagination docs 
Fixes https://github.com/jekyll/jekyll-paginate/issues/25
 2015-03-06 01:17:10 -05:00
Stuart Kent
c371926e09 Restructure excerpt_separator documentation for clarity 2015-03-05 23:56:25 -05:00
Parker Moore
66785b43ba Release 💎 3.0.0.beta2 v3.0.0.beta2 2015-03-05 13:40:18 -08:00
Parker Moore
6d9258bcdc Release 💎 v3.0.0.beta2 2015-03-05 13:40:10 -08:00
Parker Moore
6b4219f0e2 Merge branch 'master' of github.com:jekyll/jekyll 
* 'master' of github.com:jekyll/jekyll:
  Update history to reflect merge of #3520 [ci skip]
  Corrected error message as suggested by @parkr.
  Improved clarity of sort nil input error message.
  Added test to check on nil input for sort filter.
  Sort will now raise error on nil object array input.
 2015-03-05 13:14:29 -08:00
Parker Moore
bb4d47b905 Move History declaration for #3528 back up to HEAD. 2015-03-05 13:14:15 -08:00
Matt Rogers
b41ddbb8a9 Update history to reflect merge of #3520 [ci skip] 2015-03-05 14:35:42 -06:00
Matt Rogers
02e98f238e Merge pull request #3520 from delftswa2014/sort-null 2015-03-05 14:35:40 -06:00
Parker Moore
2185339ee0 Merge branch 'master' of github.com:jekyll/jekyll 
* 'master' of github.com:jekyll/jekyll:
  Replace `File.exists?` with `File.exist?`
  Remove duplicated range from regex
 2015-03-05 11:20:55 -08:00
Parker Moore
3a4d826852 Update history to reflect merge of #3547 [ci skip] 2015-03-05 11:20:13 -08:00
Parker Moore
4a89db2102 Merge pull request #3547 from yous/resolve-warnings 
Resolve warnings
 2015-03-05 11:19:50 -08:00
Martin Jorn Rogalla
4b8e3cfdbd Moved the in_(source/dest)_dir back to site.rb. 
After carefully looking at these two methods, as of right now they do not
belong in the reader, as they should also be used by the writer. Thus the
decision was made to move them back into the class containing the source
and dest fields, site.rb.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-05 13:34:46 +01:00
ChaYoung You
7806f9ed52 Replace File.exists? with File.exist? 
`File.exists?` is deprecated method. See
http://ruby-doc.org//core-2.2.0/File.html#exists-3F-method.
 2015-03-05 18:21:52 +09:00
ChaYoung You
489da6784a Remove duplicated range from regex 
`/\w/` is equivalent to `[a-zA-Z0-9_]`. See
http://ruby-doc.org/core-2.2.0/doc/regexp_rdoc.html#label-Character+Classes.
 2015-03-05 18:19:32 +09:00
Parker Moore
117bd8a6f0 Update history to reflect merge of #3537 [ci skip] 2015-03-04 18:33:22 -08:00
Parker Moore
e229e3285f Merge pull request #3537 from kleinfreund/patch-2 
Removing unused code from post layout
 2015-03-04 18:32:57 -08:00
Will Norris
a608494e18 Update history to reflect merge of #3538 [ci skip] 2015-03-04 15:20:25 -08:00
Will Norris
f6f2626828 Merge pull request #3538 from willnorris/permalink 
Improved permalinks for pages and collections
 2015-03-04 15:18:43 -08:00
Parker Moore
252665ddc6 Update history to reflect merge of #3546 [ci skip] 2015-03-04 15:16:07 -08:00