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