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
571fb95cc1
Only read in 5 bytes when checking for YAML header.
...
#2211 #2210
2014-04-15 09:48:44 -04:00
29fdc0946a
Use +rb switches when reading in file for checking existence of YAML header.
...
Fixes #2228 .
2014-04-15 09:46:53 -04:00
b0cf022983
Release 2.0.0.alpha.3
2014-04-14 23:17:32 -04:00
5a6f1d42a9
Fix #filtered_entries so it returns a new Array if the directory doesn't exist
2014-04-14 23:03:19 -04:00
696aea211a
Don't gather any entries if the collection directory doesn't exist
2014-04-14 22:56:23 -04:00
a1af95c34e
Clean up some code per @baweaver's suggestions.
2014-04-14 22:46:22 -04:00
ad7efb23e6
Code/docs cleanup, props @baweaver
2014-04-14 22:46:22 -04:00
af61451f87
Use #error instead of #warn when telling the user not to use a custom data source
2014-04-14 22:46:22 -04:00
62551b5ff9
Include data in the array of collections
2014-04-14 22:46:22 -04:00
aa502348e5
Filter entries in the collection per EntryFilter#filter
2014-04-14 22:46:21 -04:00
323ea0ef73
EntryFilter#special? should also check the base name of the entry
2014-04-14 22:46:21 -04:00
f0e68d7d86
Expose collections as site.<collection_name> in Liquid as array of docs.
2014-04-14 22:46:21 -04:00
00ca09a2ea
Add comments for Document
2014-04-14 22:46:21 -04:00
a307aff858
Do not render any asset files with Liquid.
2014-04-14 22:46:21 -04:00
5ae1c34857
Add comments for Collection
2014-04-14 22:46:21 -04:00
be769dcf00
SANITIZE THE collection name plz.
2014-04-14 22:46:21 -04:00
37a7236e20
Homagah it all renders I think.
2014-04-14 22:46:21 -04:00
a15a584136
Don't let that render get you down.
2014-04-14 22:46:21 -04:00
75f49a751e
OMG COLLECTIONS ARE RENDERING CALL THE POLICE
2014-04-14 22:46:21 -04:00
f082eca791
GUYS failing test for rendering
2014-04-14 22:45:20 -04:00
cefe99bed2
Sort the docs based on path
2014-04-14 22:44:29 -04:00
90807ac6e7
DEM TESTS
2014-04-14 22:44:29 -04:00
08162dbb50
Hey girl, i heard you like YAML.
2014-04-14 22:44:29 -04:00
50b46d7bee
OMG it's happening ~*Collections*~
2014-04-14 22:44:29 -04:00
a77c92aebe
Replace load-in of YAML data with Jekyll::Document logic.
...
COLLECTIONS IS COMING
2014-04-14 22:43:09 -04:00
6be33cf6ef
Merge pull request #1492 from maul-esel/publishing
2014-04-14 20:17:01 -05:00
4f66db6c38
Merge pull request #2211 from jekyll/pgp-key-header-frontmatter
2014-04-14 12:59:59 -04:00
b666ac787b
Stricter start of line check via \A
2014-04-11 15:15:37 -04:00
387cf2181a
use regex to verify yaml existence
2014-04-11 08:00:40 -04:00
46a5ab99f9
Support "published: false" for pages
...
Fixes 1034.
2014-04-07 16:22:04 +02:00
3a330dc7fc
Use Publisher instead of Post#published?
2014-04-07 16:20:13 +02:00
26663a6cf9
add the Publisher class to handle publishing logic
2014-04-07 16:17:51 +02:00
91e9ecfa63
Add an --unpublished option to render unpublished posts
...
Fixes #1337 , #469 .
2014-04-07 16:17:12 +02:00
fec6b59950
Use File.exist? instead of deprecated File.exists?
2014-04-06 13:31:34 +02:00
823c863a53
require newline after start of yaml header
2014-04-05 17:34:08 -04:00
955dc38400
Deep merge data overrides into defaults.
2014-04-05 15:42:53 -04:00
09c6ff4f9c
Post#published is no longer a thing.
2014-04-04 15:34:42 -04:00
6bd07501e8
Merge branch 'frontmatter-defaults' of git://github.com/maul-esel/jekyll into maul-esel-frontmatter-defaults
...
* 'frontmatter-defaults' of git://github.com/maul-esel/jekyll:
move self.type to convertible
oops, fix minor indentation quirk
document frontmatter defaults precedence
adjust frontmatter defaults precedence handling
change cucumber feature to test for precedence too
fix frontmatter defaults for custom paths
more robust cucumber features
fix slash handling for paths
move cucumber features to own file
fix minor docs quirk
improve path checking, now using Pathname instead of regex
Add site documentation for the new feature
add inline code docs
improve validation code
fix for Ruby 1.8
Add basic cucumber features for frontmatter defaults
Retrieve frontmatter defaults when retrieved internally
make frontmatter defaults available to liquid
add a class `FrontmatterDefaults` for handling of frontmatter defaults
Add a method to retrieve type to post, page and draft
Conflicts:
lib/jekyll.rb
lib/jekyll/convertible.rb
lib/jekyll/core_ext.rb
lib/jekyll/page.rb
lib/jekyll/post.rb
2014-04-04 15:32:27 -04:00
f3c54fcf50
Merge pull request #2189 from benhanzl/move_rouge_loading
2014-04-02 22:38:05 -04:00
9ace48c835
Merge pull request #2197 from jekyll/plugin-manager
2014-04-02 22:15:40 -04:00
1863057b7e
Ok handle the plugins_path stuff in the PluginManager.
2014-04-02 22:06:38 -04:00
4a4c8846f4
Fetching/determining the plugin path is beyond this it's kind of sad.
2014-04-02 21:59:15 -04:00
8ccdee4035
STRIP ALL THE NEWLINES FROM HIGHLIGHTED CODE ok just the ones at the beginning and end
2014-04-02 14:37:22 -04:00
2a3f0c0ec3
Strip content of the {% highlight %} block
...
A fix for #1801
2014-04-02 14:11:19 -04:00
806f43cdbc
Merge pull request #1568 from nitoyon/url-escape
2014-04-02 14:09:09 -04:00
52ac2b3850
Permit YAML blocks to end with three dots
...
The YAML spec permits blocks to end with three dots (...) in addition to
three dashes (---): http://www.yaml.org/spec/1.2/spec.html#id2760395 . Some
programs that work with Jekyll (e.g., Pandoc) prefer the dots to dashes. This
commit permits the YAML metadata block to end with either dots or dashes. It
includes tests.
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-04-02 14:06:22 -04:00
14d9902586
Merge pull request #2200 from fabianrbz/remove_unnecessary_post
2014-04-01 23:10:37 -04:00
04666cd0cf
remove default post with invalid date
2014-04-01 22:32:12 -03:00
5d761a1c2b
Require 'plugin_manager' in lib/jekyll.rb
2014-04-01 18:44:37 -04:00
f418ea5fc3
Extract plugin management into its own class.
2014-04-01 18:10:51 -04:00
f2ed30dff5
Move rouge loading
2014-03-31 19:48:18 -04:00
a6ab3abbf9
Update site_template/_includes/head.html.
...
* remove `chrome` from `X-UA-Compatible`; it's been discontinued
* remove unneeded end tags
* remove unneeded slash in `canonical` link
2014-03-31 20:38:18 +03:00
8c0e5d8d98
remove duplicate code for tags and categories
...
Previously the `Site#tags` and `Site#categories` actually had the
same structure as a hash returned by `Site#post_attr_hash()`, but
maintained separately. Remove this duplicated infrastructure. For
backwards-compatibility for plugins, provide aliases for them.
2014-03-31 01:02:08 +02:00
e277855eee
Merge pull request #2165 from Zequez/master
2014-03-30 00:19:03 -04:00
840ef35be9
Merge pull request #2175 from jekyll/security-yo
2014-03-29 23:18:07 -04:00
302bc46914
rename variable inside block
2014-03-27 19:53:28 -03:00
adcfde14ed
align 'end' with 'def'
2014-03-27 19:52:52 -03:00
4c5dfa1391
remove unused variables
2014-03-27 19:49:41 -03:00
009e2c200d
Only strip the drive name if it begins the string.
2014-03-27 18:19:35 -04:00
859a615e93
Bump 💎 version to 2.0.0.alpha.2 and release.
2014-03-26 14:04:59 -04:00
5745eb9be8
Added option to force watch to use polling
2014-03-23 01:09:00 -07:00
81e4e1d8f4
add support for unpublished drafts
...
I keep all my ideas for blog posts as drafts in my draft folder. However I'm
only really working on a couple at once. This let's me mark drafts that I'm
not working on right now as unpublished so they don't clutter the site while
I'm checking on the other drafts.
2014-03-22 19:52:10 -04:00
c56ce248c9
Move URL escape to Jekyll::URL
2014-03-21 16:59:25 +00:00
e3e1c11509
Fix Page#url escape
...
Post#url wasn't escaped at all.
For example, when we have a page named 'a#b.html',
we expect its url to be 'a%23b.html',
but it was actually 'a#b.html'.
We now use Jekyll::URL.escape_path and Jekyll::URL.unescape_path.
2014-03-21 16:57:41 +00:00
eebb6414bf
Fix Post#url escape
...
Post#url was escaped using CGI.escape.
When file name contains a space character, its url points to
non-existing URL.
For example, when we have a post named '2014-01-02-foo bar.md',
we expect its url to be '/2014/01/02/foo%20bar.html',
but it was actually '/2014/01/02/foo+bar.html'.
We now define Jekyll::URL.escape_path and Jekyll::URL.unescape_path,
and use them to escape and unescape Post#url
2014-03-21 16:57:40 +00:00
1b8205245e
Went with @stomar's suggestion
2014-03-19 00:49:50 -04:00
63e977721a
Add a message and error out when Pygments returns nil.
2014-03-19 00:48:35 -04:00
d80471c0a3
Merge pull request #994 from stephenmcd/master
2014-03-17 17:45:49 -04:00
de9ce3437d
Protect against nil @lang before fixing for css class names.
2014-03-18 08:41:49 +11:00
e746b3bd5f
Initialize each command in its own class so we can be *magical*.
2014-03-13 14:07:05 -04:00
ac37b8acee
Merge pull request #2122 from XhmikosR/whitespace
2014-03-11 11:10:04 -04:00
553338636b
Trim trailing spaces and convert tabs to spaces.
2014-03-11 07:44:01 +02:00
19dc855551
Properly strip drive name from clean path when sanitizing path.
2014-03-10 14:35:19 -04:00
37c2da5062
Properly clean path for Windows machines which is *nix-compliant.
2014-03-09 21:12:34 -04:00
7787d64bce
Rename those Utils functions.
2014-03-04 15:52:05 -05:00
5e8643d855
Add Utils.stringify_hash_keys
2014-03-04 15:44:53 -05:00
e2af1b547b
Extract core extensions into a Utils module
...
Fixes #2111
2014-03-03 22:13:03 -05:00
0633cbf8fa
Bring in jekyll-sass-converter
2014-02-28 21:20:20 -05:00
9ffb984f37
Sass support should be shipped outside core.
2014-02-28 21:12:00 -05:00
d7598ee9d2
Ensure inputted code is a string.
2014-02-24 17:42:46 -05:00
77f26d5681
Upgrade to guard/listen 2.x
2014-02-24 17:10:43 -05:00
8a0d036b87
Greatly simplify Jekyll's gemspec.
2014-02-24 16:15:51 -05:00
b6f006c152
Merge pull request #2050 from jglovier/master
...
* jglovier-master: (35 commits)
Fix for menu at mobile again
Fix site footer styles on mobile
Fix for menu not working on mobile
dat breathing room tho (expand site width slightly more)
Replace footer github and twitter link text with inline SVG icons
Post content styles for mobile
Replace unicode menu icon with inline SVG
Adds mobile styling for menu at sub 600px viewport widths
🔥 permalink option so default date permalink method is left in tact
For the love of perf, add syntax.css rules to main.css and call only one stylesheet
Adds another placeholder post to illustrate post content styles
Dem new styles tho
Copy tweaks - brevity FTW
Use class instead of id for CSS specificity ❤️
Add link for RSS subscription
Slightly friendlier and personal date formatting; classes for dem styles, yo
Remove to avoid confusion with site.title
demonstrate use of permalink settings
Add site.url for use in head canonical meta and feed.xml template
Add site.description for use in site head document meta, and feed.xml template
...
2014-02-24 16:07:20 -05:00
e2c67e0239
Fix for menu at mobile again
2014-02-24 16:03:39 -05:00
2c100a8e87
Fix site footer styles on mobile
2014-02-24 15:56:49 -05:00
7fbc636824
Fix for menu not working on mobile
2014-02-24 15:42:03 -05:00
57d07469d3
Sanitize paths uniformly, in a Windows-friendly way.
...
Fixes kinda a #1948 thing.
Related to #1946 .
2014-02-23 20:05:23 -05:00
f1c4e247a5
Remove unnecessary references to `self`
2014-02-21 16:27:21 -06:00
bdd35789db
dat breathing room tho (expand site width slightly more)
2014-02-20 20:34:09 -05:00
e0166682da
Sort the static files by relative path before sending to liquid
2014-02-19 14:02:03 -05:00
e3dd908d55
Add StaticFile#to_liquid['extname'] :)
2014-02-19 13:55:58 -05:00
b5a398bdff
Add StaticFile#to_liquid and StaticFile#relative_path
2014-02-19 13:35:13 -05:00
949aa3fc32
Test fetching of static files
2014-02-19 13:16:21 -05:00
6e40338f9e
Expose site.static_files to Liquid
2014-02-19 13:04:33 -05:00
6a6e66bf9e
Merge pull request #2058 from jekyll/layouts-relative-to-config
2014-02-18 01:53:15 -05:00
b68229aa2c
Make LayoutReader#layout_directory public.
...
Since it's being used in a test, let's go ahead and expose it instead of
dealing with using Object#send to send the message along.
2014-02-17 22:13:29 -06:00
6bc4776199
Replace footer github and twitter link text with inline SVG icons
2014-02-17 22:23:30 -05:00
aa4280904a
Post content styles for mobile
2014-02-17 16:58:12 -05:00
1c5ed75e72
Replace unicode menu icon with inline SVG
...
- unicode menu icon doesn’t render pixel crisp (has some
anti-aliasing), whereas SVG renders pixel optimized
- using inline SVG (instead of a referenced, attached file, will save
an http request
2014-02-17 16:52:48 -05:00
893b664f34
Adds mobile styling for menu at sub 600px viewport widths
2014-02-17 16:36:21 -05:00
e5bcddfbe0
Merge pull request #2041 from anthonyjsmith/webrick_index_xml
2014-02-17 16:23:25 -05:00
3e6f2d8cef
🔥 permalink option so default date permalink method is left in tact
2014-02-17 12:42:15 -05:00
1a879a04ab
Add tests for determining source dir
2014-02-16 23:19:03 -05:00
47babef79a
Make the layouts: config key relative to CWD or to Source
...
Fixes #1576 .
2014-02-16 22:42:38 -05:00
ab0ebadee3
Merge master into security-vuln-patches
2014-02-16 22:02:03 -05:00
264dfc164d
When an include cannot be found, only print file path relative to source.
2014-02-16 22:00:33 -05:00
fb8e562123
Merge pull request #2042 from anthonyjsmith/draft-path
2014-02-16 21:36:00 -05:00
c47751148c
Remove executable bits of non executable files.
2014-02-17 01:41:12 +01:00
28554fd307
For the love of perf, add syntax.css rules to main.css and call only one stylesheet
2014-02-15 23:27:34 -05:00
bd80ce4c61
Adds another placeholder post to illustrate post content styles
2014-02-15 23:24:30 -05:00
cac15574e7
Dem new styles tho
...
- Uses new typography, including Helvetica light, larger font-sizes,
and px values
- Wider site width, larger margins, and overall more whitespace
- Responsive down to mobile
2014-02-15 23:21:15 -05:00
1e28eee0c7
Copy tweaks - brevity FTW
2014-02-15 23:17:05 -05:00
6773307237
Use class instead of id for CSS specificity ❤️
2014-02-15 23:16:47 -05:00
a11f01784a
Add link for RSS subscription
2014-02-15 23:16:23 -05:00
e5cf3cbbc1
Slightly friendlier and personal date formatting; classes for dem styles, yo
2014-02-15 23:16:11 -05:00
3d464688fc
Remove to avoid confusion with site.title
2014-02-15 23:15:37 -05:00
8d05a54590
demonstrate use of permalink settings
2014-02-15 23:14:20 -05:00
e398c3b16c
Add site.url for use in head canonical meta and feed.xml template
2014-02-15 23:14:01 -05:00
287851ebb4
Add site.description for use in site head document meta, and feed.xml template
2014-02-15 23:13:43 -05:00
b3a2ea4e3e
Software with Personality™
2014-02-15 23:12:42 -05:00
240bbf4abb
Adds feed.xml file for generating an RSS feed
2014-02-15 23:10:25 -05:00
53ae5a7b0f
Add placeholder About page
2014-02-15 23:09:28 -05:00
1687f0855d
Add placeholder Projects page
2014-02-15 23:09:19 -05:00
16d8d05172
Adds a basic page template
...
Many users moving to Jekyll from other popular blogging options (like
Wordpress) will be used to thinking in terms of pages/posts. Having a
page template like this will be convenient for those users.
2014-02-15 23:07:10 -05:00
fcd2383de3
Refactor post template
...
- add article tags around post content
- creates post header
- add conditionals for extra options in meta
2014-02-15 23:04:44 -05:00
1b54afe67a
remove extra line
2014-02-15 23:03:13 -05:00
d5ea6e47dd
Restructure default template to include page content wrap
2014-02-15 23:02:41 -05:00
8fa48b492e
Footer markup restructuring
...
- rework footer to use columns
- add additional area for generic text
2014-02-15 23:02:04 -05:00
6d4e3f8c72
Refactor header markup
...
- use anchor instead of h1 for site title, for semantic accuracy, and
because post h1’s should be the post title
- implement nav wrapper for nav links
- use div.wrap for design structure
2014-02-15 23:00:37 -05:00
d52b9b7e5b
Remove redundant home link
2014-02-15 22:57:10 -05:00
a1b60430d6
Add canonical meta set with config params for more google ❤️
2014-02-15 22:56:30 -05:00
b9875b7bc8
Add description meta set in config, for teh google ❤️
2014-02-15 22:56:04 -05:00
7b0bf0d85c
Add conditional to default to site.name if no page.title is set
2014-02-15 22:55:14 -05:00
3b97799837
Separate global components into includes for convenience, and to familiarize users with includes structure
2014-02-15 22:53:48 -05:00
699066ef85
Add `.mkdown` as valid Markdown extension
...
GitHub Linguist recognizes `.mkdown` as Markdown, so Jekyll should support it as Jekyll is used on GitHub pages.
2014-02-15 22:01:37 +01:00
86208d8c33
Add index.xml to WEBrick DirectoryIndex
...
Resolves #2040
2014-02-13 23:12:36 +00:00
88e35f0852
Release 2.0.0.alpha.1
2014-02-13 18:02:49 -05:00
ac7bed335a
Merge pull request #1976 from jekyll/fix-pagination-issue
...
Relative posts should never fail to build, even if @dir or @name is nil
2014-02-13 12:39:23 -06:00
83f5b4d93b
Merge pull request #2031 from jekyll/utf8-heart
2014-02-13 12:53:58 -05:00
69dc96dc9f
Removed accidental linebreak
2014-02-13 13:28:11 +00:00
933590b6ba
Added a breakpoint for .site to make it responsive
2014-02-13 13:27:34 +00:00
c58c5b8782
Default to using the UTF-8 encoding when reading files.
...
Fixes #2029 .
2014-02-11 17:48:52 -05:00
18279558da
Update #relative_path for _drafts and add tests.
...
Resolves #2019 . Add new tests for drafts. Also check path variable in
test for posts.
2014-02-11 12:48:34 +00:00
56a633ae95
Update Jekyll version to latest released.
...
Latest release can be found on the v1-stable branch.
2014-02-09 18:44:30 -05:00
dd3018ce02
Merge pull request #1988 from jekyll/maruku-to-kramdown
2014-02-08 17:07:54 -05:00
22f2001ff5
Set default markdown converter to Kramdown
...
- Update default markdown converter in docs for configuration
- Update tests so they are in line with Kramdown output
- Add deprecation message to when config is built
2014-02-08 13:17:46 -05:00
1176fc6f57
Give File.join the strings from the array
2014-02-08 00:38:59 -05:00
c36a6d3e0d
Wrap the LayoutReader in the Jekyll module
2014-02-06 23:07:38 -06:00
833b40095f
Rename `with` to `within`
...
Thanks @parkr
2014-02-06 23:07:11 -06:00
fd92820b03
Remove Site#read_layouts
2014-02-06 22:46:09 -06:00
70ecef0094
Sort methods from most important to least important
...
This idea is based on the concept of a newspaper. The most important
things such as the headlines and the major details of the story at the
top. This translates to code in that the public API and the more
important private methods are at the top of the file. The more detailed
information (or methods, in the code) are further down, so that if
you've gotten all you need out of the code up to a certain point, you
don't need to keep reading anymore.
2014-02-06 22:22:06 -06:00
c5b81d580b
Refactor the LayoutReader class
2014-02-06 22:22:06 -06:00
f581940c71
Create a LayoutReader class to read layouts
2014-02-06 22:22:06 -06:00
f638fb1784
Merge master into security-vuln-patches
2014-02-06 17:21:54 -05:00
5edb4c6bfd
Merge pull request #1982 from dtao/safe-yaml-no-clobber
2014-01-31 06:48:16 -08:00
baabe7eb7e
DRY up code, props @tamouse
2014-01-30 22:03:10 -05:00
2b973468bf
Merge pull request #1991 from jekyll/coffeescript
2014-01-30 18:39:40 -08:00
509e2181de
sync mime types to GitHub
2014-01-26 12:15:15 -06:00
fdbfd719ca
Add CoffeeScript converter.
2014-01-25 20:38:51 -05:00
4a769dbf5f
Optimize Post#{next,previous}
...
Use object equality for comparisons rather than Comparable#==,
which in turn uses Post#<=>, which is slow.
This yielded a 3x performance improvement for `jekyll build`
on a large site (1m6.467s -> 0m19.532s).
2014-01-24 17:17:41 -08:00
5b7a53b543
Merge pull request #1932 from jekyll/sass
2014-01-24 15:18:06 -08:00
c9a3c40f83
fixes based on @mattr-'s notes
2014-01-24 12:19:19 -05:00
774bf96c61
Merge master into sass
2014-01-24 12:17:35 -05:00
4f0b1bdf6d
switched from YAML.safe_load* to SafeYAML.load*
2014-01-23 17:25:17 -08:00
98857832cd
Merge pull request #1931 from liufengyun/published
2014-01-22 05:38:04 -08:00
606c525099
Relative posts should never fail to build, even if @dir or @name is nil
...
Fixes https://github.com/jekyll/jekyll/issues/1963
2014-01-21 23:50:20 -05:00
22e1e5f28c
make sure pages with published being false are not generated
2014-01-19 09:52:19 +08:00
4c140efba8
fix full path leak to source directory when using include tag
2014-01-15 21:36:35 +01:00
e3be74e376
sanity check for pages permalink traversal
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
a8dd34420b
Prevents disclosure of file existence
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
c84cb5c007
escape relative post permalinks, cleanup
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
a799e41b70
patch symlink vuln and properly test
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
323d14845f
rebreak tests, move sanitization closer to write
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
9b3068c15d
url escape before sanitizing
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
4afe39e461
Allow caching in unsafe mode, but disable in safe mode.
2014-01-12 21:36:08 -08:00
4784d1de18
Build Sass configuration options.
2014-01-12 21:30:30 -08:00
22d4e2aa90
Consolidate into one master 'Sass' converter.
2014-01-12 21:30:29 -08:00
daa0b76484
Allow users to specify options for Sass.
2014-01-12 21:30:29 -08:00
4da7223831
Fixes for Sass/SCSS converters.
2014-01-12 21:30:29 -08:00
824a84ef2a
Add support for Sass and SCSS.
2014-01-12 21:30:29 -08:00
6f394e82b5
Rename read_things to read_content.
2014-01-11 15:29:22 -06:00
d96165e3c4
Merge pull request #1916 from jekyll/gitignore-excludes
2014-01-11 10:37:31 -08:00
5a52986db0
Use 'Forwardable' module to pass along some attribute calls to @post
2014-01-10 22:54:06 -08:00
331c7adc08
Move #glob_include? from core_ext to entry_filter
2014-01-08 20:24:21 -08:00
3d67cdc150
Cast to string before duplicating.
2014-01-05 11:02:03 -08:00
35868807c1
Ensure leading slashes in path matching.
2014-01-05 10:54:52 -08:00
42fc5e9ee7
Excludes should be relative to the site source
2014-01-05 10:45:42 -08:00
883e16acde
Merge pull request #1910 from pborreli/typos
2014-01-04 08:12:20 -08:00
a33e86630d
Merge pull request #1899 from soimort/preview-404
2014-01-04 08:04:20 -08:00
bdda3a8ef6
Fixed typos
2014-01-04 14:17:38 +00:00
6ca731c13b
Use idiomatic #is_a? method instead of #class ==
2014-01-03 21:23:02 -08:00
39e4d6b3ba
add where filter to filter arrays of objects
2014-01-03 21:23:02 -08:00
99b36c7c30
Routing 404 errors to custom 404 page for development server
2014-01-03 03:23:46 +01:00
fdcf1f4526
Add --quiet flag
2014-01-01 18:50:27 +02:00
012387396a
Merge pull request #1859 from robin850/rouge
2013-12-30 22:45:07 -06:00
a2fd8ba7c3
Merge pull request #1849 from afeld/sort-attributes
2013-12-30 20:31:45 -08:00
791c6d815d
Merge pull request #1825 from arika/smallfix_post_url_tag_behavior_for_invalid_names
2013-12-25 22:32:50 -08:00
1a3a607fcf
Merge pull request #1831 from jekyll/default-maruku-fenced-code-blocks
2013-12-25 22:14:23 -08:00
6e8f31f406
Merge pull request #1841 from jens-na/include-variable-liquid-filters
2013-12-25 22:11:33 -08:00
ebaa484294
Merge pull request #1866 from colindean/patch-2
2013-12-25 22:06:34 -08:00
ab95cca434
Add TomDoc for Jekyll::Converters::Markdown#allowed_custom_class?
2013-12-26 00:33:34 -05:00
7b9984699c
Fix error in exception message in Markdown Converter [ci skip]
2013-12-26 00:14:24 -05:00
60b43104ee
Extract checks for acceptable custom markdown processors to method.
...
We should probably write more about what it does and how it works in a TomDoc block above.
@envygeeks, want to give that a shot?
2013-12-26 00:02:56 -05:00
a206dc1a8f
Use downcase.
2013-12-25 23:55:20 -05:00
c70350e275
Merge branch 'steal-envygeeks-custom-markdown-processors' of git://github.com/gjtorikian/jekyll into gjtorikian-steal-envygeeks-custom-markdown-processors
...
* 'steal-envygeeks-custom-markdown-processors' of git://github.com/gjtorikian/jekyll:
Depend on Jekyll.logger.error, not $stderr
Allow custom Markdown processors.
New is implied by `raise`, 2nd is the message.
Use $stderr, not STDERR, $stderr points to STDERR.
2013-12-25 23:52:50 -05:00
31bebf0f9e
Depend on Jekyll.logger.error, not $stderr
2013-12-25 19:36:49 -06:00
c759a7a75f
Allow custom Markdown processors.
2013-12-25 19:36:25 -06:00
626d54a812
New is implied by `raise`, 2nd is the message.
2013-12-25 19:36:25 -06:00
4d017b4fed
Use $stderr, not STDERR, $stderr points to STDERR.
2013-12-25 19:36:25 -06:00
036cbda2f6
Require at least 1.3.0 for Rouge
...
Rouge 1.3.0 introduced a `rouge_formatter` helper which is handy to
overwrite the formatter default when using the Redcarpet plugin so let's
require this version at the very least.
An abort statement will be thrown when the installed version is not
correct.
2013-12-25 18:06:29 +01:00
9d5785cead
Merge pull request #1847 from schneems/schneems/better-bat-time-error
2013-12-24 11:05:34 -08:00
88686e759e
Add `path` to required methods
...
The error messages in this module call `#path`, but the module does not require the `path` method to be implemented. This change documents that classes which include `Convertible` must define `path`.
See #1846 for discussion.
2013-12-23 12:56:02 -05:00
3ca2cb0119
Fix various typos and improve the doc
2013-12-23 13:03:29 +01:00
cab9047de1
Set the wrap option to false when using Rouge
...
Since Rouge yields the pre tag with a class attribute but we don't want
it, we should set the wrap parameter to false when instantiating a new
formatter object.
Also use Rouge::Formatter#format instead of #render which is deprecated
and will be removed in the near future.
2013-12-23 13:03:24 +01:00
fa8618879d
Merge remote-tracking branch 'upstream/master' into sort-attributes
2013-12-22 19:31:56 -05:00
bd442680ea
Rely on the Redcarpet plugin instead of hard-coding
...
To avoid code duplication and have to keep tracking of the API change of
Rouge, let's rely on the Redcarpet plugin and customize the output on
our needs.
2013-12-22 18:45:46 +01:00
4bf716c2ad
Set highlighter to pygments when upgrading
...
In case you are upgrading from 1.4.2 to 2.0 and the pygments option is
set to true, then the highlighter option will be set to pygments
automatically.
2013-12-22 18:45:46 +01:00
0831d2b0f8
Add support for the Rouge syntax highlighter
...
By setting the `highlighter` setting to `rouge` you can now easily
highlight your code with it instead of relying on Pygments. However,
Jekyll doesn't depend on Rouge explicitly, you will need to install it
or add it to your Gemfile.
The documentation has been updated accordingly.
2013-12-22 18:45:40 +01:00
92064134d6
Rename the pygments option to highlighter
...
Rename the pygments configuration option to highlighter to allow
different highlighters in the future. For now, the allowed values are
`pygments` and `null`.
It's now more straightforward to plug another syntax highlighter.
2013-12-22 12:45:15 +01:00
2bfafb3b33
make non-data properties/methods accessible to Liquid
...
per https://github.com/jekyll/jekyll/pull/1849/files#r8490593
2013-12-22 03:38:32 -05:00
c2b750448e
allow data attribute access by Liquid on Convertible items
2013-12-19 17:14:51 -05:00
10ee83d680
edited raise message when validating included file
2013-12-19 18:23:21 +01:00
3c1d45f45f
Sort pages by name by default
...
The order that files are returned differs across operating systems, so
ensure that they're being sorted after the fact.
2013-12-19 01:02:25 -05:00
22017d085b
Better error message when time is not parseable
...
Give the full path of the file that cannot be parsed so the user can locate it easier. Follow up the error message with helpful instructions: they can resolve the error by fixing the date or excluding the file or directory from being processed.
2013-12-18 16:14:21 -06:00
43ef9a2e4f
variables in include tag with filters
2013-12-17 23:51:52 +01:00
ecab2eb473
made error description more helpful
2013-12-17 10:57:12 +09:00
1ebce26881
Default Maruku fenced_code_blocks to ON.
...
Extends https://github.com/jekyll/jekyll/pull/1799
2013-12-15 16:08:21 -05:00
9d259fe315
added error description for invalid post name
2013-12-15 17:18:11 +09:00
a5545d5bad
post_url tag raises ArgumentError for invalid name
...
Using post_url tag with invalid name raises TypeError.
It should raise ArgumentError and should display detail of the error to
fix the error.
2013-12-14 22:30:22 +09:00
6195192bcf
mojombo/jekyll ~> jekyll/jekyll
2013-12-11 17:44:33 -05:00
39b6fe732f
Merge pull request #1780 from mojombo/kill-1-8
2013-12-11 06:08:10 -08:00
6efb726e2b
Merge pull request #1805 from ivantsepp/scaffold_vertical_scrollbar
2013-12-10 20:58:45 -08:00
a7d4ee8bfb
Merge pull request #1799 from konklone/maruku_fenced_code_blocks
2013-12-10 20:30:44 -08:00
b18f6505dd
Remove margin-top of `.site` to prevent collapsing margins.
2013-12-10 18:39:16 -05:00
a70726e554
Merge pull request #1788 from mojombo/group-by-filter-2
2013-12-10 08:48:44 -08:00
afe9387578
condensing code slightly
2013-12-10 11:04:04 -05:00
ed82098162
Merge pull request #1796 from mojombo/fix-fetching-things
...
Reject nil entries in Site#read_things
2013-12-09 18:23:19 -08:00
695e5bbc40
move EntryFilter class from global namespace into Jekyll module
2013-12-09 23:06:27 +01:00
063111737c
Refactor data/[] fetching of item property.
2013-12-09 12:59:43 -05:00
bf9cf5340d
Reject nil entries in Site#read_things
2013-12-09 12:46:57 -05:00
14418f74ae
in-progress patch for maruku and fenced code blocks
2013-12-08 22:37:46 -05:00
381ab4e71b
Implement group_by Liquid filter & tests.
2013-12-08 01:16:48 -05:00
601f89d4d1
Remove File.read_with_options patch to allow 1.9 and 1.8 to behave the same
2013-12-08 00:50:12 -05:00
d130fd13dc
Remove Ruby <1.9 core extensions
2013-12-08 00:47:44 -05:00
b58cd5c132
Merge pull request #1657 from mojombo/safe-whitelist
...
A gem-based plugin whitelist for `safe` mode
2013-12-07 21:41:55 -08:00
350c9b3ab5
bump the version number in the code
2013-12-07 17:59:16 -06:00
362d28f11d
Merge pull request #1779 from mojombo/no-duplication
...
Refactor post and draft object creation
2013-12-06 20:58:24 -08:00
9f1593299a
Merge pull request #1775 from Ivoz/maruku
...
Update to maruku 0.7
2013-12-06 20:56:52 -08:00
6a13f7dd57
Modifying enumerator for 1.8.7
2013-12-06 01:28:21 -05:00
e69d77b4df
Refactor post and draft object creation
...
De-duplicate object creation between posts and drafts. Inject the name
dependency through a parameter
2013-12-06 01:28:21 -05:00
e91db82d26
I mean the argument and the local variable should be the same thing
2013-12-06 01:07:34 -05:00
f0fbc8f356
Refactor conditions for allowing plugins into a new method: Site#plguin_allowed?
2013-12-06 00:26:44 -05:00
249b13a98a
Hm, shouldn't need that call to 'rescue' in Site#whitelist
2013-12-06 00:24:59 -05:00
5c9f9a4de8
The whitelist should be an array (not a file)
...
Default to `[]` if the key’s value is falsey
2013-12-06 00:23:22 -05:00
f1869cda98
Merge branch 'master' into frontmatter-defaults
2013-12-05 19:29:57 +01:00
960e01cba8
move self.type to convertible
2013-12-05 09:14:31 +01:00
4a2e5af52e
Merge pull request #1682 from envygeeks/patch-1
...
Sort plugins so people can have "load orders".
2013-12-04 18:40:04 -08:00
052a577938
Merge pull request #1765 from mojombo/tomlify
...
Add support for TOML config files
2013-12-04 18:28:20 -08:00
5ed9d21ec7
Remove extraneous newlines from XHTML output
2013-12-05 12:04:55 +11:00
b637420373
Merge pull request #1755 from gregkare/more_trailing_whitespace
...
Remove trailing whitespace
2013-12-02 12:35:06 -08:00
63122fdafc
add a space between "find" and "an"
2013-12-01 19:11:16 -05:00
b8bbc6e08b
require the TOML gem, idiot.
2013-11-29 23:33:38 -05:00
22b95aee38
Give that LoadError a good message.
2013-11-29 23:33:25 -05:00
1e32af47a6
Better config file parser error if it's not there.
2013-11-29 23:22:13 -05:00
51706e8da7
Parse TOML or YAML in Jekyll::Configuration.
2013-11-28 22:11:56 -05:00
91a4c5611e
Prep for the 1.3.1 release
2013-11-26 20:27:27 -06:00
eceebb23a6
Pagination generator should have :lowest priority
2013-11-26 12:45:00 -05:00
ce8e271b5d
Remove trailing whitespace
2013-11-25 13:31:53 +01:00
c5533e9016
restrict rescue-clause in IncludeTag#render
...
As it previously enclosed the whole method, it also
wrapped file validation errors, which is not meant to be.
Fixes #1745 .
2013-11-22 06:58:52 +01:00
3888a24068
output including file for include tag error
2013-11-21 22:03:39 +01:00
dfffc2e72a
Use Pathname#to_s instead of Pathname#to_path
...
Fixes #1723 .
2013-11-16 13:12:59 -05:00
5e0af84993
fix include tag: don't store variable value
...
This fixes the bug reported in #1495 (comments).
2013-11-14 20:53:59 +01:00
615d49ed66
Remove Site.whitelist attribute.
2013-11-04 23:24:21 -05:00
a4b9bab1dc
Add --whitelist flag and internal logic
2013-11-04 23:24:21 -05:00
480e35037b
A start at a gem-based plugin whitelist for Pages.
2013-11-04 23:24:21 -05:00
6791f9fc12
Use the new `EntryFilter` class in `Site`
2013-11-04 21:35:53 -06:00
63713799cd
Extract Site#filter_entries into its own class
2013-11-04 21:35:13 -06:00
65653fed84
Bump version to 1.3.0
2013-11-03 21:48:34 -06:00
50fabc7b37
Update implementation of listen for v1.3.x
2013-11-01 23:16:04 -04:00
7a1f63d994
Sort plugins so people can have "load orders".
...
This allows for people to do something like "_plugins/1-autoload-global.rb" and have it load first and so on making it much easier to organize code and have a "header file" that does all the requiring up front if it's needed for all plugins.
2013-10-31 07:12:54 -05:00
9f63ddb4db
Prepare for a 1.3.0.rc release
2013-10-28 20:26:36 -05:00
3ab9841272
Fix 1.8.7 syntax errors.
2013-10-28 14:03:34 -04:00
f697d12027
Merge pull request #1651 from liufengyun/jsonify
...
support jsonify filter
2013-10-23 20:50:14 -07:00
2287eed0c6
Merge pull request #1589 from dchest/better-watch
...
Replace directory_watcher with listen.
2013-10-23 22:38:56 -05:00
23ad7fa4bd
Merge pull request #1557 from mojombo/require-gems-plugins
...
Add `gems` for better plugin management
2013-10-23 07:39:43 -07:00
f971aebfb1
support jsonify filter
2013-10-22 23:52:22 +08:00
12ba0a541c
Update listen to ~> 2.0.
2013-10-18 11:04:54 +02:00
0e784596a5
Merge pull request #1543 from maul-esel/fix-coderay
...
Add tests for special handling of kramdown's coderay options
2013-10-17 06:35:43 -07:00
c2aa26280c
extract pages.any?... in own method
2013-10-17 15:17:58 +02:00
f0aac30491
remove duplicated render code for posts and pages
2013-10-17 12:07:30 +02:00
7232948b62
simplify relative permalink deprecation
2013-10-17 12:06:21 +02:00
2b275ef192
oops, fix minor indentation quirk
2013-10-15 14:38:45 +02:00
dd851943c0
adjust frontmatter defaults precedence handling
...
Before, the bottom-most default set had highest precedence. Instead,
now the set with a longer i.e. more specific path has precedence and
sets with a type setting have precedence over those without one. In
case of equal precedence the bottom-most still wins.
2013-10-15 14:18:44 +02:00
20ea0c8d56
Merge branch 'master' into frontmatter-defaults
2013-10-14 19:44:06 +02:00
699eeba9f0
fix frontmatter defaults for custom paths
...
The Page#path or Post#path can be overriden by by a frontmatter
setting. This causes path-based frontmatter default detection to
fail. Add test to demonstrate this and fix it.
2013-10-14 19:16:53 +02:00
67a451ea84
fix slash handling for paths
2013-10-14 18:43:12 +02:00
0761769dda
Merge pull request #1615 from benbalter/downcase-lexers
...
Downcase lexers before passing to Pygments
2013-10-10 18:48:00 -07:00
87ef39aeb0
Add support for use of folders inside _layout path, closes #1622
2013-10-08 14:19:12 -03:00
844cc615e4
actually downcase lexer
2013-10-06 15:55:16 -04:00
9ff245dbdb
clean up comments to be more concise/uniform
2013-10-05 13:20:30 -04:00
d5f137bc86
downcase lexers before passing to Pygments
2013-10-05 11:26:26 -04:00
310688297b
I guess we'll wait until v2.0 to switch to absolute permalinks.
2013-10-04 15:03:05 -04:00
bf1d9a79c4
Add support for gem-based plugins.
2013-10-04 14:45:28 -04:00
b00849544b
fix error with variable as file name
2013-10-04 19:12:29 +02:00
fef96d95e1
Merge pull request #1495 from maul-esel/variable-include
...
Variable {% include %}
2013-10-04 05:42:27 -07:00
76ada8c672
output correct path in case of liquid error in layout
...
As with includes, an error in a layout was reported on the
page that used the layout. Fix this by passing on the path
of the layout that is rendered.
2013-10-04 00:07:50 +02:00
809ab5e355
Move catching of liquid errors in include tags
...
The previous code only caught render-time errors. This change
makes it catch parse-time errors as well, such as unknown tags.
2013-10-03 23:56:58 +02:00
92750c3cfd
Add parenthesis to the call for super
2013-10-02 21:51:32 -05:00
7a4ea086a1
Output path in case of render error in included file
...
Fixes #1591 .
2013-10-01 23:02:50 +02:00
623fa14b3c
Include tag: provide path in case of render error
2013-10-01 22:54:39 +02:00
2138dfc0ac
Fix code to allow dots in variables
2013-10-01 22:31:11 +02:00
a93795bcc0
implement variable retrieval in include tag
...
Fixes #1464 .
2013-10-01 22:28:45 +02:00
9d4f9169e9
Merge pull request #1514 from maul-esel/tag-errors
...
Consistent error handling in Liquid tags
2013-09-30 20:54:42 -07:00
cb4d15561c
Merge pull request #1003 from liufengyun/data-sources
...
support data sources
2013-09-30 20:47:57 -07:00
760cbc7f91
Autoload yaml files under _data directory
...
The jekyll engine will autoload all yaml files(ends with .yml or .yaml)
under _data. If there's a file members.yml under the directory, then user
can access contents of the file through site.members.
2013-10-01 11:23:33 +08:00
58cab6b050
Handle destinations outside of source.
2013-09-30 05:55:38 +02:00
dfaf1f45cc
Remove require 'pathname': already included.
2013-09-30 05:11:15 +02:00
8fe25a6958
Replace directory_watcher with listen.
...
Directory_watcher consumed ~25% CPU on big Jekyll projects (depending on
the number of watched files), since it polled for changes every second.
Listen is easier on CPU, as it uses directory change notifications
provided by OS (currently OS X and Linux), falling back to polling when
they are not available.
2013-09-30 04:33:04 +02:00
924285695c
Print server address when launching a server.
...
Related to: https://github.com/mojombo/jekyll/issues/1583
2013-09-28 19:18:36 -04:00
27347596ad
Merge pull request #1449 from shigeya/config-encoding-and-yaml-opts
...
Adding "encoding" configuration (4th version)
2013-09-23 19:30:44 -07:00
c78c4159c0
Merge pull request #1571 from mojombo/non-destructive-array-concat
...
Use + instead of Array#concat
2013-09-23 07:16:41 -07:00
Sylvain UTARD
Florian Weingarten
Alfred Xing
Parker Moore
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
Pat Hawks
Terry Schmidt
Jesse shawl
Alberto Grespan
Yihang Ho
Mathieu Bruyen
Jordon Bedwell
Mathieu Bruyen
Quinn Shanahan
Rodrigo Dumont
Philipp Rudloff
Ben Balter
Aaron Broder
Gabe Ortiz
Matt Rogers
TheTomThorogood
Valery Tolstov
XhmikosR
John Piasetzki
John Piasetzki
Robin Dupret
maul.esel
Marcus Stollsteimer
Lincoln Mullen
Fabian Rodriguez
Ben Hanzl
Zequez
Daniel Schauenberg
nitoyon
Stephen McDonald
Joel Glovier
Corey Ward
Markus Roth
Zlatan Vasović
Anthony Smith
Josh Brown
Aziz Shamim
John Firebaugh
Dan Tao
liufengyun
Andy Lindeman
Pascal Borreli
Mort Yao
Ahmed Hazem
Garen Torikian
Colin Dean
Aidan Feldman
schneems
akira yamada
Eric Mill
Christoph Schiessl
Persa Zula
Matthew Iversen
David Sawyer
Greg Karékinian
Dmitry Chestnykh
Juan Ignacio Donoso
Brice