Commit Graph

1922 Commits

Author SHA1 Message Date
Parker Moore aceb5b5d53 Merge branch 'jekyll-gjtorikian-patch-1'
* jekyll-gjtorikian-patch-1:
  Use the source_dir() helper
  Add test for new extracted method
  Factor out a `read_data_file` call to keep things clean
2015-01-31 00:12:33 -08:00
Parker Moore a2b19c1d2b Merge pull request #3383 from jekyll/respect-the-title 2015-01-31 00:07:10 -08:00
Parker Moore 0c624eb11b The :title URL placeholder for collections should be the filename slug.
This mimicks posts most closely. It can be overridden by the
YAML front matter.

Undoes some of #2864.
2015-01-30 01:53:11 -08:00
Parker Moore e2e6e7dc22 Merge pull request #3376 from tkrotoff/helvetica 2015-01-29 18:52:07 -08:00
Matt Rogers fe08405ae1 Merge pull request #3378 from kaatt/initial-build-time 2015-01-29 16:10:05 -06:00
Alfred Xing 63bca94bde Merge pull request #3375 from tkrotoff/fix-nav-items-gaps 2015-01-29 14:07:49 -08:00
Garen Torikian e1e60499b1 Factor out a `read_data_file` call to keep things clean 2015-01-29 12:41:19 -08:00
kaatt ff646738fc Shows time after initial generation 2015-01-30 01:32:00 +05:30
Tanguy Krotoff aa44c7f53d Switch default font to Helvetica Neue
Helvetica Neue (1983) features multiple improvements over the original Helvetica font (1957), 'neue' means 'new' in German
2015-01-29 16:38:12 +01:00
Tanguy Krotoff 368b862ebb Refactoring: replace !important with cleaner CSS 2015-01-29 16:18:22 +01:00
Parker Moore 3e609b1cd9 Merge pull request #3329 from tkrotoff/fix-nav-items-gaps 2015-01-24 11:56:52 -08:00
Alfred Xing 31b03e9b86 Merge pull request #3325 from imathis/generate-url 2015-01-24 11:21:51 -08:00
Parker Moore 317e2f460e Release 💎 v3.0.0.beta1 2015-01-24 09:55:46 -08:00
Tanguy Krotoff 53a59544e8 Fix site-nav alignment 2015-01-21 01:44:31 +01:00
Alfred Xing 58e231ce40 Rename Regenerator#write to Regenerator#write_metadata 2015-01-19 16:29:50 -08:00
Tanguy Krotoff 90eecc5da6 Fix nav items alignment when in "burger" mode 2015-01-19 20:55:32 +01:00
Alfred Xing fe5f0d124c Move all regenerate? checking to Regenerator 2015-01-18 11:05:06 -08:00
Brandon Mathis 589919d58a Strip slashes on nil url tokens 2015-01-18 08:31:14 -06:00
Parker Moore c378f741a8 Merge pull request #3319 from jekyll/split-off-textile 2015-01-17 17:08:15 -08:00
Parker Moore cbe5f8e4dd Merge pull request #3321 from jekyll/performance-upgrades 2015-01-17 16:55:51 -08:00
Parker Moore c1da91cf5c Start removing mentions of Textile. 2015-01-17 16:51:28 -08:00
Parker Moore 877cba9811 Remove direct baked-in support for Textile. 2015-01-17 16:51:28 -08:00
Pascal Borreli d28fb07bb9 Fixed typo [ci skip] 2015-01-18 00:45:28 +00:00
Parker Moore aaf0ba15cc Use frozen regular expressions for Utils#slugify 2015-01-17 16:25:33 -08:00
Parker Moore ef2d558874 Markdown#matches should avoid regexp 2015-01-17 16:25:10 -08:00
Parker Moore 10659e1eef Merge branch 'nitoyon-slugify-new-param'
* nitoyon-slugify-new-param:
  Remove superfluous Sass declarations.
  Move the slugify options out to their own section so as to fix the formatting.
  Document the mode parameter of slugify Liquid filter
  Add tests for mode parameters of slugify Liquid filter
  Add mode parameter to slugify Liquid filter

Conflicts:
	lib/jekyll/utils.rb

        ---> Hadn't added UTF-8 support in nitoyon's PR.
2015-01-17 16:06:10 -08:00
Parker Moore b2099ac763 Merge branch 'davidized-collection_yaml_dots'
* davidized-collection_yaml_dots:
  Move YAML Front Matter regexp into a constant.
  Add support for collections documents to have YAML front matter ending in dots.

Conflicts:
	test/test_collections.rb
2015-01-17 15:24:33 -08:00
Parker Moore c7d92c4e6d Move YAML Front Matter regexp into a constant. 2015-01-17 15:23:33 -08:00
Parker Moore 6d9b4c2aba Merge pull request #2774 from dziemian007/formatter_variables_by_relative_path 2015-01-17 15:16:50 -08:00
Parker Moore a312115a5a Merge pull request #3014 from jekyll/revert-3013-revert-2921-post-dest 2015-01-17 15:13:17 -08:00
Parker Moore 84cfc1ceff Merge branch 'majioa-devel'
* majioa-devel:
  Ensure Post#excerpt_separator always returns a string.
  get procedure for default excerpt separator for both cases site and page was moved to the post's specific method :excerpt_separator.
  Added per post excerpt_separator functionality, so you are able to specify :excerpt_separator (as well as just :excerpt) key direct inside the post YAML, to make an excerpt based on the value in the post. Tests were also added.
2015-01-17 15:01:20 -08:00
Parker Moore 18f3d76603 Ensure Post#excerpt_separator always returns a string. 2015-01-17 14:59:44 -08:00
Parker Moore ba2e1390ad Merge pull request #2571 from yous/patch-mixed-case-category 2015-01-17 14:55:30 -08:00
Mads Ohm Larsen 60da4ef010 Fix weird spacing 2015-01-15 22:04:00 +01:00
Matt Rogers ce78ea7818 Merge pull request #3220 from inukshuk/patch-1 2015-01-13 19:02:41 -06:00
Ryan Burnette 80465efff7 Require date in filters.rb 2015-01-13 13:51:47 -05:00
Ryan Burnette 936c737a32 Address #3298 2015-01-13 02:21:28 -05:00
Sylvester Keil 60921132c6 Preserve original mtime when copying static files 2015-01-12 13:00:35 +01:00
Parker Moore 4cbd814546 Add support for Windows line feeds too. 2015-01-09 23:55:47 -08:00
Malo Skrylevo a0f2b5f944 get procedure for default excerpt separator for both cases site and page was
moved to the post's specific method :excerpt_separator.
2015-01-10 04:05:16 +03:00
Kevin Ushey b92274b101 only strip newlines when rendering highlight blocks (#3265) 2015-01-09 00:07:11 -08:00
Malo Skrylevo 54d0bf47e8 Added per post excerpt_separator functionality, so you are able to
specify :excerpt_separator (as well as just :excerpt) key direct inside
the post YAML, to make an excerpt based on the value in the post. Tests
were also added.
2015-01-08 15:18:06 +03:00
Tanguy Krotoff c4d617e6aa Fix nav items alignment when on multiple lines 2015-01-07 12:30:48 +01:00
Parker Moore 502fd94f2c Merge pull request #3172 from alfredxing/docs-output-overrides 2015-01-05 23:19:12 -08:00
Alfred Xing c58ac78a5e Expose Publisher in Site 2015-01-05 16:13:04 -08:00
Alfred Xing 7655b533c9 Allow documents to set `published` in front matter 2015-01-05 16:11:02 -08:00
Seth Warburton 21bd3e6c5a [imp] Semantic structure improvements 2015-01-02 12:14:58 +00:00
Parker Moore a098dc80cd Merge pull request #3234 from jekyll/ruby-2-2 2014-12-29 20:49:04 -05:00
Parker Moore 7cd5847826 Merge pull request #3244 from jekyll/store-messages 2014-12-29 20:48:23 -05:00
Parker Moore 7bcf8d689e Always call Time#localtime to translate to TZ'd time. 2014-12-29 20:12:35 -05:00
nitoyon 5e10958faa Unescape Document output path
Document#destination wasn't unescaped properly.

For example, when we have a document named '_langs/c#.md',
we expect its url to be '/langs/c#.html',
but it was actually '/langs/c%23.html'.

We now unecape URL at Document#destination like Post#destination and
Page#destination.
2014-12-29 22:38:50 +09:00
Parker Moore 7fc47bfc43 Initialize @messages at instantiation time. 2014-12-29 01:14:16 -05:00
Parker Moore b2146e8659 Store log messages in an array of messages. 2014-12-29 01:14:16 -05:00
Parker Moore 35a5af783a Merge pull request #3189 from robschia/patch-1 2014-12-29 00:49:40 -05:00
Parker Moore 612eb737a5 Merge pull request #3047 from karouf/slugify-non-latin 2014-12-29 00:31:34 -05:00
Parker Moore 004f923644 Revert "Revert "Make permalink parsing consistent with pages"" 2014-12-29 00:30:42 -05:00
Parker Moore e39dfa3f0b Merge pull request #2908 from alfredxing/document-path 2014-12-29 00:26:35 -05:00
Parker Moore be23e18555 Say 'since 2.0' 2014-12-28 23:54:03 -05:00
Parker Moore aa4beda868 Merge pull request #3240 from jekyll/snake_case 2014-12-28 23:36:08 -05:00
Parker Moore c576d23908 Use External instead of Deprecator for requiring gracefully 2014-12-28 14:37:49 -05:00
Parker Moore ac41312c5d Separate jekyll-docs out into a separate gem & bless it 2014-12-28 14:37:02 -05:00
Parker Moore 0c0aea3ad7 Improve Site#getConverterImpl and call it Site#find_converter_instance 2014-12-28 14:12:09 -05:00
Parker Moore b6641be8ef Call it site_payload instead of payload. 2014-12-26 22:40:18 -05:00
Parker Moore 2f8248a6f1 Only call #site_payload once for all collection work. 2014-12-26 22:24:18 -05:00
Parker Moore 0eb2796a66 Sort static files just once.
Ref: #2075.
2014-12-26 22:23:45 -05:00
Parker Moore d35af9c1f3 Read 'enable_coderay' in the Kramdown parser 2014-12-26 22:16:57 -05:00
Parker Moore f6bff6fb61 Have a deprecation fallback for 'use_coderay' 2014-12-26 22:16:47 -05:00
Parker Moore a103898980 Set 'use_coderay' to 'enable_coderay' 2014-12-26 22:16:33 -05:00
Parker Moore b68dd3a5cb Add liquid c if it's available. 2014-12-26 21:53:56 -05:00
Parker Moore 70a331d854 Set the error mode to :strict 2014-12-26 21:53:56 -05:00
Tanguy Krotoff 0aa61f66a8 Remove unneeded end tag 2014-12-26 12:10:03 +01:00
Parker Moore cb2eea0e41 Release 💎 2.5.3 2014-12-22 09:16:40 -05:00
Parker Moore 8284714d8a Release 💎 2.5.3 2014-12-22 09:15:57 -05:00
Parker Moore 7227ad4ebb Merge pull request #3116 from alfredxing/incremental 2014-12-22 08:57:50 -05:00
Parker Moore 49115dbdab Merge pull request #3158 from afeld/as-liquid-refactor 2014-12-09 10:50:42 -08:00
Aidan Feldman 383a0d0aa7 modify as_liquid to use case statement 2014-12-09 07:42:14 -05:00
robschia 59acdaab9a Fixed itemprop="author name"
You are right, I tried to oversimplify it. Also, {{ page.date | %Y-%m-%d }} doesn't output what I expected. I think it's fixed now, I tried the code with a couple of validators and everything seems fine.
2014-12-08 19:46:49 +01:00
Alfred Xing 43a28aed96 Fix indentation 2014-12-05 19:38:43 -08:00
Alfred Xing 5d9662f80f Always regenerate asset files 2014-12-05 19:07:18 -08:00
robschia ed9cc80ff9 Update post.html 2014-12-06 00:49:04 +01:00
robschia 9b6eeba81e Added basic microdata 2014-12-06 00:32:05 +01:00
Alfred Xing 52f0b36558 Add incremental rebuild info to build command output 2014-12-04 20:09:49 -08:00
Laust Rud Jacobsen c8fc567c8d Site /feed.xml is RSS 2.0, fix auto-discovery header
Refs #2996
2014-12-02 22:40:22 +01:00
Tanguy Krotoff 64b0102686 Fix viewport meta tag 2014-11-29 12:30:43 +01:00
Alfred Xing d0e12d69bc Last few revisions 2014-11-28 14:05:40 -08:00
Alfred Xing b6d81c58df Perform less expensive operation first 2014-11-27 10:00:29 -08:00
Aidan Feldman 4776b27ff3 reduce nesting of #as_liquid 2014-11-27 04:20:05 -06:00
Aidan Feldman 87d08ec827 refactor #as_liquid 2014-11-27 04:16:29 -06:00
Alfred Xing 02f281eef3 Add unit and cucumber tests 2014-11-26 21:15:53 -08:00
Alfred Xing 8a257aca6b Implement more suggestions 2014-11-26 20:15:42 -08:00
Aidan Feldman 0662d31bf6 fix jsonify filter when used with boolean values 2014-11-26 02:40:41 -06:00
Brandon Bradley e546eb3e9f force markdown regexp to match the full extension 2014-11-24 20:08:31 -06:00
Alfred Xing dc30114605 Use site.in_source_dir 2014-11-23 16:16:19 -08:00
Alfred Xing 2a5cf11ee2 Add --no-metadata option 2014-11-23 15:38:00 -08:00
Parker Moore 5b77d02e3b Merge pull request #3141 from jekyll/bundle-require-is-borking-pygments
Fix Bundler-integration Plugin Manager
2014-11-23 14:18:06 -08:00
Parker Moore c2b24e82e5 Refactor the case statement in highlighter for better readability. [ci skip] 2014-11-23 14:17:21 -08:00
Parker Moore 10030ae8cd Put that Bundle.require statement back. 2014-11-23 14:13:47 -08:00
Alfred Xing 75c5c16297 Handle path overrides 2014-11-23 14:06:29 -08:00
Parker Moore ef53e677a4 Better tests for plugin manager. 2014-11-23 13:14:51 -08:00
Alfred Xing 4acf343fea Add clean command 2014-11-23 12:51:19 -08:00
Parker Moore b1bba1945a Prepare for a v2.5.2 release. 2014-11-22 15:37:07 -08:00
Parker Moore d17b80bf2a Keep track of the required gems. 2014-11-22 12:38:36 -08:00
Alfred Xing ac03af3229 Implement @mattr-'s suggestions 2014-11-21 22:12:21 -08:00
Alfred Xing fe6bfc6f1b Fix failing tests 2014-11-21 22:12:21 -08:00
Alfred Xing d438362971 Add regenerate front-matter variable 2014-11-21 22:12:21 -08:00
Alfred Xing 842470b0c4 Refinements 2014-11-21 22:12:21 -08:00
Alfred Xing 11917645f2 Incremental regeneration 2014-11-21 22:12:20 -08:00
David Williamson d7e3d4df8f Add support for collections documents to have YAML front matter ending in dots. 2014-11-20 14:38:17 -06:00
Parker Moore 60202782ea Only try bundler if the Gemfile is there. 2014-11-16 21:21:50 -08:00
Parker Moore 32b14d6402 First, setup Bundler. Then, require it.
Per a conversation in
https://github.com/bundler/bundler/issues/3252#issuecomment-63208769
2014-11-16 21:18:23 -08:00
Parker Moore 687b9cdf19 Merge pull request #3058 from alfredxing/fix-post-url-equality 2014-11-16 20:19:37 -08:00
Parker Moore 314fb875b5 Merge pull request #3089 from jekyll/remove-duplication-in-regexp 2014-11-12 18:46:44 -08:00
Alfred Xing d4c15efff9 Cache name matching regex 2014-11-11 17:35:09 -08:00
Alfred Xing 06750b8502 Print error message in renderer 2014-11-10 11:45:56 -08:00
Parker Moore bd907c5be6 Remove duplicate regexp phrase: ^\A.
Addresses @mastahyeti's comment in #3077: https://github.com/jekyll/jekyll/pull/3077#discussion_r20077150
2014-11-10 11:36:05 -08:00
Alfred Xing 84cef2202d Remove duplicate 'Conversion error:' message 2014-11-10 09:12:51 -08:00
Alfred Xing eaa132c65b Fall back to old method with deprecation warning 2014-11-09 11:55:47 -08:00
Parker Moore 22d11bef2d Prepare a 💎 v2.5.1 release. 2014-11-08 22:29:47 -08:00
Parker Moore 067f8b6be7 Strip the drive name from both paths when checking the prefix. 2014-11-08 13:10:28 -08:00
Parker Moore e11fb4d427 Merge pull request #3067 from jekyll/specify-log-level 2014-11-06 12:05:07 -08:00
Parker Moore 5b54f78875 Allow users to specify the log level via JEKYLL_LOG_LEVEL. 2014-11-06 12:03:07 -08:00
Parker Moore 989c70fe4a In the case that a Gemfile does not exist, ensure Jekyll doesn't fail. 2014-11-06 10:48:09 -08:00
Parker Moore a0afa19e9a Release 💎 v2.5.0 2014-11-05 22:07:23 -08:00
Parker Moore 13bb7360c0 Merge pull request #2865 from jekyll/some-kind-of-bundler-thingy 2014-11-05 22:01:37 -08:00
Parker Moore 5a350788e7 Test JEKYLL_NO_BUNDLER_REQUIRE. 2014-11-05 21:04:34 -08:00
Sean Collins 5a288e7de4 Add 'b' and 's' aliases for build and serve, respectively 2014-11-05 23:13:08 -05:00
Parker Moore 8ee1b2a1fd Finish up the plugin manager
And so it shall be.
2014-11-05 19:29:54 -08:00
Parker Moore b0a7f9c8c9 Require plugins from Gemfile :jekyll_plugins group. 2014-11-05 18:50:38 -08:00
Parker Moore 34de676713 Require gems in :jekyll_plugins group in a Gemfile in unsafe mode.
Replaces #1658. /cc @imathis
2014-11-05 18:39:54 -08:00
Parker Moore 9a15a09028 Add {{ | jsonify }} support for hashes. 2014-11-05 11:37:34 -08:00
Alfred Xing 50d0fc3c85 Match post.name instead of slugs and dates 2014-11-04 16:13:04 -08:00
Parker Moore 90cddade53 Commit the paths one by one to Jekyll.sanitized_path with the proper initial base.
Prevents errors like these:

[39/78] TestPost#test_: A Post processing posts should not be writable outside of destination. /Users/parker/jekyll/jekyll/test/dest
/Users/parker/jekyll/jekyll/test/dest/Users/parker/jekyll/baddie.html
 = 0.01 s
  1) Failure:
TestPost#test_: A Post processing posts should not be writable outside of destination.  [/Users/parker/jekyll/jekyll/test/test_post.rb:152]:
Failed assertion, no message given.
2014-11-03 22:27:55 -08:00
Parker Moore 2ee8d690c4 More conversion of Jekyll.sanitized_path ~> site.in_(source|dest)_dir 2014-11-03 22:16:48 -08:00
Parker Moore ca40c771d0 Only allow CWD _layouts outside of safe mode. 2014-11-03 22:16:48 -08:00
Parker Moore 4bccbdead4 If no overrides are passed in, just default to a Hash. 2014-11-03 22:16:48 -08:00
Parker Moore 68e9c84a18 Flatten paths sent into `#in_dest_dir` 2014-11-03 22:16:48 -08:00
Parker Moore f7b1782294 Fix post.rb permalink stuff in light of merge of #2925. 2014-11-03 22:16:48 -08:00
Parker Moore 656e772388 Cache the related posts most_recent_posts
/cc @mattr- is this safe to do, you think? it only happens at render
time...
2014-11-03 22:16:47 -08:00
Parker Moore 817f6cb658 Fix problem where entries weren't stripped of their trailing slashes. 2014-11-03 22:16:47 -08:00
Parker Moore 179b5ab193 Use site.in_source_dir as @mastahyeti suggested 2014-11-03 22:16:47 -08:00
Parker Moore b4a2788626 Just swallow it if there is no content for the excerpt to parse. 2014-11-03 22:16:47 -08:00
Parker Moore 3762878381 Correctly access the StaticFile's site variable. 2014-11-03 22:16:47 -08:00
Parker Moore 9cbc24fce5 More safety. 🔒 2014-11-03 22:16:47 -08:00
Parker Moore 461e16f8bc More tests are passing. Hooray. 2014-11-03 22:15:40 -08:00
Parker Moore 0bc88975c8 More removal of File.join 2014-11-03 22:15:40 -08:00
Parker Moore 98182aab4a Use site.in_source_dir in Collection. 2014-11-03 22:15:40 -08:00
Parker Moore 3a3be7e5a7 Add Site#in_dest_dir 2014-11-03 22:15:40 -08:00
Parker Moore 7e1cc4b684 Add Site#in_source_dir 2014-11-03 22:15:40 -08:00
Parker Moore 0f2a3a606b Append the site to Jekyll.sites upon creation 2014-11-03 22:15:40 -08:00
Parker Moore 314dce62cf Make Site.source and Site.dest "immutable" 2014-11-03 22:15:40 -08:00