github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-30 01:08:26 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,524 Commits 60 Branches 160 Tags
007c0593153bd2cf931efefa35470d78d4cfd10b
Commit Graph

5524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Parker Moore
51dc0dfcf5 Merge pull request #3546 from capnfabs/patch-1 
Improve consistency in site/_docs/plugins.md
 2015-03-04 15:15:30 -08:00
Parker Moore
c8d23ffee2 Update history to reflect merge of #3544 [ci skip] 2015-03-04 15:14:18 -08:00
Parker Moore
ced9146c11 Merge pull request #3544 from delftswa2014/micro_refactor_url 
Refactored url.rb to be compliant with Ruby Style Guide.
 2015-03-04 15:13:35 -08:00
Martin Jorn Rogalla
ca7375a51b Corrected quote-usage. Replaced [-1].eql with end_with. 
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 22:31:19 +01:00
Fabian Tamp
c1562c8997 Improve consistency in site/_docs/plugins.md 
Three plugin strategies are listed, but then only two were referenced in the following note. I've updated this doc so that all three are referenced.
 2015-03-04 21:20:08 +00:00
Will Norris
0d1586a5c4 Improved permalinks for pages and collections 
This updates the default permalink style for pages and collections to
match the site-wide 'permalink' setting.  If the permalink setting
contains a trailing slash, either explicitly or by being set to
':pretty', then pages and collections permalinks will contain trailing
slashes by default as well.  Similarly, if the permalink setting
contains a trailing ':output_ext', so will pages and collections.  If
the permalink setting contains neither a trailing slash or extension,
neither will pages or collections.

This impacts only the default permalink structure for pages and
collections.  Permalinks set in the frontmatter of an individual page
take precedence, as does the permalink setting for a specific
collection.

Fixes #2691
 2015-03-04 09:38:23 -08:00
Martin Jorn Rogalla
2ef9bae75a Refactored url.rb to compliant with Ruby Style Guide. 
- Single Quotes
 - Fixed Typo's in variable names.
 - Removed Redundant Escaping in Regular Expressions.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 14:16:55 +01:00
Jordon Bedwell
fa31fcb3bf Update history.md to reflect the merger of #3418 [ci skip] 2015-03-04 05:22:29 -06:00
Jordon Bedwell
d40b6d6ee0 Merge pull request #3418 from tarebyte/destination-and-source 
Added build --destination and --source flags
 2015-03-04 05:21:36 -06:00
Will Norris
5e9b7343bf Update history to reflect merge of #3490 [ci skip] 2015-03-03 10:54:13 -08:00
Will Norris
5d1a24e291 Merge pull request #3490 from willnorris/ext 
always include file extension on destination files
 2015-03-03 10:53:08 -08:00
Philipp Rudloff
d56df7592c Removing unused code from post layout 
The post from the site template does not have `meta` in its front matter. 

Related to #3536.
 2015-03-03 09:52:23 +01:00
Will Norris
669c803912 always include file extension on destination files 
This ensures that destination files for HTML posts, pages and
collections always include the proper file extension (as defined by
output_ext) regardless of permalink structure.  This allows for URLs
that contain no extension or trailing slash to still result in proper
destination files with .html extensions.

Because this change relies so heavily on output_ext accurately
identifying the extension of the destination file, this change also
removes the feature test that tested support for permalinks with a .htm
extension.  In order to support alternate file extensions, a future
patch or plugin will need to modify the output_ext value, at which point
everything else should work as expected.
 2015-03-02 21:20:54 -08:00
Alfred Xing
8917ef011c Update history to reflect merge of #3535 [ci skip] 2015-03-02 15:05:37 -08:00
Alfred Xing
27a02e163b Merge pull request #3535 from delftswa2014/deprecation-inconsistency 
Removed deprecation inconsistency
 2015-03-02 15:04:21 -08:00
Joop Aué
7a31029c79 Removed deprecation inconsistency 
Replaced occasions where the logger was used to report deprecations.
Deprecator is now used instead.

Signed-off-by: Joop Aué <joopaue@gmail.com>
 2015-03-02 21:54:05 +01:00
Parker Moore
48bf711ec7 Update history to reflect merge of #3531 [ci skip] 2015-03-02 09:40:05 -08:00
Parker Moore
b3371119fd Merge pull request #3531 from jekyll/liquid-c-upgrade 
Upgrade liquid-c to 3.x
 2015-03-02 09:39:32 -08:00
Will Norris
dae5d30096 Update history to reflect merge of #3532 [ci skip] 2015-03-01 18:18:17 -08:00
Will Norris
bc2b87ca92 Merge pull request #3532 from willnorris/ordinal_docs 
document 'ordinal' built-in permalink style
 2015-03-01 18:15:46 -08:00
Will Norris
f251848283 document 'ordinal' built-in permalink style 
ordinal was actually added back in April 2013 in ea753130
 2015-03-01 17:27:56 -08:00
Parker Moore
2b1b7b977b Upgrade liquid-c to 3.x 2015-03-01 16:07:33 -08:00
Parker Moore
c2b613d05e Update history to reflect merge of #3469 [ci skip] 2015-03-01 16:05:53 -08:00