Commit Graph

1695 Commits

Author SHA1 Message Date
Parker Moore 5ed4638400 Merge pull request #2986 from tamagokun/where_filters_enumerable 2014-10-20 20:09:21 -07:00
Glauco Custódio 68c0e8f847 Hash#each_key instead of Hash#keys.each. Faster code. 2014-10-20 10:10:29 -02:00
Parker Moore 078b2785e4 Revert "Make permalink parsing consistent with pages" 2014-10-18 12:07:44 -07:00
Parker Moore 9f5835871b Utils.slugify: Don't create new objects when gsubbing 2014-10-12 16:18:40 -07:00
Parker Moore 00d29e7e77 Merge pull request #2994 from jekyll/fixes-from-benchmarking 2014-10-12 15:49:20 -07:00
Parker Moore b564214535 Pass the context on to IncludeRelativeTag#page_path 2014-10-12 15:16:38 -07:00
Matt Hickford 63a6d595c4 Fix feed link to respect baseurl 2014-10-12 23:14:41 +01:00
Parker Moore 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
Parker Moore 4942b2947b Only compile the Converter#matches regexp when asked for 2014-10-12 14:31:49 -07:00
Parker Moore fbe98df488 Cache variables that won't change through the life of an object 2014-10-12 14:06:17 -07:00
Parker Moore 44c9f81921 Cache the extname regexp in Converters::Markdown and Textile 2014-10-12 14:06:16 -07:00
Matt Hickford 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
Mike Kruk f6ea8b4d50 Allow Enumerables to be used with "where" filter. 2014-10-08 16:19:55 -04:00
XhmikosR b0c0fbd70b site_template/feed.xml: Remove unneeded space. 2014-10-08 10:37:01 +03:00
XhmikosR 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
Parker Moore f0e22be32b Merge pull request #2972 from tkrotoff/wrapper-width-hardcoded 2014-10-05 19:23:49 -07:00
Tanguy Krotoff 1ccd2156c5 Fix head.html indentation 2014-10-05 18:53:53 +02:00
Tanguy Krotoff 8e481cdf8e New Sass variable $content-width instead of hardcoded value 2014-10-05 18:49:39 +02:00
Seth Warburton 42a8dba642 Page specific descriptions 2014-09-30 22:17:49 +01:00
feivel 0701fa7b16 Update outdated comment
incorrect as of 6 Aug 2014.
2014-09-26 19:49:58 -04:00
Alfred Xing 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
Parker Moore bd0eebdb05 Merge pull request #2925 from pathawks/htm-extension 2014-09-24 17:08:02 -07:00
Parker Moore dc0add15af Merge pull request #2946 from kleinfreund/patch-1 2014-09-24 17:06:53 -07:00
Parker Moore e6f89074d4 Rouge's Redcarpet plugin now has a different API
See for more:
- 18ec938e9c
- https://github.com/jneen/rouge/issues/182
2014-09-22 23:03:49 -07:00
Philipp Rudloff 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
Pat Hawks fdf58c5ce2 Allow per post permalinks to end in `.htm`
Fixes #2920
2014-09-14 11:58:16 -07:00
Igor Kapkov 566eb6ef3b remove watch since it default in 2.4.0 2014-09-14 11:28:29 +08:00
Parker Moore e72f8cf5b1 Release 💎 2.4.0 2014-09-09 22:24:09 -07:00
Parker Moore 196a56e3ec Add push, pop, shift, and unshift Liquid filters.
Fixes #2892.
2014-09-09 21:29:23 -07:00
Parker Moore 4fb6e1cde9 Merge pull request #2884 from gjtorikian/improve-docs-for-include-relative 2014-09-09 00:21:42 -07:00
Peter deHaan 06c9b1b33c Fixing "vertycal" typo
s/vertycal/vertical

Unless, like, "vertycal" was on purpose or something.
2014-09-08 22:48:23 -07:00
Garen Torikian 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
Garen Torikian 0675f2a423 Update include_relative tests
This verifies you can’t go “up” in the include
2014-09-07 21:23:45 -07:00
Parker Moore 6644c77d23 Merge pull request #2870 from gjtorikian/support-relative-include 2014-09-07 13:05:38 -07:00
Garen Torikian a569799ffc Sanitize the resolved includes path 2014-09-07 12:18:54 -07:00
Garen Torikian 3668437c96 Rename method to `resolved_includes_dir` 2014-09-07 12:18:35 -07:00
Garen Torikian 4da07bb2c3 Add tests around nasty include attempts 2014-09-07 12:00:37 -07:00
Garen Torikian 0e4549013d Define methods for shared vars between include & include_relative 2014-09-07 11:21:40 -07:00
Chris Frederick 394eab4a3a Add the slugify Liquid filter 2014-09-07 16:48:57 +09:00
Garen Torikian 9f558d1cec Rename tag to `include_relative` 2014-09-06 21:48:15 -07:00
Garen Torikian 787bb582da Trash the subclass 2014-09-06 21:48:00 -07:00
Parker Moore 58a76911bb Merge pull request #2864 from kansaichris/add-title-to-collection-urls 2014-09-05 10:04:38 -07:00
Garen Torikian aa97f1025d Support a new `relative_include` tag 2014-09-03 15:43:51 -07:00
Chris Frederick 4adc35aaf3 Revise Utils#slugify with inspiration from Rails 2014-09-02 14:32:14 +09:00
Chris Frederick 702b39dec5 Replace the 'name' parameter with 'string' 2014-09-02 13:34:44 +09:00
Chris Frederick 3ca1245027 Move Document#sluggify to Utils#slugify 2014-09-02 13:29:28 +09:00
Shu Uesugi cfd17b2e7d Add inspect filter 2014-09-01 14:51:09 -07:00
Chris Frederick 05d65f0341 Rename 'slug' to 'sluggify' and clean up code 2014-09-01 16:25:42 +09:00
Chris Frederick a5e51cfdbe Properly handle titles with trailing punctuation 2014-09-01 13:25:38 +09:00
Chris Frederick cca9c50c26 Add 'title' to url_placeholders 2014-09-01 12:53:31 +09:00
Chris Frederick bcb6798838 Pass the filename as an argument to Document#slug 2014-09-01 12:45:41 +09:00
Michael Kühnel 9e9f4f1c53 Fix orientation bugs
Maintain fontsize and and adapt width when switching to landscape mode.
2014-08-31 15:27:51 +02:00
Parker Moore 081e34a5ab Merge pull request #2858 from jekyll/auto-enable-watch 2014-08-31 00:05:42 -07:00
Parker Moore 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
Parker Moore 6cee2a87cc Auto-enable watch on 'serve'.
Addresses @kneath's and @chibicode's comments in #2695.
2014-08-30 22:52:41 -07:00
Parker Moore eea5921856 Fix test for Liquid rendering in Sass. 2014-08-30 21:54:50 -07:00
Parker Moore 190ab7f6b8 Merge pull request #2830 from kansaichris/render-liquid-in-coffeescript 2014-08-28 19:35:44 -07:00
Faruk AYDIN d395183ee2 refactored where filter comment 2014-08-28 22:46:53 +03:00
Chris Frederick 79992fc3c8 Fix inaccurate comments 2014-08-26 17:17:13 +09:00
Chris Frederick 71b10e2d4a Make render_with_liquid? true for CoffeeScript 2014-08-26 17:14:33 +09:00
Parker Moore 56cd73eb35 Merge pull request #2799 from kansaichris/add-title-to-collection-permalinks 2014-08-25 23:15:23 -07:00
Chris Frederick a72706ace6 Add Document#slug 2014-08-26 11:46:01 +09:00
Chris Frederick cc4a0d1704 Change :title to :name 2014-08-26 11:26:19 +09:00
Ruslan Korolev d9da7cbd76 add class << self idiom to new command 2014-08-25 10:59:58 +04:00
Chris Frederick e8b00fb6f2 Add the 'title' variable to collection permalinks 2014-08-23 14:50:55 +09:00
Gordon Gao 9df020f7e9 add .sass-cache to .gitignore and fix main.scss fileformat 2014-08-19 17:39:22 +08:00
James Smith cccfda7de8 hashrockets in CSV loading 2014-08-17 08:34:38 +01:00
James Smith 866935dadf map with proc for CSV loading 2014-08-16 20:26:29 +01:00
James Smith 687176e22c Autoload csv files from data directory 2014-08-16 14:54:14 +01:00
Parker Moore 1f877fde1e Make the intro text on the site template post a bit nicer. 2014-08-13 01:27:36 -04:00
Parker Moore d70f9d4a29 Layout for site template feed.xml should be 'null'. 2014-08-13 01:23:19 -04:00
Parker Moore 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
Parker Moore 9738ea452f Merge pull request #2723 from jekyll/release-2-3-0 2014-08-13 00:04:15 -04:00
Kevin 566d3718b0 added sassify and scssify filters fot converting sass and scss strings to css 2014-08-12 21:24:04 -06:00
Parker Moore 10cc45fc45 Add StaticFile#destination_rel_dir 2014-08-12 18:07:13 -04:00
Parker Moore 530e049d2d Read in static files info `collection.files` as `StaticFile`s. 2014-08-12 15:59:45 -04:00
Parker Moore 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
Parker Moore 7b1763a124 Release 💎 v2.3.0 2014-08-12 14:39:21 -04:00
Parker Moore eabde41267 Merge pull request #2733 from jekyll/sass-in-liquid 2014-08-12 14:36:15 -04:00
Parker Moore 707278f099 Use the proper extname getter. 2014-08-12 14:11:27 -04:00
Parker Moore ba63a2c6d1 Merge pull request #2731 from jekyll/doc-to_s 2014-08-12 13:47:32 -04:00
Parker Moore 8ff9074ce5 Allow Sass files to be rendered, but never place them in layouts.
Fixes #2573.
2014-08-12 13:38:53 -04:00
Parker Moore db34c48927 Just like for Convertible, place the un-layouted content in document.content. 2014-08-12 12:52:38 -04:00
Parker Moore 2fd155615f Forgot a question mark == broken tests. 2014-08-12 12:22:48 -04:00
Parker Moore e36d433100 FrontmatterDefaults#update_deprecated_types deals with a set, not a scope 2014-08-12 12:22:39 -04:00
Parker Moore 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
Parker Moore 60c29561f2 Use plural 'type' in front matter defaults for pages/posts/drafts
Fixes #2657
2014-08-12 11:50:02 -04:00
Parker Moore d57c4f1c01 Document#to_s should produce just the content of the document.
Fixes #2655
2014-08-12 11:25:28 -04:00
Parker Moore 1dcf241677 Merge pull request #2722 from jekyll/don-t-concat-extnames 2014-08-12 11:19:53 -04:00
Parker Moore 1666bbc52e Call #to_liquid before calling #to_json in jsonify filter. 2014-08-11 20:16:42 -04:00
Parker Moore fd2d7df9b7 Don't concat extnames in output for multiple converters 2014-08-10 20:32:29 -04:00
Parker Moore 6f8b8816f5 Merge pull request #2704 from jekyll/mult-converters 2014-08-10 20:29:37 -04:00
Parker Moore 47b38cf9ee Merge pull request #2716 from jekyll/reform-watch 2014-08-10 20:28:38 -04:00
Parker Moore 11373acb15 Merge pull request #2720 from jekyll/read-in-utf8 2014-08-10 16:45:11 -04:00
Parker Moore 9b3ccee3dd Pass in options to File.open in Document. 2014-08-10 16:23:33 -04:00
Parker Moore 68fb130fd0 Add magic comments for UTF-8 2014-08-10 16:16:48 -04:00
Parker Moore 45a347c022 Read in every Document's content as UTF-8 2014-08-10 16:16:41 -04:00
Parker Moore 69cc414c1b Don't need to capture the group. 2014-08-10 15:44:36 -04:00
Parker Moore 3264766762 Use case-insensitive checking for the file extensions when loading config files. 2014-08-10 14:37:41 -04:00
Parker Moore c7c1eddd47 It's called Jekyll::Watcher 2014-08-10 14:33:11 -04:00