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
880a503094
Add a test
2014-06-24 20:27:01 +02: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
579d9fc813
Update history to reflect merge of #2477 [ci skip]
2014-06-23 19:11:17 -04:00
dc074fcc50
Merge pull request #2477 from jekyll/serve-skip-initial-build
2014-06-23 19:06:10 -04:00
5d95267c4a
Update history to reflect merge of #2495 [ci skip]
2014-06-23 19:04:40 -04:00
69fdd45459
Merge pull request #2495 from jekyll/latest-liquid
2014-06-23 19:04:19 -04:00
d3370bf596
Update history to reflect merge of #2493 [ci skip]
2014-06-23 19:03:50 -04:00
d359c63018
Merge pull request #2493 from jekyll/fix-sort
2014-06-23 19:02:54 -04:00
a9376f0a41
Update history to reflect merge of #2511 [ci skip]
2014-06-23 19:01:55 -04:00
e75dcc18f1
Merge pull request #2511 from denilsonsa/patch-1
2014-06-23 19:01:31 -04:00
7da0cfd0d8
Update history to reflect merge of #2524 [ci skip]
2014-06-23 19:00:38 -04:00
b0e51e2cba
Merge pull request #2524 from jekyll/all-html-files
2014-06-23 18:59:57 -04:00
a762956000
Update history to reflect merge of #2531 [ci skip]
2014-06-23 18:59:10 -04:00
e58c1ee306
Merge pull request #2531 from jekyll/merge-post-categories
2014-06-23 18:58:51 -04:00
fd3ceb60c8
Update history to reflect merge of #2535 [ci skip]
2014-06-23 18:56:04 -04:00
4c04420a51
Merge pull request #2535 from simonsarris/master
2014-06-23 18:54:11 -04:00
e345ceb01a
Update history to reflect merge of #2536 [ci skip]
2014-06-21 12:56:09 -04:00
f3e4157698
Merge pull request #2536 from letuboy/master
2014-06-21 12:55:37 -04:00
1a99b241ca
nil parsed in yaml is just a string, should be explicit
2014-06-20 17:13:21 -07: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
a7d20df95a
unit tests
2014-06-18 17:29:07 -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
35ed101651
Add test for the concatenation of categories
2014-06-18 18:19:28 -04:00
99cc12cc0a
Merge file system categories with categories from YAML.
...
Fixes #2527
2014-06-18 18:10:07 -04:00
21c7f2298a
Update history to reflect merge of #2526 [ci skip]
2014-06-17 19:57:26 -04:00
9da73b5222
Merge pull request #2526 from AlessandroLorenzi/master
2014-06-17 19:57:03 -04:00
db97d40f5e
Add Piwigo Gallery plugin
2014-06-18 01:16:58 +02: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
df33ff7462
Update history to reflect merge of #2514 [ci skip]
2014-06-14 16:43:02 -04:00
f589e11419
Merge pull request #2514 from penibelst/docs-compress
2014-06-14 16:34:54 -04:00
db462a181c
Add link to jekyll-compress-html
2014-06-14 12:10:09 +02:00
b42e29c5a7
Fixing tests.
2014-06-13 03:50:02 -03:00
cc734930c6
Making `highlight` behave more like redcarpet
...
See issue 2510 for details.
2014-06-13 03:31:38 -03:00
11f9c22e56
Update history to reflect merge of #2419 [ci skip]
2014-06-12 20:38:50 -04:00
d59b2c3ef6
Merge pull request #2419 from jens-na/collection-defaults
2014-06-12 20:38:21 -04:00
116c00595c
Update history to reflect the closing of #2504 . [ci skip]
2014-06-12 00:40:54 -04:00
8fb29a3af3
Bump pygments.rb to 0.6.0.
...
Closes #2504 .
2014-06-12 00:40:15 -04:00
202c459413
Update history to reflect merge of #2485 [ci skip]
2014-06-09 18:54:24 -04:00
dd3e9806af
Merge pull request #2485 from tomer/patch-2
2014-06-09 18:53:50 -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
1005976a22
Bump to the latest Liquid version, 2.6.1
2014-06-09 02:18:25 -04:00
504f30e045
Badger badger badger badger [ci skip]
2014-06-09 02:17:29 -04:00
808f5dc452
Update history to reflect merge of #2494 [ci skip]
2014-06-08 22:11:12 -04:00
b7d7f6d877
Merge pull request #2494 from penibelst/remove-coveralls
2014-06-08 22:11:01 -04:00
Parker Moore
Anatol Broder
Paul Henry
Simon Sarris
Alex Medearis
Alessandro Lorenzi
Denilson Sá
Tomer Cohen