Commit Graph

4265 Commits

Author SHA1 Message Date
Parker Moore b79be6d320 updates to CI page. [ci skip] 2014-06-27 03:53:41 -04:00
Anatol Broder 60bb78e25b Remove wrong statement 2014-06-27 09:44:39 +02:00
Parker Moore 281fb549f8 Update history to reflect merge of #2542 [ci skip] 2014-06-25 16:56:49 -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 912bd84629 A little more work. 2014-06-25 16:17:42 -04:00
Anatol Broder d77078518d Add new page 2014-06-25 16:17:42 -04:00
Parker Moore e310af00b4 Update history to reflect merge of #2532 [ci skip] 2014-06-25 16:14:56 -04:00
Parker Moore cedbdf43ca Merge pull request #2532 from alexmedearis/hl_lines 2014-06-25 16:14:14 -04:00
Parker Moore 911559fe05 Update history to reflect merge of #2544 [ci skip] 2014-06-25 16:13:58 -04:00
Parker Moore c958eae551 Merge pull request #2544 from mikecole/patch-2 2014-06-25 16:13:31 -04:00
mikecole 053ba9a9ca Provide an updated, more comprehensive link...
to Windows installation instructions.
2014-06-25 13:50:07 -05:00
Parker Moore c5aa74f823 Update history to reflect merge of #2490 [ci skip] 2014-06-24 23:04:53 -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 880a503094 Add a test 2014-06-24 20:27:01 +02: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 579d9fc813 Update history to reflect merge of #2477 [ci skip] 2014-06-23 19:11:17 -04:00
Parker Moore dc074fcc50 Merge pull request #2477 from jekyll/serve-skip-initial-build 2014-06-23 19:06:10 -04:00
Parker Moore 5d95267c4a Update history to reflect merge of #2495 [ci skip] 2014-06-23 19:04:40 -04:00
Parker Moore 69fdd45459 Merge pull request #2495 from jekyll/latest-liquid 2014-06-23 19:04:19 -04:00
Parker Moore d3370bf596 Update history to reflect merge of #2493 [ci skip] 2014-06-23 19:03:50 -04:00
Parker Moore d359c63018 Merge pull request #2493 from jekyll/fix-sort 2014-06-23 19:02:54 -04:00
Parker Moore a9376f0a41 Update history to reflect merge of #2511 [ci skip] 2014-06-23 19:01:55 -04:00
Parker Moore e75dcc18f1 Merge pull request #2511 from denilsonsa/patch-1 2014-06-23 19:01:31 -04:00
Parker Moore 7da0cfd0d8 Update history to reflect merge of #2524 [ci skip] 2014-06-23 19:00:38 -04:00
Parker Moore b0e51e2cba Merge pull request #2524 from jekyll/all-html-files 2014-06-23 18:59:57 -04:00
Parker Moore a762956000 Update history to reflect merge of #2531 [ci skip] 2014-06-23 18:59:10 -04:00
Parker Moore e58c1ee306 Merge pull request #2531 from jekyll/merge-post-categories 2014-06-23 18:58:51 -04:00
Parker Moore fd3ceb60c8 Update history to reflect merge of #2535 [ci skip] 2014-06-23 18:56:04 -04:00
Parker Moore 4c04420a51 Merge pull request #2535 from simonsarris/master 2014-06-23 18:54:11 -04:00
Parker Moore e345ceb01a Update history to reflect merge of #2536 [ci skip] 2014-06-21 12:56:09 -04:00
Parker Moore f3e4157698 Merge pull request #2536 from letuboy/master 2014-06-21 12:55:37 -04:00
Paul Henry 1a99b241ca nil parsed in yaml is just a string, should be explicit 2014-06-20 17:13:21 -07: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 a7d20df95a unit tests 2014-06-18 17:29:07 -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 35ed101651 Add test for the concatenation of categories 2014-06-18 18:19:28 -04:00
Parker Moore 99cc12cc0a Merge file system categories with categories from YAML.
Fixes #2527
2014-06-18 18:10:07 -04:00
Parker Moore 21c7f2298a Update history to reflect merge of #2526 [ci skip] 2014-06-17 19:57:26 -04:00
Parker Moore 9da73b5222 Merge pull request #2526 from AlessandroLorenzi/master 2014-06-17 19:57:03 -04:00
Alessandro Lorenzi db97d40f5e Add Piwigo Gallery plugin 2014-06-18 01:16:58 +02: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
Parker Moore df33ff7462 Update history to reflect merge of #2514 [ci skip] 2014-06-14 16:43:02 -04:00
Parker Moore f589e11419 Merge pull request #2514 from penibelst/docs-compress 2014-06-14 16:34:54 -04:00
Anatol Broder db462a181c Add link to jekyll-compress-html 2014-06-14 12:10:09 +02:00
Denilson Sá b42e29c5a7 Fixing tests. 2014-06-13 03:50:02 -03:00