02e98f238e
Merge pull request #3520 from delftswa2014/sort-null
2015-03-05 14:35:40 -06:00
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
3a4d826852
Update history to reflect merge of #3547 [ci skip]
2015-03-05 11:20:13 -08:00
4a89db2102
Merge pull request #3547 from yous/resolve-warnings
...
Resolve warnings
2015-03-05 11:19:50 -08:00
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
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
117bd8a6f0
Update history to reflect merge of #3537 [ci skip]
2015-03-04 18:33:22 -08:00
e229e3285f
Merge pull request #3537 from kleinfreund/patch-2
...
Removing unused code from post layout
2015-03-04 18:32:57 -08:00
a608494e18
Update history to reflect merge of #3538 [ci skip]
2015-03-04 15:20:25 -08:00
f6f2626828
Merge pull request #3538 from willnorris/permalink
...
Improved permalinks for pages and collections
2015-03-04 15:18:43 -08:00
252665ddc6
Update history to reflect merge of #3546 [ci skip]
2015-03-04 15:16:07 -08:00
51dc0dfcf5
Merge pull request #3546 from capnfabs/patch-1
...
Improve consistency in site/_docs/plugins.md
2015-03-04 15:15:30 -08:00
c8d23ffee2
Update history to reflect merge of #3544 [ci skip]
2015-03-04 15:14:18 -08:00
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
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
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
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
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
fa31fcb3bf
Update history.md to reflect the merger of #3418 [ci skip]
2015-03-04 05:22:29 -06:00
d40b6d6ee0
Merge pull request #3418 from tarebyte/destination-and-source
...
Added build --destination and --source flags
2015-03-04 05:21:36 -06:00
5e9b7343bf
Update history to reflect merge of #3490 [ci skip]
2015-03-03 10:54:13 -08:00
5d1a24e291
Merge pull request #3490 from willnorris/ext
...
always include file extension on destination files
2015-03-03 10:53:08 -08:00
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
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
8917ef011c
Update history to reflect merge of #3535 [ci skip]
2015-03-02 15:05:37 -08:00
27a02e163b
Merge pull request #3535 from delftswa2014/deprecation-inconsistency
...
Removed deprecation inconsistency
2015-03-02 15:04:21 -08:00
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
48bf711ec7
Update history to reflect merge of #3531 [ci skip]
2015-03-02 09:40:05 -08:00
b3371119fd
Merge pull request #3531 from jekyll/liquid-c-upgrade
...
Upgrade liquid-c to 3.x
2015-03-02 09:39:32 -08:00
dae5d30096
Update history to reflect merge of #3532 [ci skip]
2015-03-01 18:18:17 -08:00
bc2b87ca92
Merge pull request #3532 from willnorris/ordinal_docs
...
document 'ordinal' built-in permalink style
2015-03-01 18:15:46 -08:00
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
2b1b7b977b
Upgrade liquid-c to 3.x
2015-03-01 16:07:33 -08:00
c2b613d05e
Update history to reflect merge of #3469 [ci skip]
2015-03-01 16:05:53 -08:00
5ee4e6d9c9
Merge pull request #3469 from jedd-ahyoung/Frontmatter-date-documentation
...
docs: Add frontmatter date formatting information
2015-03-01 16:05:23 -08:00
92a9582733
Corrected error message as suggested by @parkr.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 11:16:08 +01:00
78af3c5018
Improved clarity of sort nil input error message.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 09:51:59 +01:00
0565308ce6
Added test to check on nil input for sort filter.
...
- Added a test to check if the sort filter will raise the correct
exception on given nil input.
- Improved error message and used "nil" consistently.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 09:40:32 +01:00
9437bd4669
Update history to reflect merge of #3529 [ci skip]
2015-03-01 00:37:44 -08:00
9b962dc565
Merge branch 'fabianrbz-remove_adapters_deprecation_warning'
...
* fabianrbz-remove_adapters_deprecation_warning:
Add minitest/profile to profile 10 slowest tests
Move simplecov_custom_profile to test/ & gate with TRAVIS env
Remove unused groups from simplecov's profile
Removes the following deprecation warning: 'method adapters is deprecated. use profiles instead'
2015-03-01 00:36:48 -08:00
f1edf9e692
Add minitest/profile to profile 10 slowest tests
2015-03-01 00:36:40 -08:00
fbe52bca85
Move simplecov_custom_profile to test/ & gate with TRAVIS env
2015-03-01 00:36:20 -08:00
60f0977a50
Update history to reflect merge of #3528 [ci skip]
2015-02-28 21:44:31 -06:00
7d6d29b4ca
Merge pull request #3528 from willnorris/textile
2015-02-28 21:44:29 -06:00
6b09d1818d
Update history to reflect merge of #3516 [ci skip]
2015-02-28 18:56:13 -08:00
50a4b2824b
Merge pull request #3516 from jekyll/end-with
...
Use String#end_with?("/") instead of regexp
2015-02-28 18:55:53 -08:00
6c073ec476
Remove reference to jekyll-textile-converter.
2015-02-28 17:29:39 -08:00
8e87e9ebec
Update history to reflect merge of #3530 [ci skip]
2015-02-28 17:28:43 -08:00
e777c9b213
Merge pull request #3530 from delftswa2014/picturetag-link-fix
...
Replaced link caught by htmlproofer.
2015-02-28 17:27:53 -08:00
d79c0fc4dd
Replaced a picture element link with @parkr's suggestion.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-02-28 15:10:05 +01:00
Matt Rogers
Parker Moore
ChaYoung You
Will Norris
Martin Jorn Rogalla
Fabian Tamp
Jordon Bedwell
Philipp Rudloff
Alfred Xing
Joop Aué