02e53fb6ff
Implement @parkr's suggestions
2014-10-27 22:59:15 -07:00
3fb1356593
The jsonify filter should deep-convert to Liquid when given an Array.
...
Fixes https://github.com/github/choosealicense.com/issues/225
2014-10-27 15:58:42 -07:00
cd9d38c5ea
Remove duplicate code
2014-10-26 21:38:19 -07:00
0fe1d0686a
Allow placeholders in permalinks
2014-10-26 18:23:58 -07:00
ae01b1d5df
😦
2014-10-22 02:16:50 -07:00
5cb0aee251
Have to go back on all these...
2014-10-22 02:10:21 -07:00
2eb318a929
Replace costly Hash#fetch with arity=2 with arity=1 + block.
2014-10-22 01:43:46 -07:00
0511ece2f5
Use String#<< instead of String#+=
...
I just couldn’t believe this but look:
~/jekyll/jekyll#master$ ruby benchmark/string-concat
Calculating -------------------------------------
+= 6367 i/100ms
<< 128697 i/100ms
-------------------------------------------------
+= 1704.3 (±0.6%) i/s - 12734 in 7.472170s
<< 4381212.4 (±6.3%) i/s - 21878490 in 5.014899s
WOW.
2014-10-22 00:58:20 -07:00
1395d5686b
Optimize more URL#sanitize_url
2014-10-22 00:57:53 -07:00
3227c4ecea
Use #tr instead of #gsub
2014-10-22 00:57:25 -07:00
b9c4fc93d7
Use flat_map instead of map.flatten
2014-10-22 00:57:06 -07:00
9cc3085dd0
Turn on FancyIndexing.
2014-10-20 21:23:30 -07:00
5b37ad57cc
If `--verbose` is given, debug the sh*t out of that.
2014-10-20 21:23:22 -07:00
3dedcbf894
Sort webrick_options
2014-10-20 21:23:00 -07:00
7fd9f102c0
Merge pull request #2997 from jekyll/utils-slugify
2014-10-20 20:11:04 -07:00
5ed4638400
Merge pull request #2986 from tamagokun/where_filters_enumerable
2014-10-20 20:09:21 -07:00
68c0e8f847
Hash#each_key instead of Hash#keys.each. Faster code.
2014-10-20 10:10:29 -02:00
078b2785e4
Revert "Make permalink parsing consistent with pages"
2014-10-18 12:07:44 -07:00
9f5835871b
Utils.slugify: Don't create new objects when gsubbing
2014-10-12 16:18:40 -07:00
00d29e7e77
Merge pull request #2994 from jekyll/fixes-from-benchmarking
2014-10-12 15:49:20 -07:00
b564214535
Pass the context on to IncludeRelativeTag#page_path
2014-10-12 15:16:38 -07:00
63a6d595c4
Fix feed link to respect baseurl
2014-10-12 23:14:41 +01:00
626706c8c5
Cache the `@includes_dir` in each instance so the method isn't called all the time
2014-10-12 15:11:28 -07:00
4942b2947b
Only compile the Converter#matches regexp when asked for
2014-10-12 14:31:49 -07:00
fbe98df488
Cache variables that won't change through the life of an object
2014-10-12 14:06:17 -07:00
44c9f81921
Cache the extname regexp in Converters::Markdown and Textile
2014-10-12 14:06:16 -07:00
3994d9116d
Link atom feed from html head
...
This makes it possible for browsers to autodiscover the feed. Fixes https://github.com/jekyll/jekyll/issues/2995
2014-10-12 20:09:14 +01:00
46e76bde3f
Add mode parameter to slugify Liquid filter
2014-10-12 02:44:58 +09:00
f6ea8b4d50
Allow Enumerables to be used with "where" filter.
2014-10-08 16:19:55 -04:00
b0c0fbd70b
site_template/feed.xml: Remove unneeded space.
2014-10-08 10:37:01 +03:00
28bb15d4ee
site_template/_includes/head.html: Minor refactoring.
...
Remove unneeded end tag, and also strip newlines.
Move `X-UA-Compatible` just after `meta charset`.
2014-10-08 10:33:39 +03:00
f0e22be32b
Merge pull request #2972 from tkrotoff/wrapper-width-hardcoded
2014-10-05 19:23:49 -07:00
1ccd2156c5
Fix head.html indentation
2014-10-05 18:53:53 +02:00
8e481cdf8e
New Sass variable $content-width instead of hardcoded value
2014-10-05 18:49:39 +02:00
42a8dba642
Page specific descriptions
2014-09-30 22:17:49 +01:00
0701fa7b16
Update outdated comment
...
incorrect as of 6 Aug 2014.
2014-09-26 19:49:58 -04:00
3a96d01e4a
Make permalink parsing consistent with pages
...
Require permalink to end in a slash to write an index file.
Addresses #2920 .
2014-09-24 22:08:25 -07:00
bd0eebdb05
Merge pull request #2925 from pathawks/htm-extension
2014-09-24 17:08:02 -07:00
dc0add15af
Merge pull request #2946 from kleinfreund/patch-1
2014-09-24 17:06:53 -07:00
e6f89074d4
Rouge's Redcarpet plugin now has a different API
...
See for more:
- 18ec938e9chttps://github.com/jneen/rouge/issues/182
2014-09-22 23:03:49 -07:00
e013c16ba9
Fix code example for media query mixin
...
It was using an old variable name (`$palm`) instead of the current one (`$on-paln`).
2014-09-22 08:18:14 +02:00
fdf58c5ce2
Allow per post permalinks to end in `.htm`
...
Fixes #2920
2014-09-14 11:58:16 -07:00
566eb6ef3b
remove watch since it default in 2.4.0
2014-09-14 11:28:29 +08:00
c3ec158f2d
Keep backwards compatibility
...
Re-add `relative_path` Liquid variable too keep compatibility
2014-09-11 18:25:21 -07:00
6c0e791236
Use relative path for `path` Liquid variable in Documents
2014-09-10 21:04:40 -07:00
e72f8cf5b1
Release 💎 2.4.0
2014-09-09 22:24:09 -07:00
196a56e3ec
Add push, pop, shift, and unshift Liquid filters.
...
Fixes #2892 .
2014-09-09 21:29:23 -07:00
4fb6e1cde9
Merge pull request #2884 from gjtorikian/improve-docs-for-include-relative
2014-09-09 00:21:42 -07:00
06c9b1b33c
Fixing "vertycal" typo
...
s/vertycal/vertical
Unless, like, "vertycal" was on purpose or something.
2014-09-08 22:48:23 -07:00
deb4e0d24a
Set tag name as ivar
...
This lets us use just one syntax_example method for both classes.
2014-09-08 14:27:51 -07:00
0675f2a423
Update include_relative tests
...
This verifies you can’t go “up” in the include
2014-09-07 21:23:45 -07:00
6644c77d23
Merge pull request #2870 from gjtorikian/support-relative-include
2014-09-07 13:05:38 -07:00
a569799ffc
Sanitize the resolved includes path
2014-09-07 12:18:54 -07:00
3668437c96
Rename method to `resolved_includes_dir`
2014-09-07 12:18:35 -07:00
4da07bb2c3
Add tests around nasty include attempts
2014-09-07 12:00:37 -07:00
0e4549013d
Define methods for shared vars between include & include_relative
2014-09-07 11:21:40 -07:00
394eab4a3a
Add the slugify Liquid filter
2014-09-07 16:48:57 +09:00
9f558d1cec
Rename tag to `include_relative`
2014-09-06 21:48:15 -07:00
787bb582da
Trash the subclass
2014-09-06 21:48:00 -07:00
58a76911bb
Merge pull request #2864 from kansaichris/add-title-to-collection-urls
2014-09-05 10:04:38 -07:00
aa97f1025d
Support a new `relative_include` tag
2014-09-03 15:43:51 -07:00
4adc35aaf3
Revise Utils#slugify with inspiration from Rails
2014-09-02 14:32:14 +09:00
702b39dec5
Replace the 'name' parameter with 'string'
2014-09-02 13:34:44 +09:00
3ca1245027
Move Document#sluggify to Utils#slugify
2014-09-02 13:29:28 +09:00
cfd17b2e7d
Add inspect filter
2014-09-01 14:51:09 -07:00
05d65f0341
Rename 'slug' to 'sluggify' and clean up code
2014-09-01 16:25:42 +09:00
a5e51cfdbe
Properly handle titles with trailing punctuation
2014-09-01 13:25:38 +09:00
cca9c50c26
Add 'title' to url_placeholders
2014-09-01 12:53:31 +09:00
bcb6798838
Pass the filename as an argument to Document#slug
2014-09-01 12:45:41 +09:00
9e9f4f1c53
Fix orientation bugs
...
Maintain fontsize and and adapt width when switching to landscape mode.
2014-08-31 15:27:51 +02:00
081e34a5ab
Merge pull request #2858 from jekyll/auto-enable-watch
2014-08-31 00:05:42 -07:00
b5dbc36975
Use Jekyll.sanitized_path when adding static files to Collections.
...
h/t @benbalter https://github.com/jekyll/jekyll/pull/2737#discussion_r16713423
Not sure if the previous code can be exploited, but being super safe is never a bad thing.
2014-08-30 23:09:47 -07:00
6cee2a87cc
Auto-enable watch on 'serve'.
...
Addresses @kneath's and @chibicode's comments in #2695 .
2014-08-30 22:52:41 -07:00
eea5921856
Fix test for Liquid rendering in Sass.
2014-08-30 21:54:50 -07:00
190ab7f6b8
Merge pull request #2830 from kansaichris/render-liquid-in-coffeescript
2014-08-28 19:35:44 -07:00
d395183ee2
refactored where filter comment
2014-08-28 22:46:53 +03:00
79992fc3c8
Fix inaccurate comments
2014-08-26 17:17:13 +09:00
71b10e2d4a
Make render_with_liquid? true for CoffeeScript
2014-08-26 17:14:33 +09:00
56cd73eb35
Merge pull request #2799 from kansaichris/add-title-to-collection-permalinks
2014-08-25 23:15:23 -07:00
a72706ace6
Add Document#slug
2014-08-26 11:46:01 +09:00
cc4a0d1704
Change :title to :name
2014-08-26 11:26:19 +09:00
d9da7cbd76
add class << self idiom to new command
2014-08-25 10:59:58 +04:00
e8b00fb6f2
Add the 'title' variable to collection permalinks
2014-08-23 14:50:55 +09:00
3b7091aab7
Find variables in _config.yaml by searching with relative file path.
2014-08-20 00:07:51 +02:00
9df020f7e9
add .sass-cache to .gitignore and fix main.scss fileformat
2014-08-19 17:39:22 +08:00
cccfda7de8
hashrockets in CSV loading
2014-08-17 08:34:38 +01:00
866935dadf
map with proc for CSV loading
2014-08-16 20:26:29 +01:00
687176e22c
Autoload csv files from data directory
2014-08-16 14:54:14 +01:00
1f877fde1e
Make the intro text on the site template post a bit nicer.
2014-08-13 01:27:36 -04:00
d70f9d4a29
Layout for site template feed.xml should be 'null'.
2014-08-13 01:23:19 -04:00
4d8e335da1
The mighty classifier --- reborn!!!!!
...
Use classifier-reborn v2.0 in place of classifier 1.3.
Code at https://github.com/jekyll/classifier-reborn
2014-08-13 00:29:40 -04:00
9738ea452f
Merge pull request #2723 from jekyll/release-2-3-0
2014-08-13 00:04:15 -04:00
566d3718b0
added sassify and scssify filters fot converting sass and scss strings to css
2014-08-12 21:24:04 -06:00
10cc45fc45
Add StaticFile#destination_rel_dir
2014-08-12 18:07:13 -04:00
530e049d2d
Read in static files info `collection.files` as `StaticFile`s.
2014-08-12 15:59:45 -04:00
f16a5cbae1
Add Utils.has_yaml_header? so we can check the front matter existence in one place
2014-08-12 15:58:02 -04:00
7b1763a124
Release 💎 v2.3.0
2014-08-12 14:39:21 -04:00
eabde41267
Merge pull request #2733 from jekyll/sass-in-liquid
2014-08-12 14:36:15 -04:00
707278f099
Use the proper extname getter.
2014-08-12 14:11:27 -04:00
ba63a2c6d1
Merge pull request #2731 from jekyll/doc-to_s
2014-08-12 13:47:32 -04:00
8ff9074ce5
Allow Sass files to be rendered, but never place them in layouts.
...
Fixes #2573 .
2014-08-12 13:38:53 -04:00
db34c48927
Just like for Convertible, place the un-layouted content in document.content.
2014-08-12 12:52:38 -04:00
2fd155615f
Forgot a question mark == broken tests.
2014-08-12 12:22:48 -04:00
e36d433100
FrontmatterDefaults#update_deprecated_types deals with a set, not a scope
2014-08-12 12:22:39 -04:00
9c090c862f
Ask about 'Draft' before asking about 'Post'
...
`Draft`s are a subclass of `Post` so `draft.is_a?(Post)` will return
`true`, thus making all `Draft`s `Post`s, which is not desired. If
asking about `Draft` first, then we avoid this problem.
Fixes #2726
2014-08-12 11:52:16 -04:00
60c29561f2
Use plural 'type' in front matter defaults for pages/posts/drafts
...
Fixes #2657
2014-08-12 11:50:02 -04:00
d57c4f1c01
Document#to_s should produce just the content of the document.
...
Fixes #2655
2014-08-12 11:25:28 -04:00
1dcf241677
Merge pull request #2722 from jekyll/don-t-concat-extnames
2014-08-12 11:19:53 -04:00
1666bbc52e
Call #to_liquid before calling #to_json in jsonify filter.
2014-08-11 20:16:42 -04:00
fd2d7df9b7
Don't concat extnames in output for multiple converters
2014-08-10 20:32:29 -04:00
6f8b8816f5
Merge pull request #2704 from jekyll/mult-converters
2014-08-10 20:29:37 -04:00
47b38cf9ee
Merge pull request #2716 from jekyll/reform-watch
2014-08-10 20:28:38 -04:00
11373acb15
Merge pull request #2720 from jekyll/read-in-utf8
2014-08-10 16:45:11 -04:00
9b3ccee3dd
Pass in options to File.open in Document.
2014-08-10 16:23:33 -04:00
68fb130fd0
Add magic comments for UTF-8
2014-08-10 16:16:48 -04:00
45a347c022
Read in every Document's content as UTF-8
2014-08-10 16:16:41 -04:00
69cc414c1b
Don't need to capture the group.
2014-08-10 15:44:36 -04:00
3264766762
Use case-insensitive checking for the file extensions when loading config files.
2014-08-10 14:37:41 -04:00
c7c1eddd47
It's called Jekyll::Watcher
2014-08-10 14:33:11 -04:00
a2dfd6eddc
Refactor based on jekyll-watch clean-up.
...
https://github.com/jekyll/jekyll-watch/pull/5
2014-08-09 00:13:18 -04:00
c8d1c3d264
Remove duplicated mixed case categories
2014-08-07 11:27:42 +09:00
3768d90278
Use category in downcase only for URL ( Resolves #1739 )
2014-08-07 11:27:41 +09:00
939c67222a
Check to make sure the command is valid.
2014-08-06 21:28:21 -04:00
23515acc31
Slim down help command.
2014-08-06 21:20:39 -04:00
a0f449d613
Add 'jekyll help' command.
...
Ref: #2695
2014-08-06 21:17:44 -04:00
d0ac4915cb
Reverts 18c033dc5c
...
The merge that is reverted assigned categories to posts
based on the subfolders in the _posts directory and
was merged under the understanding that it was fixing a bug.
Subfolders in the _posts directory should not assign
metadata information to posts at this point in time and
was not a bug.
2014-08-06 14:20:03 -07:00
d004bc4ea5
Allow Convertibles to be converted by >= 1 converters.
2014-08-06 16:20:24 -04:00
229cedfc50
Reorganize and update default configuration settings. #2456 .
2014-08-06 16:01:47 -04:00
cb671acd0c
Merge pull request #2682 from alfredxing/date-parser-util
2014-08-06 15:30:02 -04:00
21b6a01980
Merge pull request #2693 from ivantsepp/2142_partial_liquid_output_tag_in_include_tag
2014-08-06 15:28:07 -04:00
5eacc9e831
Merge pull request #2696 from jekyll/jekyll-autogeneration-disabled
2014-08-06 15:27:16 -04:00
f0105158bf
Merge pull request #2687 from kleinfreund/sassify_site_template
2014-08-06 15:24:01 -04:00
8999df2f46
Adding markdown setting back to _config.yml
2014-08-06 21:12:36 +02:00
441a2496b8
Usind 3 instead of 7 SCSS files now
2014-08-06 19:20:06 +02:00
e5a7f842be
Add sentence about jekyll-help repo
2014-08-06 19:11:36 +02:00
7f92e7ce00
Reverting back to using content box and calc
2014-08-06 11:08:28 +02:00
4c4f803df2
Remove preemptive loading of the 'classifier' gem.
2014-08-05 16:47:30 -04:00
a27313b1d0
Use helper method #deprecation_message in Deprecator.no_subcommand.
2014-08-05 16:43:38 -04:00
9fd872e7b8
Notify the user when auto-regeneration is disabled.
2014-08-05 15:55:43 -04:00
13425266eb
Fixed Typo in error message
2014-08-05 15:37:09 +02:00
738dd502b4
Adding fill attribute to SVG's as fallback
2014-08-05 09:46:39 +02:00
0594adb8fd
Allow VARIABLE_SYNTAX to collect partial variables
2014-08-05 01:04:36 -04:00
020f684093
Adjusting heading hierarchy to reflect site-title change
2014-08-04 09:42:46 +02:00
101d614351
Removing h1 from site-title
2014-08-04 09:35:18 +02:00
d8c330b215
Removing unused column class
2014-08-03 23:15:22 +02:00
e4029426de
Adding and using media-query mixin
2014-08-03 23:07:47 +02:00
7d865269fd
Replacing CSS comments with Sass comments
2014-08-03 23:06:59 +02:00
b24b870ec6
Update welcome post to clarify front matter usage
2014-08-03 23:06:14 +02:00
74974979ba
Reworking site template to utilize Sass
2014-08-03 19:35:43 +02:00
4cfbdb07bb
Show input in error message
...
Show date input in error message to make it easier for user
to find infringing date/file
2014-08-02 11:51:04 -07:00
81807cb5af
Merge pull request #2615 from alfredxing/collections-static-files
2014-08-02 14:44:45 -04:00
d5322a73bf
Move instances of `Time.parse` into a Utils method
2014-08-02 09:38:50 -07:00
5fdf637c6a
Cache information about document YAML header existence
2014-08-01 22:03:29 -07:00
e75dc74bb1
Merge pull request #2649 from alfredxing/friendly-date-error
2014-08-02 00:06:20 -04:00
e44cfe29a8
No longer set "permalink: pretty" in the _config.yml for the site template
...
This causes unintuitive behaviour that doesn’t align with the
documentation.
Fixes #2399 .
2014-08-02 00:01:59 -04:00
989d5d357b
Use `relative_path` in error message instead of `path`
2014-08-01 21:00:17 -07:00
f8c19df79a
Add friendly error message for invalid dates
...
Catch the `ArgumentError` when parsing dates from the YAML front
matter
2014-08-01 21:00:17 -07:00
02b60d6d00
Add helpful comments to site template _config.yml
2014-08-01 23:59:57 -04:00
4ca3fe5137
Merge pull request #2664 from alfredxing/replace-deprecated-methods
2014-08-01 23:27:58 -04:00
503e54779a
Merge pull request #2673 from lucianosousa/patch-1
2014-08-01 23:27:13 -04:00
274c6d3667
Allow static files in collections
...
Allow Documents to be static files so static files can exist in collections
2014-08-01 13:24:27 -07:00
bc3b82850d
Merge pull request #2659 from alfredxing/front-matter-defaults-defaults
2014-08-01 13:47:42 -04:00
33cd956e4e
improving strftime call
...
set non padded config to avoid parse string type twice
2014-08-01 00:02:41 -03:00
f57f1c7eef
Use .scss for site_template styles.
2014-07-31 17:59:27 -04:00
6d62dbbafc
Replace deprecated Ruby methods
...
Replace `Hash#has_key?` and `File.exists?` with `Hash#key?`
and `File.exist?`
2014-07-31 12:50:20 -07:00
9437a7abcd
Don't require the `scope` key in front matter defaults
...
Set defaults for `scope` in front matter defaults as per #2656
2014-07-31 11:17:35 -07:00
dc894e41af
Prep for v2.2.0 release.
2014-07-29 19:02:51 -04:00
3cb2e74b5c
Add further testing for Highlight#sanitized_opts
2014-07-29 16:30:44 -04:00
a4c9925e99
Whitelist three Pygments options.
...
- startinline
- hl_lines
- linenos
2014-07-29 14:20:49 -04:00
592afc270e
Merge pull request #2620 from alfredxing/warn-on-layout-nonexistent
2014-07-29 00:11:41 -04:00
2785d702e2
Remove 'none' as a valid layout
2014-07-28 18:35:47 -07:00
592630d48c
Do not forget to downcase the categories here as well
2014-07-27 00:29:31 +02:00
16dbe54560
When using subdirs to reflect categories, the underlying `categories` attribute was not set
2014-07-24 18:59:26 +02:00
2eb57279fe
Remove unnecessary Jekyll::Tags::IncludeTag#blank? method
2014-07-22 21:06:43 +00:00
7586538432
Use `is_a?` instead of `class`
2014-07-21 09:23:21 -07:00
4bd5614f4c
Exclude excerpts from layout checks
2014-07-20 12:57:40 -07:00
c8e0fcfcdf
Fix up errors in CI build
2014-07-20 12:56:54 -07:00
7fa30c0dec
Add path of file requesting nonexistent layout
2014-07-20 12:17:04 -07:00
a0d679439f
Move layout validity logic to separate method
2014-07-20 10:01:09 -07:00
072ddb799f
Do the same for documents
2014-07-20 09:18:35 -07:00
ac744a6313
Give a build warning if a layout does not exist
...
Throw a warning if a non-"none" layout is specified but the corresponding
layout file does not exist.
2014-07-20 09:17:19 -07:00
475e08bba3
Replace all RubyForge links with new residences
2014-07-16 13:43:09 -07:00
c7cc36abdb
Put errors/exceptions into Jekyll::Errors module
2014-07-12 13:47:59 -07:00
a97ae67552
Gracefully require
2014-07-12 13:46:49 -07:00
4cc6a0f263
Mark certain gems as eventually-non-core.
2014-07-12 13:08:35 -07:00
685cdbe124
Release Jekyll v2.1.1
2014-07-10 09:40:36 -07:00
28131624b8
Don't use old `@url` variable
...
Fix for #2557
2014-07-07 10:54:19 -07:00
a66d96ce0a
Use Jekyll.sanitized_path more.
2014-07-01 18:29:15 -04:00
8882f4dd14
Merge pull request #2554 from alfredxing/fix-build-tomdoc
2014-06-28 21:37:25 -04:00
bb9517b73f
Fill in a bit of missing TomDoc
...
Fill in a piece of missing doc for the `build` function in `commands/build.rb`
2014-06-28 17:48:19 -07:00
08d0ff0922
Bump version in gem.
2014-06-28 17:41:29 -04:00
e332197660
Be quiet very quickly. Fixes #2520 .
2014-06-28 17:19:40 -04:00
5f7a3f2b69
Filter out directories from entries in the collection
2014-06-28 16:51:30 -04:00
02676572dd
Allow dots in collection labels.
2014-06-28 16:51:19 -04:00
12b47cc037
Spike out jekyll <cmd> --watch into a separate gem.
2014-06-27 16:41:10 -04:00
6a7386e6ba
Merge pull request #2432 from jekyll/docs-4-ci
2014-06-27 16:39:19 -04:00
bd4a8c1ce2
Fixes, fixes.
2014-06-27 15:32:16 -04:00
d16f62cb38
Ensure exclude and include arrays are arrays of strings.
...
Fixes #2542 .
2014-06-25 16:56:27 -04:00
cedbdf43ca
Merge pull request #2532 from alexmedearis/hl_lines
2014-06-25 16:14:14 -04:00
20180923cf
Merge pull request #2490 from penibelst/deep-defaults
2014-06-24 23:04:38 -04:00
6e104c3ed0
Ensure the post categories are unique (only one). Ref: #2527 #2531
...
h/t @Nicholas-Perry
https://github.com/jekyll/jekyll/issues/2527#issuecomment-47041756
2014-06-24 19:15:02 -04:00
edbc273829
Use Utils.deep_merge_hashes
2014-06-24 20:24:26 +02:00
5f807e7421
Merge deep
2014-06-24 20:20:15 +02:00
dc074fcc50
Merge pull request #2477 from jekyll/serve-skip-initial-build
2014-06-23 19:06:10 -04:00
d359c63018
Merge pull request #2493 from jekyll/fix-sort
2014-06-23 19:02:54 -04:00
e75dcc18f1
Merge pull request #2511 from denilsonsa/patch-1
2014-06-23 19:01:31 -04:00
b0e51e2cba
Merge pull request #2524 from jekyll/all-html-files
2014-06-23 18:59:57 -04:00
e58c1ee306
Merge pull request #2531 from jekyll/merge-post-categories
2014-06-23 18:58:51 -04:00
74f0f27d18
Before copying file, explicitly remove the old one
...
On Windows, FileUtils.cp(path, dest_path) will fail with a Permission
Denied if the dest_path already exists and is read-only. People have
complained about this since at least 2008.
This lets `jekyll build` work without error in Windows when one or more
read-only files exist.
This change will accommodate users of Team Foundation, which uses the
read-only flag for for source control status. (dumb, I know, but but a
real problem)
2014-06-19 18:25:00 -04:00
5846cc7b70
No private methods in LogAdapter.
2014-06-19 17:11:04 -04:00
b202b508f2
handles line numbers with more than 1 digit
2014-06-18 17:48:50 -07:00
674b540c6f
unit tests
2014-06-18 17:27:27 -07:00
8b860d3f0e
Fixes highlight.rb to correctly parse list values
2014-06-18 17:08:50 -07:00
99cc12cc0a
Merge file system categories with categories from YAML.
...
Fixes #2527
2014-06-18 18:10:07 -04:00
a78b5c2f8d
Include files with a url which ends in / in the site.html_pages list
...
https://github.com/jekyll/jekyll-sitemap/issues/27
2014-06-17 15:18:41 -04:00
cc734930c6
Making `highlight` behave more like redcarpet
...
See issue 2510 for details.
2014-06-13 03:31:38 -03:00
d59b2c3ef6
Merge pull request #2419 from jens-na/collection-defaults
2014-06-12 20:38:21 -04:00
411cdb29a1
Change Github/Twitter keywords to site.{twitter,github}_username
...
Re: https://github.com/jekyll/jekyll/pull/2485/files#r13525347
2014-06-10 00:00:01 +03:00
50b04cdf92
Use `raise` instead of logging & aborting
2014-06-08 19:33:45 -04:00
ccee1b6a55
Try item#to_liquid before looking at the data
2014-06-08 19:33:37 -04:00
35f5bb0039
Default entries for twitter/github usernames
2014-06-07 11:16:43 +03:00
ffd960ca4e
Allow usage of different Twitter and Github usernames
...
and show these links only if twitter-username or github.username are set on _config.yml
2014-06-07 11:08:34 +03:00
ccf97a62f1
Merge pull request #2459 from ivantsepp/watch_ignore_files
2014-06-06 23:11:44 -04:00
6684a8f914
Refactor logic into Command class. Add tests.
2014-06-04 14:23:40 -04:00
b126159360
Skip initial build of site on serve with flag.
...
Adds --skip-initial-build flag to jekyll-serve, which serves the destination
immediately rather than waiting for the site to be built.
Fixes #1252 .
2014-06-03 13:30:14 -04:00
441ac3742c
remove extra space
2014-06-02 15:05:03 -04:00
90bc9314f1
change label to collection
...
To make it clear the label is of the document's collection
2014-06-02 14:32:52 -04:00
00ab79b7cf
add collection.label to Document#to_liquid
2014-06-01 21:45:23 -04:00
497c10897f
Passes the url to FrontmatterDefaults.all instead of full path
2014-06-01 22:21:31 +02:00
c8786b7b28
Adds default front-matter support for collecitons
2014-06-01 22:21:31 +02:00
879abc0949
Externalize the {% gist %} tag as the jekyll-gist gem.
2014-06-01 13:18:00 -04:00
83fb1fd0f6
Merge pull request #2444 from createdbypete/configurable-logger
2014-05-30 18:16:47 -04:00
041f727fe3
Merge pull request #2438 from pathawks/spicy-feed
2014-05-30 18:02:25 -04:00
6849d6a5e5
If rouge isn't there, say so.
...
In the previous version, it would say 'redcarpet' wasn't installed,
due to the rescue LoadError block on line 93. This change will tell
the user that, in fact, rouge isn't installed and that this is the
cause of the error, not that redcarpet isn't installed.
Fixes #2464 .
https://github.com/jekyll/jekyll/issues/2464
2014-05-30 17:59:47 -04:00
e9ac432e0f
Merge pull request #2458 from karouf/cleaner-empty-dirs
2014-05-30 11:35:35 -04:00
a324eafac4
Using implicit returns to conform to coding style
2014-05-30 08:46:31 +02:00
c4434f27af
Get relative paths of directories to ignore
...
Use `Pathname#realpath` to get absolute paths so that
`Pathname#relative_path_from` will not raise an exception. Also add the
config files to this list.
2014-05-28 01:16:34 -04:00
6ba077cf37
Remove `Command.globs` method
...
It is no longer being used.
2014-05-28 01:15:07 -04:00
72c410363c
Keep parents of directories in keep_files
...
Closes #1297
2014-05-27 21:11:17 +02:00
3b41a44050
Fixing help command in deprecation warning
2014-05-27 18:42:44 +01:00
04baeefaa8
Make sure Cleaner doesn't remove dirs if they only contain subdirs
...
Closes #2204
2014-05-27 18:06:52 +02:00
671a62e0fe
Merge pull request #2437 from pathawks/date_to_rfc822
2014-05-26 22:06:33 -04:00
9e4ef3cbff
Add the paginator as a plugin: jekyll-paginate
2014-05-26 20:09:33 -04:00
4bdf4197db
Rocket style hash and switching integers for Logger severity constants
2014-05-25 23:19:29 +01:00
e6345f39a9
Renaming LogWriter to LogAdapter and adding tests for class
...
String coloring moved to Stevenson as not responsibility of LogAdapter
2014-05-24 21:22:10 +01:00
4a73e099b7
Allow Jekyll's logger to be set to any Logger compatible instance
...
* Stevenson now inherits from Logger and extends some methods to use $stderr
for log messages greater than info level.
* LogWriter provides an interface between Jekyll and Logger to maintain API.
2014-05-24 15:00:14 +01:00
bd836d88af
Spice up site_template feed
2014-05-23 09:42:12 -05:00
43074632b3
Take advantage of date_to_rfc822
...
Jekyll has a filter built just for this purpose
2014-05-23 09:34:49 -05:00
b9c3d8ba03
Merge pull request #2373 from tschmidt/handle-categories-in-site-config-defaults
2014-05-21 01:10:37 -04:00
3c6377d665
Merge pull request #2395 from rdumont/data-subdirectories
2014-05-21 01:09:15 -04:00
65275e5841
Merge pull request #2431 from jekyll/remove-collections-from-layouts
2014-05-21 01:07:01 -04:00
e37b3ca8e1
Any assets read in as Pages shall not be rendered or layout'd
2014-05-21 00:52:21 -04:00
5aefaa1c48
Merge pull request #2418 from mathbruyen/collections_permalink
2014-05-20 22:52:29 -04:00
7e05b6e0b3
Merge pull request #2420 from albertogg/fix-encoding-issue
2014-05-20 22:35:50 -04:00
cbe7e3e80e
Don't place asset files or yaml files in layouts
...
Ref: #2402
2014-05-20 17:11:34 -04:00
c76e41d157
Update `Utils#pluralized_array_from_hash` and `Utils#value_from_singular_key` per suggestion from @parkr
...
Switched to using the `#tap` method for more concise code. Also returning the value from
`value_from_singular_key` instead of returning an array wrapped presentation of the value.
This allows for a one-liner in `pluralized_array_from_hash`.
2014-05-20 12:32:59 -05:00
395d65454c
Merge pull request #2429 from jshawl/code-overflow-fix
2014-05-20 12:12:36 -04:00
e7c4fa0e5f
Prevent code overflowing container
2014-05-20 09:51:57 -04:00
7ce849a2b6
Revert changes and add encoding to the test file
...
* Add encoding to the test file as Ruby 1.9.3 doesn’t defaults to utf-8.
* Remove the forced encoding as encode seems too aggressive.
2014-05-20 00:03:40 -04:30
54fba9af4b
Merge pull request #2406 from yihangho/config-yaml
2014-05-20 00:15:58 -04:00
77cef764d6
Force encoding before escaping or unescaping
...
This will reassure not having any errors when escaping or
unescaping.
2014-05-19 18:50:25 -04:30
658a4d0b47
Try to load _config.yaml if _config.yml is nonexistent.
2014-05-19 09:06:55 +08:00
9932eb667b
Encode URLs in utf-8 when escaping and unescaping
...
There is a problem while returning a path that has some special and possible Non-ASCII characters that may lead jekyll to break while doing the unescaping process. This is can be addressed by “forcing” ASCII to UTF-8.
2014-05-17 17:53:40 -04:30
921dbe0547
Override collection url template
2014-05-17 10:40:52 +02:00
4147e92561
Merge pull request #2417 from jekyll/jekyll-env
2014-05-17 00:53:55 -04:00
780cff46b3
Add jekyll.environment to site_payload.
2014-05-17 00:38:21 -04:00
04b0fe0160
Merge pull request #2377 from jekyll/numeric
2014-05-16 03:50:50 -04:00
1c11afd78d
Fix #2413 and setup a Jekyll.env.
2014-05-15 16:28:37 -05:00
ba905a2c18
Merge pull request #2408 from quinn/patch-1
2014-05-15 12:37:56 -04:00
a38ea51994
Header links to pages which have a title
...
Header used to add link to all pages of the site, even those which do not have any title, creating empty anchors on the page like `<a class="page-link" href="/feed.xml"></a>`. Those were non click-able and used space on the page due to margins.
Now only displays pages with a title.
2014-05-15 08:59:29 +02:00
5ea62443f4
override EXCERPT_ATTRIBUTES_FOR_LIQUID
...
Allow EXCERPT_ATTRIBUTES_FOR_LIQUID to be overridden by inheriting class. Right now will always reference Jekyll::Post::EXCERPT_ATTRIBUTES_FOR_LIQUID. This is already being used in the codebase for ATTRIBUTES_FOR_LIQUID.
2014-05-14 13:39:16 -04:00
604fb3286c
Allow subdirectories in _data
2014-05-11 20:28:49 -03:00
6465cd6446
Setting log_level earlier to silence info level configuration output.
2014-05-11 21:14:10 +01:00
7756adc75c
Fixing spacing issue for `code` inside `pre`
...
Regular (one-line) code inside a `code` tag has some padding around it. This leads to some weird spacing when dealing with code blocks (e.g. inside `pre`).
Removing the horizontal paddings for these. (Also replacing `border: none;` with `border: 0;` because it's shorter)
2014-05-10 22:05:21 +02:00
01c09fd7fa
Merge pull request #2345 from penibelst/sort-collection
2014-05-10 15:42:53 -04:00
af9f1e6f48
Accept Numeric values for dates.
2014-05-09 23:11:05 -04:00
0371b69952
Set categor[y|ies] on post if they appear in site frontmatter defaults
2014-05-09 13:34:13 -05:00
bf3a20b2d7
allow json files in _data dir
2014-05-09 10:13:12 -04:00
fb523722b5
Fruity variables
2014-05-09 09:21:24 +02:00
df3c163eeb
Use item_property
2014-05-09 08:53:16 +02:00
d96f39360b
Revert "Make it fail"
...
This reverts commit c89e7539b86a483a2f8b14dd766ad90da1eb9773.
2014-05-09 08:53:16 +02:00
fd1778203d
Make it fail
2014-05-09 08:53:16 +02:00
9ba89b9ab1
Try item_property
2014-05-09 08:53:15 +02:00
ae7e485474
Add hash_property
2014-05-09 08:44:40 +02:00
036823cd06
Bump to 💎 v2.0.3
2014-05-08 22:43:04 -04:00
2d040c1aaa
Use Jekyll.logger for --watch error message.
2014-05-08 22:27:55 -04:00
81ff5ed7aa
Save --watch from errors.
...
Fixes #2355 .
2014-05-08 22:22:11 -04:00
a5c1a01965
Added item_property to where filter
2014-05-08 11:35:51 -07:00
348bcae763
If the input is a string but Time.parse can't parse it, maybe it's a UNIX timestamp.
...
Fixes #2339
2014-05-07 15:48:13 -04:00
77c0249d72
Use site.title instead of site.name in site template
...
Fixes #2324 .
2014-05-07 15:11:50 -04:00
f2f2ebfa4f
Register subclasses of subclasses of Jekyll::Plugin
...
The Sass and SCSS converters are practically the same – only different in
the input syntax and file extension. As such, we've created
`Jekyll::Converters::Scss` which is a subclass of `Jekyll::Converter`, and
`Jekyll::Converters::Sass` which is a subclass of
`Jekyll::Converters::Scss`. When `Site#instantiate_classes` is called on
`Jekyll::Converter`, it only instantiates the `Scss` converter, not the
`Sass` converter. This change fixes that.
Fixes #2334 .
2014-05-07 14:59:08 -04:00
8ad4dd332a
Don't fail if any of the path objects are nil.
...
Fixes #2325
2014-05-07 14:01:36 -04:00
da9b28d35c
Fix site template permalink typo
2014-05-07 11:36:14 -04:30
21f84e1548
Update gist.rb comments only
...
Strictly updated the reference to Examples and Valid Syntax to be inline with jekyll/jekyll-help#32
2014-05-07 07:34:00 -04:00
216f1150cd
The last of the site template prepending.
2014-05-07 00:31:53 -04:00
c71a4717dd
Prepend url, too, in feed.xml.
2014-05-07 00:09:12 -04:00
ac666490d2
Release 2.0.2
2014-05-06 23:59:49 -04:00
97e9fb29b0
Default baseurl to "" rather than to "/"
...
Also a fix for #2317
2014-05-06 23:54:56 -04:00
2dec333910
Set baseurl to nothing in new template site.
...
Previously, it caused all sorts of errors.
Fixes #2317 .
2014-05-06 23:50:58 -04:00
0a0d7858c6
Release 2.0.1
2014-05-06 21:57:33 -04:00
64cce065e6
Require kramdown instead of maruku.
...
CRAP CRAP CRAP whoops.
2014-05-06 21:55:11 -04:00
344906deb9
Release 2.0.0.
2014-05-06 20:11:44 -04:00
5c109ee8dc
Merge pull request #2299 from penibelst/sort-nils
2014-05-06 16:49:40 -05:00
1e0d9f899b
Follow Ruby Styleguide
2014-05-06 22:49:49 +02:00
b6cfb8aa4f
Merge pull request #2309 from jekyll/remove-unreleased-notes
2014-05-06 16:30:15 -04:00
c2d3f9d5b5
Close the file descriptor in has_yaml_header?
...
Previous method caused a problem where the calling Dir.chdir to get the next
directory's entries would cause the infamous 'Too many open files - getcwd'
error. Fixes #2279 .
2014-05-06 15:58:25 -04:00
7c1709fab4
Change nils argument to string
2014-05-06 21:36:13 +02:00
00f21ee93c
Add `output` to Document#to_liquid
2014-05-06 14:51:56 -04:00
6c1bb76316
Merge pull request #2303 from jekyll/jbranchaud-adding_exclude_tests
2014-05-06 14:40:18 -04:00
a7776f8279
Set relative_permalinks to false to deprecate!
2014-05-06 13:04:12 -04:00
2aa8908948
Stevenson now uses symbols instead of integers to set log level
2014-05-06 13:03:56 -04:00
63e959e4e1
Use Jekyll.logger, never puts
2014-05-06 13:02:35 -04:00
fda3461c5a
We deprecated relative permalinks in 2.0
2014-05-06 13:02:17 -04:00
413de3a0ee
Also exclude an entry if it starts with one of the items given in the exclude key.
2014-05-06 12:46:41 -04:00
a854a6a709
Merge pull request #2127 from XhmikosR/css
2014-05-06 12:32:52 -04:00
c8a715d09b
Merge pull request #2295 from jekyll/add-documents-listing
2014-05-06 12:28:58 -04:00
0087143b88
Merge pull request #2301 from TheTomThorogood/short_year_permalink
2014-05-06 12:14:25 -04:00
3755437d08
Write test for site.documents.
2014-05-06 00:11:35 -04:00
19e704f408
Override the sort filter
2014-05-05 10:26:46 +02:00
fc98f06ed7
Refactor docs_to_write
2014-05-04 21:22:57 -04:00
54b74fafba
Add documents to site payload
2014-05-04 21:22:51 -04:00
a2169bf0c4
Have separate methods for all docs and just the docs that are being written.
2014-05-04 21:19:09 -04:00
a0bbf7703b
make template site easier to customize
2014-05-04 21:07:23 -04:00
f2849ac269
Add :short_year to url_placeholders
2014-05-05 00:12:07 +09:30
3af22f12bf
Set content-type to text/html with utf-8 charset.
...
Fixes #2289
2014-05-03 18:51:55 -04:00
4ae8fefb95
Remove literal lang name from class, fix #2284
...
If code language is C classes for comment and language are the same
2014-05-03 20:23:28 +04:00
10f85eb856
Add missing vendor prefixed properties.
2014-05-02 09:15:03 +03:00
0463399389
Remove duplicate properties.
2014-05-02 09:15:02 +03:00
3e6a6ffb52
Update util functions
...
Cribbed from http://api.rubyonrails.org/classes/Hash.html#method-i-symbolize_keys
2014-04-28 02:06:41 -04:00
cf81331b39
Revert back to an intialize more similar to the original
2014-04-27 23:21:00 -04:00
446ca8f73d
Context is not used within any of the renders so no need to pass it
2014-04-27 23:21:00 -04:00
d6bd735aff
Refactor highlighting
...
Extract some of the common logic from the renderers.
2014-04-27 23:20:00 -04:00
513e77635b
Refactor 'jekyll serve' command.
2014-04-27 19:02:33 -04:00
3a610882f6
Avoid duplicated output using highlight tags
...
While using Rouge and an `highlight` tag, the output was duplicated
since the `output` variable in the Liquid tag definition was equal to
the highlighter's prefix value and the `<<` method changes its receiver.
Therefore, we should simply define an empty string and append the prefix
if it is present.
2014-04-27 12:22:40 +02:00
4e6d268ef3
Bump 💎 version.
2014-04-25 23:16:00 -04:00
068d921ef6
Fix up docs for collections.
...
#2238 .
2014-04-25 23:15:18 -04:00
6225073095
Use the 'output' key instead of 'write' for writing out collections' document files.
2014-04-25 19:47:35 -04:00
c906dfdf71
TEST THE COLLECTIONS
2014-04-24 14:01:23 -04:00
dd4fe87f69
Use Hash.new instead of hash literal
2014-04-24 13:59:25 -04:00
fb39b41ffb
NO MORE DATA COLLECTION I CAN'T HANDLE IT
2014-04-24 13:59:25 -04:00
b74c90dc20
Extract Collections metadata from site config
2014-04-24 13:59:24 -04:00
0dc680df0b
Always render collections, just don't always write them
2014-04-24 13:59:24 -04:00
7be78de93a
Don't read the collection if it's the data collection
2014-04-24 13:59:24 -04:00
f1a422dfff
Don't pretend there is a collections setter
2014-04-24 13:59:24 -04:00
a27e5825b9
Nil-out `@collections` so `#collections` will re-compile
2014-04-24 13:59:24 -04:00
fd98d5b1e6
Fetch collection names agnostically regarding the data structure of config['collections']
2014-04-24 13:59:24 -04:00
330005d932
Reset the collections hash on #reset.
...
Fixes #2234 .
2014-04-24 13:59:24 -04:00
4de2be8c5f
Add Jekyll::LiquidExtensions.lookup_variable
...
To use, just include `Jekyll::LiquidExtensions` as you please:
```ruby
class SayHi < Liquid::Tag
include Jekyll::LiquidExtensions
def initialize(tag_name, markup, tokens)
@markup = markup.strip
end
def render(context)
"hi #{lookup_variable(context, @markup)}"
end
end
```
Fixes #2071 .
2014-04-22 14:27:47 -04:00
9db5a1a6ce
Merge pull request #2205 from jekyll/maul-esel-frontmatter-defaults
2014-04-21 23:01:05 -04:00
6f0bebdfda
convert input to string before xml escaping
2014-04-18 16:54:48 -04:00
Alfred Xing
Parker Moore
Glauco Custódio
Matt Hickford
nitoyon
Mike Kruk
XhmikosR
Tanguy Krotoff
Seth Warburton
feivel
Philipp Rudloff
Pat Hawks
Igor Kapkov
Peter deHaan
Garen Torikian
Parker Moore
Chris Frederick
Shu Uesugi
Michael Kühnel
Faruk AYDIN
Ruslan Korolev
Kamil Dziemianowicz
Gordon Gao
James Smith
Kevin
ChaYoung You
Bret Comnes
Martin Seeler
Ivan Tse
Luciano Sousa
Sylvain UTARD
Florian Weingarten
Anatol Broder
Simon Sarris
Alex Medearis
Denilson Figueiredo de Sá
Tomer Cohen
Tomer Cohen
Ivan Tse
Bud Parr
Jens Nazarenus
Renaud Martinet
Marc Ransome
Peter Rhoades
Terry Schmidt
Jesse shawl
Alberto Grespan
Yihang Ho
Mathieu Bruyen
Jordon Bedwell
Mathieu Bruyen
Quinn Shanahan
Rodrigo Dumont
Ben Balter
Aaron Broder
Gabe Ortiz
Matt Rogers
TheTomThorogood
Valery Tolstov
XhmikosR
John Piasetzki
John Piasetzki
Robin Dupret