Commit Graph

1640 Commits

Author SHA1 Message Date
Parker Moore d004bc4ea5 Allow Convertibles to be converted by >= 1 converters. 2014-08-06 16:20:24 -04:00
Parker Moore 229cedfc50 Reorganize and update default configuration settings. #2456. 2014-08-06 16:01:47 -04:00
Parker Moore cb671acd0c Merge pull request #2682 from alfredxing/date-parser-util 2014-08-06 15:30:02 -04:00
Parker Moore 21b6a01980 Merge pull request #2693 from ivantsepp/2142_partial_liquid_output_tag_in_include_tag 2014-08-06 15:28:07 -04:00
Parker Moore 5eacc9e831 Merge pull request #2696 from jekyll/jekyll-autogeneration-disabled 2014-08-06 15:27:16 -04:00
Parker Moore f0105158bf Merge pull request #2687 from kleinfreund/sassify_site_template 2014-08-06 15:24:01 -04:00
kleinfreund 8999df2f46 Adding markdown setting back to _config.yml 2014-08-06 21:12:36 +02:00
kleinfreund 441a2496b8 Usind 3 instead of 7 SCSS files now 2014-08-06 19:20:06 +02:00
kleinfreund e5a7f842be Add sentence about jekyll-help repo 2014-08-06 19:11:36 +02:00
kleinfreund 7f92e7ce00 Reverting back to using content box and calc 2014-08-06 11:08:28 +02:00
Parker Moore 4c4f803df2 Remove preemptive loading of the 'classifier' gem. 2014-08-05 16:47:30 -04:00
Parker Moore a27313b1d0 Use helper method #deprecation_message in Deprecator.no_subcommand. 2014-08-05 16:43:38 -04:00
Parker Moore 9fd872e7b8 Notify the user when auto-regeneration is disabled. 2014-08-05 15:55:43 -04:00
Martin Seeler 13425266eb Fixed Typo in error message 2014-08-05 15:37:09 +02:00
kleinfreund 738dd502b4 Adding fill attribute to SVG's as fallback 2014-08-05 09:46:39 +02:00
Ivan Tse 0594adb8fd Allow VARIABLE_SYNTAX to collect partial variables 2014-08-05 01:04:36 -04:00
kleinfreund 020f684093 Adjusting heading hierarchy to reflect site-title change 2014-08-04 09:42:46 +02:00
kleinfreund 101d614351 Removing h1 from site-title 2014-08-04 09:35:18 +02:00
kleinfreund d8c330b215 Removing unused column class 2014-08-03 23:15:22 +02:00
kleinfreund e4029426de Adding and using media-query mixin 2014-08-03 23:07:47 +02:00
kleinfreund 7d865269fd Replacing CSS comments with Sass comments 2014-08-03 23:06:59 +02:00
kleinfreund b24b870ec6 Update welcome post to clarify front matter usage 2014-08-03 23:06:14 +02:00
kleinfreund 74974979ba Reworking site template to utilize Sass 2014-08-03 19:35:43 +02:00
Alfred Xing 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
Parker Moore 81807cb5af Merge pull request #2615 from alfredxing/collections-static-files 2014-08-02 14:44:45 -04:00
Alfred Xing d5322a73bf Move instances of `Time.parse` into a Utils method 2014-08-02 09:38:50 -07:00
Alfred Xing 5fdf637c6a Cache information about document YAML header existence 2014-08-01 22:03:29 -07:00
Parker Moore e75dc74bb1 Merge pull request #2649 from alfredxing/friendly-date-error 2014-08-02 00:06:20 -04:00
Parker Moore 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
Alfred Xing 989d5d357b Use `relative_path` in error message instead of `path` 2014-08-01 21:00:17 -07:00
Alfred Xing 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
Parker Moore 02b60d6d00 Add helpful comments to site template _config.yml 2014-08-01 23:59:57 -04:00
Parker Moore 4ca3fe5137 Merge pull request #2664 from alfredxing/replace-deprecated-methods 2014-08-01 23:27:58 -04:00
Parker Moore 503e54779a Merge pull request #2673 from lucianosousa/patch-1 2014-08-01 23:27:13 -04:00
Alfred Xing 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
Parker Moore bc3b82850d Merge pull request #2659 from alfredxing/front-matter-defaults-defaults 2014-08-01 13:47:42 -04:00
Luciano Sousa 33cd956e4e improving strftime call
set non padded config to avoid parse string type twice
2014-08-01 00:02:41 -03:00
Parker Moore f57f1c7eef Use .scss for site_template styles. 2014-07-31 17:59:27 -04:00
Alfred Xing 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
Alfred Xing 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
Parker Moore dc894e41af Prep for v2.2.0 release. 2014-07-29 19:02:51 -04:00
Parker Moore 3cb2e74b5c Add further testing for Highlight#sanitized_opts 2014-07-29 16:30:44 -04:00
Parker Moore a4c9925e99 Whitelist three Pygments options.
- startinline
- hl_lines
- linenos
2014-07-29 14:20:49 -04:00
Parker Moore 592afc270e Merge pull request #2620 from alfredxing/warn-on-layout-nonexistent 2014-07-29 00:11:41 -04:00
Alfred Xing 2785d702e2 Remove 'none' as a valid layout 2014-07-28 18:35:47 -07:00
Sylvain UTARD 592630d48c Do not forget to downcase the categories here as well 2014-07-27 00:29:31 +02:00
Sylvain UTARD 16dbe54560 When using subdirs to reflect categories, the underlying `categories` attribute was not set 2014-07-24 18:59:26 +02:00
Florian Weingarten 2eb57279fe Remove unnecessary Jekyll::Tags::IncludeTag#blank? method 2014-07-22 21:06:43 +00:00
Alfred Xing 7586538432 Use `is_a?` instead of `class` 2014-07-21 09:23:21 -07:00
Alfred Xing 4bd5614f4c Exclude excerpts from layout checks 2014-07-20 12:57:40 -07:00
Alfred Xing c8e0fcfcdf Fix up errors in CI build 2014-07-20 12:56:54 -07:00
Alfred Xing 7fa30c0dec Add path of file requesting nonexistent layout 2014-07-20 12:17:04 -07:00
Alfred Xing a0d679439f Move layout validity logic to separate method 2014-07-20 10:01:09 -07:00
Alfred Xing 072ddb799f Do the same for documents 2014-07-20 09:18:35 -07:00
Alfred Xing 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
Alfred Xing 475e08bba3 Replace all RubyForge links with new residences 2014-07-16 13:43:09 -07:00
Parker Moore c7cc36abdb Put errors/exceptions into Jekyll::Errors module 2014-07-12 13:47:59 -07:00
Parker Moore a97ae67552 Gracefully require 2014-07-12 13:46:49 -07:00
Parker Moore 4cc6a0f263 Mark certain gems as eventually-non-core. 2014-07-12 13:08:35 -07:00
Parker Moore 685cdbe124 Release Jekyll v2.1.1 2014-07-10 09:40:36 -07:00
Alfred Xing 28131624b8 Don't use old `@url` variable
Fix for #2557
2014-07-07 10:54:19 -07:00
Parker Moore a66d96ce0a Use Jekyll.sanitized_path more. 2014-07-01 18:29:15 -04:00
Parker Moore 8882f4dd14 Merge pull request #2554 from alfredxing/fix-build-tomdoc 2014-06-28 21:37:25 -04:00
Alfred Xing 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
Parker Moore 08d0ff0922 Bump version in gem. 2014-06-28 17:41:29 -04:00
Parker Moore e332197660 Be quiet very quickly. Fixes #2520. 2014-06-28 17:19:40 -04:00
Parker Moore 5f7a3f2b69 Filter out directories from entries in the collection 2014-06-28 16:51:30 -04:00
Parker Moore 02676572dd Allow dots in collection labels. 2014-06-28 16:51:19 -04:00
Parker Moore 12b47cc037 Spike out jekyll <cmd> --watch into a separate gem. 2014-06-27 16:41:10 -04:00
Parker Moore 6a7386e6ba Merge pull request #2432 from jekyll/docs-4-ci 2014-06-27 16:39:19 -04:00
Parker Moore bd4a8c1ce2 Fixes, fixes. 2014-06-27 15:32:16 -04:00
Parker Moore d16f62cb38 Ensure exclude and include arrays are arrays of strings.
Fixes #2542.
2014-06-25 16:56:27 -04:00
Parker Moore cedbdf43ca Merge pull request #2532 from alexmedearis/hl_lines 2014-06-25 16:14:14 -04:00
Parker Moore 20180923cf Merge pull request #2490 from penibelst/deep-defaults 2014-06-24 23:04:38 -04:00
Parker Moore 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
Anatol Broder edbc273829 Use Utils.deep_merge_hashes 2014-06-24 20:24:26 +02:00
Anatol Broder 5f807e7421 Merge deep 2014-06-24 20:20:15 +02:00
Parker Moore dc074fcc50 Merge pull request #2477 from jekyll/serve-skip-initial-build 2014-06-23 19:06:10 -04:00
Parker Moore d359c63018 Merge pull request #2493 from jekyll/fix-sort 2014-06-23 19:02:54 -04:00
Parker Moore e75dcc18f1 Merge pull request #2511 from denilsonsa/patch-1 2014-06-23 19:01:31 -04:00
Parker Moore b0e51e2cba Merge pull request #2524 from jekyll/all-html-files 2014-06-23 18:59:57 -04:00
Parker Moore e58c1ee306 Merge pull request #2531 from jekyll/merge-post-categories 2014-06-23 18:58:51 -04:00
Simon Sarris 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
Parker Moore 5846cc7b70 No private methods in LogAdapter. 2014-06-19 17:11:04 -04:00
Alex Medearis b202b508f2 handles line numbers with more than 1 digit 2014-06-18 17:48:50 -07:00
Alex Medearis 674b540c6f unit tests 2014-06-18 17:27:27 -07:00
Alex Medearis 8b860d3f0e Fixes highlight.rb to correctly parse list values 2014-06-18 17:08:50 -07:00
Parker Moore 99cc12cc0a Merge file system categories with categories from YAML.
Fixes #2527
2014-06-18 18:10:07 -04:00
Parker Moore 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
Denilson Figueiredo de Sá cc734930c6 Making `highlight` behave more like redcarpet
See issue 2510 for details.
2014-06-13 03:31:38 -03:00
Parker Moore d59b2c3ef6 Merge pull request #2419 from jens-na/collection-defaults 2014-06-12 20:38:21 -04:00
Tomer Cohen 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
Parker Moore 50b04cdf92 Use `raise` instead of logging & aborting 2014-06-08 19:33:45 -04:00
Parker Moore ccee1b6a55 Try item#to_liquid before looking at the data 2014-06-08 19:33:37 -04:00
Tomer Cohen 35f5bb0039 Default entries for twitter/github usernames 2014-06-07 11:16:43 +03:00
Tomer Cohen 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
Parker Moore ccf97a62f1 Merge pull request #2459 from ivantsepp/watch_ignore_files 2014-06-06 23:11:44 -04:00
Ivan Tse 6684a8f914 Refactor logic into Command class. Add tests. 2014-06-04 14:23:40 -04:00
Parker Moore 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
Bud Parr 441ac3742c remove extra space 2014-06-02 15:05:03 -04:00
Bud Parr 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
Bud Parr 00ab79b7cf add collection.label to Document#to_liquid 2014-06-01 21:45:23 -04:00
Jens Nazarenus 497c10897f Passes the url to FrontmatterDefaults.all instead of full path 2014-06-01 22:21:31 +02:00
Jens Nazarenus c8786b7b28 Adds default front-matter support for collecitons 2014-06-01 22:21:31 +02:00
Parker Moore 879abc0949 Externalize the {% gist %} tag as the jekyll-gist gem. 2014-06-01 13:18:00 -04:00
Parker Moore 83fb1fd0f6 Merge pull request #2444 from createdbypete/configurable-logger 2014-05-30 18:16:47 -04:00
Parker Moore 041f727fe3 Merge pull request #2438 from pathawks/spicy-feed 2014-05-30 18:02:25 -04:00
Parker Moore 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
Parker Moore e9ac432e0f Merge pull request #2458 from karouf/cleaner-empty-dirs 2014-05-30 11:35:35 -04:00
Renaud Martinet a324eafac4 Using implicit returns to conform to coding style 2014-05-30 08:46:31 +02:00
Ivan Tse 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
Ivan Tse 6ba077cf37 Remove `Command.globs` method
It is no longer being used.
2014-05-28 01:15:07 -04:00
Renaud Martinet 72c410363c Keep parents of directories in keep_files
Closes #1297
2014-05-27 21:11:17 +02:00
Marc Ransome 3b41a44050 Fixing help command in deprecation warning 2014-05-27 18:42:44 +01:00
Renaud Martinet 04baeefaa8 Make sure Cleaner doesn't remove dirs if they only contain subdirs
Closes #2204
2014-05-27 18:06:52 +02:00
Parker Moore 671a62e0fe Merge pull request #2437 from pathawks/date_to_rfc822 2014-05-26 22:06:33 -04:00
Parker Moore 9e4ef3cbff Add the paginator as a plugin: jekyll-paginate 2014-05-26 20:09:33 -04:00
Peter Rhoades 4bdf4197db Rocket style hash and switching integers for Logger severity constants 2014-05-25 23:19:29 +01:00
Peter Rhoades 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
Peter Rhoades 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
Pat Hawks bd836d88af Spice up site_template feed 2014-05-23 09:42:12 -05:00
Pat Hawks 43074632b3 Take advantage of date_to_rfc822
Jekyll has a filter built just for this purpose
2014-05-23 09:34:49 -05:00
Parker Moore b9c3d8ba03 Merge pull request #2373 from tschmidt/handle-categories-in-site-config-defaults 2014-05-21 01:10:37 -04:00
Parker Moore 3c6377d665 Merge pull request #2395 from rdumont/data-subdirectories 2014-05-21 01:09:15 -04:00
Parker Moore 65275e5841 Merge pull request #2431 from jekyll/remove-collections-from-layouts 2014-05-21 01:07:01 -04:00
Parker Moore e37b3ca8e1 Any assets read in as Pages shall not be rendered or layout'd 2014-05-21 00:52:21 -04:00
Parker Moore 5aefaa1c48 Merge pull request #2418 from mathbruyen/collections_permalink 2014-05-20 22:52:29 -04:00
Parker Moore 7e05b6e0b3 Merge pull request #2420 from albertogg/fix-encoding-issue 2014-05-20 22:35:50 -04:00
Parker Moore cbe7e3e80e Don't place asset files or yaml files in layouts
Ref: #2402
2014-05-20 17:11:34 -04:00
Terry Schmidt 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
Parker Moore 395d65454c Merge pull request #2429 from jshawl/code-overflow-fix 2014-05-20 12:12:36 -04:00
Jesse shawl e7c4fa0e5f Prevent code overflowing container 2014-05-20 09:51:57 -04:00
Alberto Grespan 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
Parker Moore 54fba9af4b Merge pull request #2406 from yihangho/config-yaml 2014-05-20 00:15:58 -04:00
Alberto Grespan 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
Yihang Ho 658a4d0b47 Try to load _config.yaml if _config.yml is nonexistent. 2014-05-19 09:06:55 +08:00
Alberto Grespan 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
Mathieu Bruyen 921dbe0547 Override collection url template 2014-05-17 10:40:52 +02:00
Parker Moore 4147e92561 Merge pull request #2417 from jekyll/jekyll-env 2014-05-17 00:53:55 -04:00
Parker Moore 780cff46b3 Add jekyll.environment to site_payload. 2014-05-17 00:38:21 -04:00
Parker Moore 04b0fe0160 Merge pull request #2377 from jekyll/numeric 2014-05-16 03:50:50 -04:00
Jordon Bedwell 1c11afd78d Fix #2413 and setup a Jekyll.env. 2014-05-15 16:28:37 -05:00
Parker Moore ba905a2c18 Merge pull request #2408 from quinn/patch-1 2014-05-15 12:37:56 -04:00
Mathieu Bruyen 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
Quinn Shanahan 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
Rodrigo Dumont 604fb3286c Allow subdirectories in _data 2014-05-11 20:28:49 -03:00
Peter Rhoades 6465cd6446 Setting log_level earlier to silence info level configuration output. 2014-05-11 21:14:10 +01:00
Philipp Rudloff 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
Parker Moore 01c09fd7fa Merge pull request #2345 from penibelst/sort-collection 2014-05-10 15:42:53 -04:00
Parker Moore af9f1e6f48 Accept Numeric values for dates. 2014-05-09 23:11:05 -04:00