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

883 Commits

Author SHA1 Message Date
Parker Moore a30068bf3f
Merge remote-tracking branch 'origin/master' into themes 
* origin/master: (65 commits)
  Update history to reflect merge of #4703 [ci skip]
  Update history to reflect merge of #4712 [ci skip]
  Highlight the test code
  Update history to reflect merge of #4640 [ci skip]
  readded "env=prod"-condition
  Update history to reflect merge of #3849 [ci skip]
  Update history to reflect merge of #4624 [ci skip]
  Update history to reflect merge of #4704 [ci skip]
  Update history to reflect merge of #4706 [ci skip]
  Checks for link file extension in tests
  Updating assets documentation
  Fix test teardown for cleaner.
  Update history to reflect merge of #4542 [ci skip]
  Add explanation of site variables in the example _config.yml
  Use double quotes in the gemfile
  Add test for creation of Gemfile by 'jekyll new'
  Add comment about github-pages
  Update history to reflect merge of #4533 [ci skip]
  Ensure Rouge closes its div/figure properly after highlighting ends.
  Add Site#config= which can be used to set the config
  ...
 2016-03-25 16:30:25 -07:00
Parker Moore 6aae64c985 Update test_theme.rb 2016-03-25 15:22:29 -07:00
Ben Balter 0f90fe67d2 but who will test the testers? 2016-03-25 15:00:42 -04:00
Ben Balter 4a70382d5b test that themes register with sass 2016-03-25 14:48:44 -04:00
jekyllbot 7a4817e55a Merge pull request #3849 from shinkondo/master 
Merge pull request 3849
 2016-03-24 13:54:03 -07:00
jekyllbot da4a664290 Merge pull request #4624 from jeffkole/feature/add-collection-url-tag 
Merge pull request 4624
 2016-03-24 12:50:05 -07:00
Jeff Kolesky 54fcc97725 Checks for link file extension in tests 2016-03-24 08:54:31 -07:00
Shinn Kondo c27c669796 Fix test teardown for cleaner. 2016-03-23 20:37:13 -05:00
jekyllbot 87d0f03f5c Merge pull request #4542 from jekyll/jekyll-new-with-gemfile 
Merge pull request 4542
 2016-03-23 17:49:46 -07:00
Shinn Kondo 01d48320fd Merge remote-tracking branch 'upstream/master' 2016-03-23 19:33:22 -05:00
Parker Moore da35e134f1
Add test for creation of Gemfile by 'jekyll new' 2016-03-23 17:24:38 -07:00
jekyllbot 4ce50e3936 Merge pull request #4533 from hgoodman/feature/show-dir-listing 
Merge pull request 4533
 2016-03-23 17:01:16 -07:00
Tom Fejfar 007b7d45dc
Ensure Rouge closes its div/figure properly after highlighting ends. 
Fixes #4474
 2016-03-23 14:04:11 -07:00
Pat Hawks aeecbd741f
Add test to inspect strings 2016-03-21 15:45:29 -07:00
jekyllbot 848b1358a1 Merge pull request #4491 from jekyll/ignore-tilde 
Merge pull request 4491
 2016-03-20 15:34:35 -07:00
Jeff Kolesky 4b32bd2b13 Updates code styling per PR 2016-03-17 14:26:13 -07:00
Jeff Kolesky f79f9d60a9 Changes `collection_url` tag to `link` tag 2016-03-17 14:01:04 -07:00
Parker Moore 97efa0f0ce Clean up Tags::PostUrl a bit 2016-03-15 16:06:25 -07:00
Saleem Rashid 64e4984ff5 theme: fix invalid theme test, really 2016-03-11 20:59:54 +00:00
Saleem Rashid 7b63c8d201 theme: fix invalid theme test 2016-03-11 20:45:22 +00:00
Ben Balter 0a04932020 remove assets dir from theme fixture 2016-03-11 14:46:05 -05:00
Ben Balter e3c71ea407 Merge branch 'master' into themes 2016-03-11 14:44:44 -05:00
Ben Balter 92168954d2 remove asset support 2016-03-11 14:41:26 -05:00
jekyllbot 9e0ed00a59 Merge pull request #4555 from timwis/patch-1 
Merge pull request 4555
 2016-03-08 16:25:15 -08:00
Ben Balter c86fba6fb3 use /assets for theme assets, not _assets 2016-03-06 15:42:08 -05:00
Ben Balter 8b880cb993 add theme tests 2016-03-05 13:35:52 -05:00
timwis e130a0841f add test to ensure where doesn't match substrings 2016-03-03 15:56:54 -05:00
Jeff Kolesky b80a0cb5ce Adds collection_tag 
This tag mirrors the post_tag functionality but for collections instead of just
posts.
 2016-03-02 14:56:30 -08:00
Parker Moore de8f67c4a2 Fix link issues in the site found by HTML Proofer. 2016-03-01 19:43:22 -08:00
jekyllbot f274179d9b Merge pull request #4618 from spudowiar/fix-test-state-leakage 
Merge pull request 4618
 2016-03-01 11:59:07 -08:00
Saleem Rashid b0c730d278 kramdown: fix state leakage (#4617) in test 
fixes #4250
 2016-03-01 18:41:04 +00:00
jekyllbot c16a2f4d6a Merge pull request #4590 from tonyg/pr4582 
Merge pull request 4590
 2016-02-29 16:12:06 -08:00
jekyllbot cddea273a9 Merge pull request #4557 from timwis/patch-2 
Merge pull request 4557
 2016-02-29 16:08:11 -08:00
jekyllbot ac704b9763 Merge pull request #4545 from jekyll/allow-no-extensions-coll-docs 
Merge pull request 4545
 2016-02-29 15:50:29 -08:00
Tony Garnock-Jones fa1eb68941 Fix for issue #4582, plus simple test 2016-02-26 11:06:03 -05:00
timwis 3fbca47b1a add test for group_by size property 2016-02-25 10:41:23 -05:00
timwis f5f8548eb8 add tests for where arrays 2016-02-25 10:24:47 -05:00
Parker Moore d929242e2b Permalinks which end in a slash should always output HTML 
Duplicates #4493 for 3.1.1.

/cc @jekyll/core
 2016-02-19 15:02:13 -08:00
Parker Moore 3aa80b7d04 Allow collections to have documents that have no file extension 2016-02-19 13:40:17 -08:00
Henry Goodman d387fd0baa Add show_dir_listing option for serve command 2016-02-17 20:54:57 -08:00
jekyllbot db9865ebb6 Merge pull request #4525 from atomicules/capitalize-in-titleize 
Merge pull request 4525
 2016-02-15 20:50:42 -08:00
atomicules e4aa45b03f Fix titleize_slug so already capitalized words are not dropped 
Previously `titleize` used `capitalize!` which has the side effect of
returning `nil` for anything already starting with a capital letter. This
commit changes it to just `capitalize`.

Example, before:

A file "2016-01-01-This-is-a-title-with-Capitals.markdown" would return "Is A
Title With" for `post.title`

Example, after:

A file "2016-01-01-This-is-a-title-with-Capitals.markdown" will return "This Is A
Title With Capitals" for `post.title`

Tests added for `titleize_slug` in test_utils.rb

Fix problem introduced in 67f842546e

References #4525
 2016-02-15 21:22:50 +00:00
Parker Moore a040af37c0 Jekyll.sanitized_path: sanitizing a questionable path should handle tildes 2016-02-07 17:53:26 -08:00
Parker Moore 0e89a37eaf Revert "Jekyll.sanitized_path: sanitizing a questionable path should handle tildes" 
This reverts commit 246e65914f.
 2016-02-07 17:53:09 -08:00
Parker Moore 246e65914f Jekyll.sanitized_path: sanitizing a questionable path should handle tildes 2016-02-07 17:52:15 -08:00
Parker Moore 3373eb6525 EntryFilter#special?: ignore filenames which begin with '~' 2016-02-07 17:28:03 -08:00
jekyllbot 00d753612c Merge pull request #4404 from jekyll/bom-it 
Merge pull request 4404
 2016-01-28 17:20:33 -08:00
Alfred Xing 5fc48ffcb9 Suppress stdout in liquid profiling test 
The test was spewing out some whitespace
 2016-01-27 14:06:48 -08:00
Parker Moore b1868983c7 Add test for Page#dir in :date/nil modes 2016-01-27 08:44:59 -08:00
Parker Moore aad54c9a87 Add Utils.merged_file_read_opts to unify reading & strip the BOM 2016-01-26 17:08:54 -08:00