dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,175 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

2032 Commits

Author SHA1 Message Date
Jordon Bedwell 908bb2e7af Fix #3970: Use Gem::Version to compare versions, not >. 2015-09-11 14:44:20 -05:00
Alfred Xing 93d282a5c1 Merge pull request #3828 from superlukas/fix-clean-command 
Merge pull request 3828
 2015-09-02 20:22:14 -07:00
Parker Moore 4169075dd1 filters: `where` should compare stringified versions of input & comparator 
Non-string input was being missed as a result of poor comparison.
Converting inputs to strings ensure numerical and boolean values are
properly compared.

Fixes #3911.
 2015-08-25 23:00:58 -07:00
Ben Balter 1eb1f4ea4d add script to vendor mime types 2015-08-24 16:21:50 -04:00
Parker Moore 8927898e1f Merge pull request #3871 from stevecrozz/3870_hook_trigger_interface_change 
Merge pull request 3871
 2015-08-23 12:55:00 -07:00
Parker Moore 44a43b757d Merge branch 'fniephaus-_includes' into 'master' 
* fniephaus-_includes:
  Unify renaming of configuration options to a single method. /cc #3782.
  Make _includes directory configurable; closes #2684
 2015-08-16 13:30:45 -04:00
Parker Moore 399606c544 Unify renaming of configuration options to a single method. /cc #3782. 2015-08-16 13:30:39 -04:00
Nate Berkopec 559cd6c7e7 Future should be set to false in the default config 2015-08-16 13:11:08 -04:00
Fabio Niephaus 2812341c37 Merge branch 'master' of https://github.com/jekyll/jekyll into _includes 
Conflicts:
	bin/jekyll
 2015-08-09 16:22:33 +01:00
Fabio Niephaus ac56e9dd16 Make _includes directory configurable; closes #2684 
and rename `plugins`, `layouts` and `data_source` directories for consistency
 2015-08-09 16:20:58 +01:00
Robert Papp 371ca58e69 Fixes #3776 by changing to the correct name for whitelisting. 2015-08-05 00:20:14 +02:00
Parker Moore 14e6809bcd Merge pull request #3838 from gynter/issue-3836 
Merge pull request 3838
 2015-07-28 11:29:01 -07:00
Stephen Crosby 7c4f319442 #3870 trigger hooks by owner symbol 2015-07-27 16:23:07 -07:00
Florian Weingarten 8bdfdae0ab Fix reading of binary metadata file 2015-07-09 13:40:36 -04:00
Günter Kits b9f8fc1715 Fixes #3836. Fix site template header menu iteration variables 2015-07-06 21:02:56 +03:00
Jensen Kuras f4bbbd6952 Fixed an unclear code comment 2015-07-06 10:43:28 -07:00
Jordon Bedwell 5bf5c36ce0 Close #3833 by removing execute bit. 2015-07-04 04:59:06 -05:00
Jordon Bedwell 3a49770ce2 Merge pull request #3823 from 18F/adapt-static-file 
Adapt StaticFile for collections, config defaults
 2015-07-01 12:06:08 -05:00
Lukas 6d196275fc Add build options (fixes #3744) 2015-06-30 20:53:31 +02:00
Mike Bland 250b6ebb7e Adapt StaticFile for collections, config defaults 
This enables files such as images and PDFs to show up in the same relative
output directory as other HTML and Markdown documents in the same collection.

It also enables static files to be hidden using defaults from _config.yml in
the same way that other documents in the same collection and directories may
be hidden using `published: false`.
 2015-06-29 19:58:27 -04:00
Parker Moore 8c9e9497a2 Release 💎 3.0.0.pre.beta8 2015-06-29 14:33:38 -07:00
Florian Weingarten 3c656ae2ed Remove unnecessary 'ensure' in LiquidRenderer 2015-06-23 21:27:24 +00:00
Parker Moore 5647b91689 Release 💎 3.0.0.pre.beta7 2015-06-18 20:52:40 -07:00
Parker Moore 8b44a7bb42 Merge pull request #3762 from fw42/liquid_profiler 
Merge pull request 3762
 2015-06-16 10:21:33 -07:00
Jordon Bedwell 137efdc9f4 Fix: #3738; Move code wrapper from div to figure. 2015-06-10 15:20:44 -05:00
Florian Weingarten 7bc9e1aae6 Add byte counter 2015-06-07 16:49:22 +00:00
Florian Weingarten 1e9163fdf4 Liquid profiler 2015-06-07 16:38:05 +00:00
Jordon Bedwell e9215ec047 Merge pull request #3732 from jekyll/fix-frontmatter-defaults 
Fix it so that 'blog.html' matches 'blog.html'
 2015-06-06 06:30:43 -05:00
Parker Moore a134e05fda Release 💎 3.0.0.pre.beta6 2015-06-04 16:57:13 -07:00
Alfred Xing bba7870f8b Merge pull request #3717 from alfredxing/regenerator-handle-deleted-files 
Merge pull request 3717
 2015-05-31 11:10:42 -07:00
Seb e68d18c3cc Update link in welcome post to talk.jekyllrb.com 
Previously the link pointed to the jekyll-help repository on github
which no longer accepts issues.
 2015-05-28 21:19:24 +02:00
Jordon Bedwell 14ed5cc954 Fix it so that 'blog.html' matches 'blog.html' 2015-05-25 02:07:21 -05:00
Alfred Xing a2ee820609 Regenerator: handle deleted/renamed/moved dependencies 
Should fix #3716
 2015-05-19 22:47:58 -07:00
Florian Weingarten 376c87b62e Don't crash when reading/writing Marshal 2015-05-19 15:51:55 +00:00
Parker Moore 73db98c244 Release 💎 3.0.0.pre.beta5 2015-05-19 10:54:37 +07:00
Jordon Bedwell 498ea4fd24 Merge pull request #3706 from fw42/marshal_metadata 
Performance: Marshal metadata
 2015-05-18 09:17:42 -05:00
Florian Weingarten 3474481043 Marshal metadata 2015-05-18 14:02:43 +00:00
Florian Weingarten 5928618de1 Performance: Sort files only once 2015-05-18 13:56:56 +00:00
Jordon Bedwell ae11cae659 Fix #3653: Add a doctor helper to test pwd's. 2015-05-17 02:46:40 -05:00
Florian Weingarten 15c4d9bee2 Jekyll::Cleaner#existing_files: Call keep_file_regex and keep_dirs only once, not per iteration 2015-05-11 22:01:10 +00:00
Parker Moore ba12d28fbe Release 💎 v3.0.0.pre.beta4 2015-05-10 01:10:57 -07:00
Parker Moore ce9fcfaebb Merge pull request #3553 from stevecrozz/jekyll-hooks 
Merge pull request 3553
 2015-05-09 23:58:46 -07:00
Florian Weingarten f99abc5314 Cache Document#to_liquid 2015-05-10 03:51:50 +00:00
Parker Moore 4b038259c7 Release 💎 v3.0.0.pre.beta3 2015-05-06 23:19:23 -07:00
Stephen Crosby 79a178f7f1 move document.post_render hook to after render call 2015-05-03 13:53:28 -07:00
Stephen Crosby 736e6a78f1 address code review feedback from #3553 
- change site:reset to site:after_reset
- raise an exception when registering uncallable hook
- set default hook priority at the public API level
 2015-05-02 15:56:19 -07:00
Stephen Crosby 245d9677d7 Refine hook implementation 
- hooks are registered to symbol owners rather than classes directly
- during registration, add the ability to specify owner as an array to
  register the same hook to multiple owners
- add optional priority during registration as a symbol (:low, :normal,
  :high)
- implement hooks for collections as they are in octopress-hooks, aside
  from post_init
 2015-05-01 19:00:37 -07:00
Stephen Crosby 6ca9633354 prototype of jekyll hooks, encapsulated 2015-05-01 14:35:15 -07:00
Bernardo Dias 8546298047 fix collections output, see #2346 2015-04-29 10:49:06 -07:00
Alfred Xing 9ab3c201c8 Remove relative permalinks 2015-04-28 14:03:20 -07:00
Jim Meyer 269662d0f0 DRY config value fetching 
Adds #get_config_value_with_override, refactoring the three fetch
methods to use it.
 2015-04-18 16:59:36 -07:00
Jim Meyer 9c03fc3f27 Set logging to debug when verbose flag is set 
Adds Jekyll::LogAdapter#adjust_verbosity which ensures that --quiet
always wins.
 2015-04-18 16:57:57 -07:00
Parker Moore f908051aa4 mime.types: remove extraneous hyphen before comment 2015-04-14 17:15:08 -07:00
Parker Moore ab83f0bf2e Merge pull request #3649 from schneems/schneems/utf8-myhomework 
Merge pull request 3649
 2015-04-14 16:51:21 -07:00
schneems 701617cb0e Fix header for RSS feeds with UTF8 characters. 
```
$ curl http://localhost:4000/feed.xml -I
HTTP/1.1 200 OK
Etag: 64af8c-2356-552805aa
Content-Type: text/xml; charset=utf-8
Content-Length: 9046
Last-Modified: Fri, 10 Apr 2015 17:17:30 GMT
Server: WEBrick/1.3.1 (Ruby/2.2.1/2015-02-26)
Date: Fri, 10 Apr 2015 17:17:34 GMT
Connection: Keep-Alive
```

Originally contributed to https://github.com/fitztrev/jekyll-utf8/pull/3
 2015-04-14 18:21:25 -04:00
Parker Moore 0072865512 Merge pull request #3629 from justinweiss/lsi_search_on_posts 
Merge pull request 3629
 2015-04-14 13:13:24 -07:00
Parker Moore ff3edbc16b static files mtime liquid should return a Time obj 2015-04-14 11:52:25 -07:00
Alfred Xing 5a60adb6bd Maruku deprecation error message 2015-04-14 10:58:47 -07:00
Alfred Xing ae039663b9 Remove Maruku and references to it 2015-04-14 10:58:47 -07:00
Parker Moore c76c4e478b Convertible#read_yaml should return self.data. 
Broken in 4b108df3ab.
 2015-04-11 15:42:58 -04:00
Parker Moore 4b108df3ab convertible: abort with an error if Page/Post#data isn't a hash. 
when the default_proc was being assigned, it failed if it wasn't a Hash. We
expect data to be a Hash everywhere, so let's freak out if it isn't after
reading and applying the fallback.

Fixes #3643.
 2015-04-10 17:07:14 -04:00
Parker Moore bf98004843 Merge pull request #3608 from nickburlett/patch/incremental-build 
Merge pull request 3608
 2015-04-10 16:51:56 -04:00
Parker Moore eeb13872e3 Merge branch 'delftswa2014-remove-unused-method' 
* delftswa2014-remove-unused-method:
  static_file: extract extname in initializer and save as variable. #3632
  removed unused method StaticFile::extname
 2015-04-10 16:31:26 -04:00
Parker Moore f14af82da5 static_file: extract extname in initializer and save as variable. #3632 2015-04-10 16:31:19 -04:00
Nicolas Hoizey 76416e50e8 Add WOFF2 font format 2015-04-10 00:13:02 +02:00
Martijn den Hoedt f0cac685de removed unused method StaticFile::extname 2015-04-01 12:57:49 +02:00
Justin Weiss fa435fae94 Use `Jekyll::Post`s for both LSI indexing and lookup. 
When looking for related posts, Jekyll was indexing `Jekyll::Post`
objects, but finding related posts based on `Jekyll::Post#content`. This
caused two problems:

1. Ruby 2.2 will warn on == if <=> throws an exception (and future Ruby
versions will surface that exception). Because `String`s can't be
compared with `Jekyll::Post`s, this warning was appearing all the time
while searching for related posts.

2. LSI won't return a post itself when searching for related posts. But
LSI could never tell that we were searching on a post, since Jekyll
passed post content, not a post object. With this fix, we can remove the
`- [post]` from `Jekyll::RelatedPosts#find_related`.

This is a more accurate fix for #3484.
 2015-03-29 23:43:55 -07:00
Jordon Bedwell f75346c799 Merge pull request #3614 from nickburlett/patch/incremental-build-dest-missing 
Incremental build if destination file missing
 2015-03-28 19:26:01 -05:00
Nicholas Burlett 1f8157022a Clean up destination modified check 
Clean up the destination modified check in `source_modified_or_dest_missing?` to be easier to read. Note that it can now return `nil` instead of `false` for an unmodified `source_path` and a `nil` `dest_path`, but in a discussion on 706007ead9 we decided that was okay.
 2015-03-25 08:51:58 -07:00
Martijn den Hoedt d98047ef74 Removed the word 'Jekyll' a few times from the comments 2015-03-25 08:49:05 +01:00
Nicholas Burlett 8f4194eea5 Clean up regeneration missing-destination checks 
Use easier-to-follow checks for missing-destinations in the regenerator.
 2015-03-24 21:21:37 -07:00
Parker Moore e7d0b6c5a5 Merge pull request #3545 from delftswa2014/site_extract_readers 
Merge pull request 3545
 2015-03-23 19:53:07 -07:00
Nicholas Burlett d4b8f0d9dd Process metadata for all dependencies 
When adding a dependency, also add the dependency to the metadata hash.

Addresses part 1 of #3591. Prior to this fix, the regnerator only paid attention the mtime of the first dependency it checked, so for posts/pages with N multiple dependencies (i.e., every layout file used to render them), it continues to regenerate the post/page approximately N times, at which point it's seen all of the dependencies.
 2015-03-22 13:33:12 -07:00
Parker Moore e91527058a Merge pull request #3592 from nickburlett/patch/incremental-build 
Merge pull request 3592
 2015-03-21 19:29:45 -07:00
Nicholas Burlett 706007ead9 Incrementally regenerate missing destination file 
Addresses the third point of #3591, in which the incremental regenerator doesn't notice that destination files have gone missing.
 2015-03-21 19:25:02 -07:00
Martin Jorn Rogalla 63a1ec8949 Made corrections as suggested by @mattr-. 
- Corrected TomDoc, added variables and fixed typos.
 - deprecated_rel_permalink -> relative_permalinks_are_deprecated.
 - Grouped calls together in @reader.read.
 - Removed dynamic and static reader subdirectories.
 - Removed unnecessary move of limit_posts.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-20 12:41:19 +01:00
Martin Rogalla 324748a5a6 Added corrections as suggested by @parkr. 
- Replaced occurrences of #array += with concat
   operations.(performance)
 - Corrected alignment.
 - Removed rebase artifact.

Signed-off-by: Martin Rogalla <martin@martinrogalla.com>
 2015-03-19 14:56:46 +01:00
Nicholas Burlett 15ebf929e1 Use the new clear_cache method 
Instead of assigning `@cache = {}`, clear the cache using `clear_cache`
 2015-03-18 22:30:31 -07:00
Nicholas Burlett adce349d7a Clear the regenerator cache every time we process 
To address part of #3591, clear the regenerator's cache every time the
site is processed. This ensures that the regenerator doesn't incorrectly
believe a file hasn't changed based on stale information.
 2015-03-18 10:27:40 -07:00
Jordon Bedwell e268ee0f33 Whoops, forgot the pre in the beta tag. 2015-03-18 05:25:36 -05:00
Parker Moore eb2fc89776 Correct the semantics of checking for jekyll-paginate 2015-03-16 15:48:50 -07:00
Parker Moore bb57c80478 Perform jekyll-paginate deprecation warning correctly. 
Fixes #3393
 2015-03-16 14:54:31 -07:00
Martin Jorn Rogalla b178358cf9 Merge branch 'master' into site_extract_readers 
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-06 17:28:45 +01:00
Martin Jorn Rogalla 00cdcbc184 Separated some more readers from the main reader.rb file. 
- Draft Reader
 - Collection Reader
 - Page Reader
 - Post Reader
 - Static File Reader

Fixed references and ran tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-06 17:20:25 +01:00
Martin Jorn Rogalla bebd80342e Extracted draft, post reader into external classes. 
Organized the draft, post and layout reader into the *readers* classes.
Fixed all references and ran tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-06 12:39:50 +01:00
Parker Moore 6d9258bcdc Release 💎 v3.0.0.beta2 2015-03-05 13:40:10 -08:00
Matt Rogers 02e98f238e Merge pull request #3520 from delftswa2014/sort-null 2015-03-05 14:35:40 -06:00
Martin Jorn Rogalla 4b8e3cfdbd Moved the in_(source/dest)_dir back to site.rb. 
After carefully looking at these two methods, as of right now they do not
belong in the reader, as they should also be used by the writer. Thus the
decision was made to move them back into the class containing the source
and dest fields, site.rb.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-05 13:34:46 +01:00
ChaYoung You 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
ChaYoung You 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
Parker Moore e229e3285f Merge pull request #3537 from kleinfreund/patch-2 
Removing unused code from post layout
 2015-03-04 18:32:57 -08:00
Will Norris f6f2626828 Merge pull request #3538 from willnorris/permalink 
Improved permalinks for pages and collections
 2015-03-04 15:18:43 -08:00
Parker Moore 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
Martin Jorn Rogalla 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
Martin Jorn Rogalla 9e1cb96a7e Added site reference for encoding configuration. 
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 22:23:47 +01:00
Martin Jorn Rogalla 7114380da7 Added and improved documentation, fixed long method name. 
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 21:37:25 +01:00
Martin Jorn Rogalla 1b796354fb Added documentation, made method private and fixed quotes. 
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 21:10:26 +01:00
Martin Jorn Rogalla f252a82afc Made the Reader responsible for the actual Reading. 
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 21:00:45 +01:00
Martin Jorn Rogalla 2f88a0c0a1 Extracted `read_collections` from site.rb into reader.rb 
- Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 20:55:53 +01:00
Martin Jorn Rogalla 2857350df1 Extracted `read_directories` from site.rb into reader.rb 
- Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com
 2015-03-04 20:51:26 +01:00