Commit Graph

499 Commits

Author SHA1 Message Date
Parker Moore bc3dccf0e5 Merge pull request #1386 from mojombo/disable-excerpts
Disable automatically-generated excerpts with option
2013-08-08 02:39:06 -07:00
Matt Rogers 3c12495b00 Add test for disabled excerpts 2013-08-07 20:22:32 -05:00
Parker Moore 46b0d5037b Add test for Configuration#fix_common_issues 2013-08-06 21:22:08 +02:00
Thomas Torsney-Weir c983f38cc9 add test to demonstrate issue with markdown extension parsing. adding mkd as an extension should not cause mkdn files to also be markdownified 2013-08-06 10:52:24 +02:00
Lucas Jenss f5d0be9660 Move URL generation to own class instead of a module
As suggested by @parkr in #944
2013-07-25 22:44:27 +02:00
Parker Moore 1e7dbcaaff 1.8.7 doesn't support Time.new(*args), so use Time.parse instead 2013-07-22 14:37:51 +02:00
Parker Moore 95491eb7e7 update categories on the new post to not fuck up old numbers 2013-07-22 13:04:07 +02:00
Parker Moore 930aac3b79 Unit tests are simple 2013-07-22 13:03:48 +02:00
Parker Moore 3418a9197a Add categories and tags and test #to_liquid 2013-07-22 12:57:03 +02:00
Parker Moore 1bbacbd396 Dumb tests are helpful anyway 2013-07-22 12:40:49 +02:00
Parker Moore 81a7b22672 Add a new post, bump @site.posts.size 2013-07-22 12:22:47 +02:00
Parker Moore e78d5dd5cb Will now have to render the post, not just transform it. 2013-07-13 16:18:38 +02:00
Parker Moore 253fc8c506 Raise LoadError if the file doesn't exist but do not catch it. :) 2013-07-12 12:22:06 +02:00
Parker Moore 08f6f3c2ed Merge pull request #1204 from maul-esel/include-params2
Support parameters for liquid include tags.
2013-07-09 14:14:40 -07:00
Anand Narayan dfca2c6edc Latest post is chosen first in related posts 2013-07-06 15:11:52 +05:30
Matt Rogers c1850a38f7 Merge pull request #1215 from sanandnarayan/folder_plus
removed cgi unescape in page destination
2013-06-25 06:19:41 -07:00
Anand Narayan 7e79b9df92 added a plus to permalink 2013-06-15 23:18:31 +05:30
Anand Narayan 5c47014c90 removed cgi unescape in page destination 2013-06-15 18:38:14 +05:30
maul.esel 5a990f7854 add unit tests for include tag parameters 2013-06-11 16:11:56 +02:00
Parker Moore 7f10b32431 Fix tests to match new behaviour of Pager.paginate_path 2013-06-09 21:09:06 +02:00
Parker Moore 6e80ba868e Fix tests for Pager. 2013-06-09 18:52:24 +02:00
Parker Moore 81a2d03e58 WIP – fixing tests. 2013-06-09 18:31:09 +02:00
Parker Moore 066912556e Support new private gist syntax. 2013-06-07 00:34:23 +02:00
Matt Rogers 1eab13c068 Merge pull request #1063 from Kelsin/fixing-paginate_path-for-windows
Fixing pagination on windows
2013-05-22 12:26:54 -07:00
Matt Rogers ddba4cde8b Merge pull request #1114 from mojombo/backwards-compatibilize-exclude-include
Backwards-compatibilize 'exclude' and 'include' config tags
2013-05-17 19:56:48 -07:00
Parker Moore 63dc563621 Add tests for exclude/include backwards-compatibility 2013-05-17 21:05:09 +02:00
Sebastian Morr 151ffab6fe Removed space characters in empty lines 2013-05-16 20:27:27 +02:00
Matt Rogers ff600bfcd9 Merge branch 'master' into refactor-related-posts 2013-05-14 21:54:12 -05:00
Parker Moore 179a746091 Merge pull request #1066 from Rowno/data-language
Add a `data-lang` attribute to code blocks
2013-05-12 03:11:11 -07:00
maul.esel eda11aa534 ensure number category is NOT included as fixnum 2013-05-11 18:03:51 +02:00
maul.esel 17cdd59206 adjust tests to new test post 2013-05-10 14:07:43 +02:00
Roland Warmerdam 2a6c722e78 Add a `data-lang` attribute to code blocks 2013-05-10 19:18:13 +12:00
Rafael Revi 528c94e481 new test case: numbers in categories 2013-05-10 02:20:43 -04:00
Matt Rogers 770402d912 Also stub the building of the index
Since we don't actually use the index in getting the related posts from
the tests there's no need to build an index, which can take a long time
if the ruby bindings for the GSL library are not installed.
2013-05-08 22:33:20 -05:00
Matt Rogers 1aa49fa734 Wrap tests around Jekyll::RelatedPosts
This gives me more confidence that we're doing the right things when it
comes to both the LSI and non-LSI cases and prevents regressions.
2013-05-08 21:57:10 -05:00
Christopher Giroir b0c04c89f4 Further clarify what paginate_path should do in the case of directories in the path 2013-05-08 14:08:03 -07:00
Christopher Giroir 09fafd6418 Fixing paginate_path on windows 2013-05-07 23:24:10 -07:00
Parker Moore f69c39c3ac fix up tests for pygments-aware redcarpet 2013-05-08 00:45:42 +02:00
Parker Moore 62b4fd77ac Using modules instead of classes for Redcarpet with/without Pygments. 2013-05-08 00:28:51 +02:00
Parker Moore 5dd3b0b71d Update tests to be compliant with #1037. 2013-05-07 16:45:15 +02:00
Pascal Borreli 29b3dc97f0 Fixed typos 2013-05-06 20:27:00 +01:00
Parker Moore 0b1d22dd61 Merge pull request #1016 from mojombo/fix-pagination
Paginate in subdirectories properly
2013-05-05 14:01:29 -07:00
Parker Moore ce999f12fc Merge pull request #992 from maul-esel/consistent-page.url
add leading slash to page.url and post.url
2013-05-05 13:56:15 -07:00
Parker Moore dcd7b36269 Fixing Pager test for 1.8.7. 2013-05-05 18:08:03 +02:00
Parker Moore 1c146ec649 Instead of just a string name, Pager.pagination_enabled? now accepts a page 2013-05-05 17:26:48 +02:00
Parker Moore 20334aabbe Test all cases for post_url modifications. #998 2013-05-05 15:13:17 +02:00
Parker Moore 9179f56ed7 Quick clean-up from #998. 2013-05-05 14:59:50 +02:00
Parker Moore 290ba131e2 Merge pull request #998 from dhcole/master
Use post's directory path when matching for the post_url tag
2013-05-05 05:16:39 -07:00
Parker Moore c9bd1437a3 Testing parsing of String objects which represent times to Date filters 2013-05-04 14:41:21 +02:00
Dave Cole b1cf3d5dd5 Adjust expected post count for tests. 2013-04-30 12:46:31 -04:00
Dave Cole 805f378586 Add test for nested post_url 2013-04-29 17:48:10 -04:00
uu59 0f52f15cc2 Clean up code #1104 2013-04-29 21:07:46 +09:00
uu59 94756340cd Remove to_i. Let commander gem do it #1004 2013-04-29 15:56:02 +09:00
uu59 20a837d15c Change default value of limit_posts from nil to 0 (see #1004)
Before this commit meaning of limit_posts:
  nil: no limit. generate all posts
  0: raise error
  n ( > 0): generate n posts only
  n ( < 0): raise error
  else: raise error

After this commit:
  nil: same as 0
  0: no limit. generate all posts
  n ( > 0): generate n posts only
  n ( < 0): raise error
  else: almost same as 0 (depend on `to_i` result)
2013-04-29 01:41:22 +09:00
uu59 ad2c706a34 Fix `jekyll serve --limit_posts n` failed 2013-04-28 02:03:08 +09:00
Parker Moore 46ce757b71 Compliant with Ruby 2.0.0 2013-04-26 21:20:48 +02:00
maul.esel 6f28b6d432 fix tests for always-present slash 2013-04-20 13:21:31 +02:00
maul.esel cc5ce06d78 remove tests for default layouts 2013-04-15 17:24:18 +02:00
Parker Moore 5bcce7a1f1 Fix unit tests for Configuration#backwards_compatibilize 2013-04-15 00:41:46 +02:00
Parker Moore ef9d8ddb7d Matching tests to new colorized output 2013-04-13 20:24:45 +02:00
Parker Moore 0f600a322c Added a unit test for Configuration#backwards_compatibilize 2013-04-12 22:42:54 +02:00
Parker Moore 7c7bacffe7 Refactor setup block for test of Configuration#config_files 2013-04-12 22:37:01 +02:00
Parker Moore 0812c1b4c9 Add unit tests for Configuration#config_files 2013-04-12 22:29:27 +02:00
Parker Moore 0c0b13e69b Unit test for Configuration#stringify_keys 2013-04-12 21:56:45 +02:00
Parker Moore 04fd68a232 Move Jekyll::DEFAULTS to Jekyll::Configuration::DEFAULTS 2013-04-12 21:19:20 +02:00
Parker Moore bee8cd9d77 Merge pull request #946 from maul-esel/preserve_excerpt
Preserve 'excerpt` in YAML Front-Matter
2013-04-12 06:24:51 -07:00
maul.esel bcda51f97b do not allow markdown etc. in excerpt
Adjust the tests accordingly. Also
add a message for one of the tests.
2013-04-11 21:02:08 +02:00
maul.esel b10e06ce47 new test: ensure the correct excerpt is exposed to liquid
Also shorten test code a little bit.
2013-04-11 19:33:32 +02:00
Alex Kessinger 14a669530e Fixing tests, and making it more ruby friendly 2013-04-11 10:17:59 -07:00
maul.esel 2792e1e427 fix indentation of test 2013-04-11 16:51:48 +02:00
maul.esel 0113fea7a1 Add tests for using custom excerpt 2013-04-11 14:26:20 +02:00
Alex Kessinger 1e209c9bf3 Upgrade --config to accept an array of files 2013-04-10 11:38:49 -07:00
Alex Kessinger df1efeff25 Accept multiple config files from command line
Parse config as if it can contain multiple references to config files.
This allows you to pass in multiple config files from the command line

Helps with issues #514 and #703
2013-04-10 10:19:48 -07:00
Parker Moore 8bf55ef8fa Merge pull request #928 from danieldriver/ordinal_date
add ordinal date permalink style (/YYYY/DDD/slug.html)
2013-04-07 13:52:30 -07:00
Parker Moore 0f2c9d29ee Merge pull request #875 from mojombo/posts-cant-be-dirs
Directories with valid post names should be filtered out
2013-04-07 12:54:42 -07:00
Parker Moore 7b36d26240 Merge pull request #892 from rafaelrosafu/master
Added date_to_rfc822 used on RSS feeds
2013-04-07 12:43:50 -07:00
Daniel Driver ea753130e6 add ordinal date permalink style (/YYYY/DDD/slug.html) 2013-04-06 08:17:02 -04:00
Parker Moore 483a0b68b6 Merge pull request #890 from zachgersh/abbreviated_month
Added abbreviated month + test.
2013-04-05 09:44:50 -07:00
Lucas Jenss 571bdd686c Move tests for symlinked files to separate test cases 2013-04-01 12:02:15 +02:00
Lucas Jenss 0bebe0f31c Add test for processing of symlinked static files and pages 2013-03-31 20:20:15 +02:00
Rafael Rosa Fu 7879d2e02c Fixed expected output from xmlschema and rfc822 2013-03-29 01:07:47 -04:00
zachgersh e931414b77 Changed to short_month and re-ran tests. 2013-03-27 08:40:58 -07:00
Rafael Rosa Fu 186b68adb0 Added filter date_to_rfc822
According to the W3C RSS Feed Validator, feeds must format dates as described
on RFC-822 to be valid. Refer to their site to get more info:
http://feedvalidator.org/docs/error/InvalidRFC2822Date.html

I also added a couple of missing unit tests to the other date filters
2013-03-27 02:21:48 -04:00
zachgersh 6657f2add9 Added abbreviated month + test. 2013-03-26 23:06:34 -07:00
Parker Moore 8f890cb064 Fix tests that fail due to having a directory that looks like a post 2013-03-19 21:59:43 +01:00
Parker Moore a054ce2788 Merge pull request #861 from danielgrieve/gist-tag
display single files from gist
2013-03-17 13:33:10 -07:00
Parker Moore 0765d07730 Added sanity tests for #869. 2013-03-17 21:15:17 +01:00
Parker Moore 6c1a08ce87 Merge pull request #862 from mojombo/fix-autogen-dest-prob
Stop DirectoryWatcher from watching the destination directory
2013-03-17 12:48:30 -07:00
Parker Moore 936ed1f849 Merge pull request #837 from ixti/feature-excerpt
Adds excerpt to posts
2013-03-17 07:53:41 -07:00
Parker Moore aa7a234c18 Merge master into jekyll-new 2013-03-17 15:45:37 +01:00
Parker Moore 5d34a4c533 Merge pull request #864 from mojombo/prioritize_plugins
Prioritize plugins & DRY subclass instantiation
2013-03-16 12:09:43 -07:00
Parker Moore d091cfe3fc Merge pull request #863 from mojombo/accept-custom-config
Accept custom configuration
2013-03-16 12:07:31 -07:00
Parker Moore 39f144ed01 Newline. 2013-03-16 20:06:50 +01:00
Parker Moore 1d05e0be81 Added tests for generators. 2013-03-16 20:06:40 +01:00
Tommy Sullivan 7425b2c32e Add test to ensure plugins are executed in order of priority. 2013-03-16 15:12:57 +01:00
Parker Moore 9100967ebd Add unit tests for custom configuration. 2013-03-16 14:46:26 +01:00
Parker Moore 52efb71aa2 Added directory_with_contents() to DRY up test code and ensure folders exist in TestCommand. 2013-03-16 14:09:53 +01:00
Parker Moore d93faac3b8 Rudimentary tests for Jekyll::Command 2013-03-16 13:59:59 +01:00
Parker Moore a0c0d983bf Using a test_dir helper method for tests. 2013-03-16 13:59:40 +01:00
Daniel Grieve 92d9c4301b display single files from gist 2013-03-15 22:37:14 +00:00
Daniel Grieve 4be5dfdb9a fix copying of site template files 2013-03-13 21:27:41 +00:00
Daniel Grieve 1ab83ff9e9 fix test to highlight issue with FileUtils.cp_r 2013-03-13 19:55:15 +00:00
Daniel Grieve b306835ce0 Add tests for 'new' command. 2013-03-12 19:38:05 +01:00
Parker Moore 725b127f9b Merge pull request #536 from fotos/fix_page_dir
Added path in url.
2013-03-09 17:07:16 -08:00
Aleksey V Zapparov 22dcc4e20f Adds excerpt to posts 2013-03-04 17:13:25 +01:00
Parker Moore 17c875f6f5 Fixed plugin test error. 2013-03-02 18:51:42 +01:00
Fotos Georgiadis 441eddf1ca Fix pretty url style paths.
Ignore the basename if the page is an index page, preserve it if it's just an
html page and use the full path in every other case.
2013-02-28 03:49:39 +02:00
Parker Moore 63d0eef646 Merge pull request #824 from sinamt/symlinked_folders
Allow symlinked folders in unsafe mode (with tests). Closes #796, resolves #233.
2013-02-26 16:54:52 -08:00
Paul Leitmanis 849c34e913 Add tests for filtering symlink entries when safe mode enabled 2013-02-27 10:39:46 +11:00
Matt Rogers d58859570d Fix up the whitespace.
Remove an extra blank line and fix another whitespace error pointed out
by git diff
2013-02-25 13:24:37 -06:00
Matt Rogers ffc42310b4 Add back a test that was mistakenly removed. 2013-02-25 13:19:45 -06:00
Matt Rogers d2c79a8841 Merge branch 'master' into issue-653 2013-02-25 13:08:23 -06:00
Parker Moore f8a90d711f Using https protocol instead of http. 2013-02-24 01:54:13 +01:00
Parker Moore cdd3c0ef0c Remove 'type' attribute from script tag in gist liquid tag. 2013-02-24 01:30:41 +01:00
Parker Moore 7e7cee6e56 Strip space from the gist number, add test for gist tag 2013-02-24 00:58:13 +01:00
Parker Moore a19bb1815a Fixed merge conflicts in test/test_configuration.rb 2013-02-20 23:13:06 +01:00
Parker Moore c7c0a9432c Updating tests for safe_yaml. 2013-02-10 19:09:36 +01:00
Parker Moore 9bb0bfc0b2 Eliminating migrator tests (in this repo). 2013-01-31 01:19:56 +01:00
Parker Moore 2e73671cf4 Updated Kramdown tests to reflect numeral HTML entities. 2013-01-30 23:25:49 +01:00
Parker Moore 04b60ffe7f Merge pusewicz/bump-gems from #744 2013-01-30 23:20:23 +01:00
Parker Moore b4bea4a586 Merge branch 'code-cleanup' of git://github.com/tombell/jekyll into code-cleanup
Module Cleanup

* 'code-cleanup' of git://github.com/tombell/jekyll:
  Remove new lines between module and class
  Update tag classes moving into a module
  Update pagination classes moving into a module
  Update converter classes moving into a module
  Strip extra newlines
  Update command classes moving into a module

Conflicts:
	lib/jekyll/commands/serve.rb
2013-01-27 23:13:16 +01:00
Parker Moore 409eedafd8 Merge pull request #767 from mojombo/string-categories
Force Categories to be Strings
2013-01-26 13:32:26 -08:00
Ben Toews d82179048e adding files 2013-01-23 11:31:59 -06:00
Ben Toews 1528cfe1cd adding safe_yaml to protect against object instantiation from yaml 2013-01-23 11:30:24 -06:00
Parker Moore 607b4c84fd Only running simplecov if RUBY_VERSION is 1.9 or greater, and COVERAGE env is set to 'true' 2013-01-20 22:16:23 -05:00
Tom Bell 2c45150545 Update tag classes moving into a module 2013-01-19 23:50:44 +00:00
Tom Bell 663a1321d2 Update converter classes moving into a module 2013-01-19 23:07:38 +00:00
Parker Moore f231ef7644 Merge pull request #684 from mattr-/issue-680. 2013-01-18 10:28:14 -05:00
Parker Moore ce798a5956 Added test for all-String categories. 2013-01-17 21:57:21 -05:00
Matt Rogers 5e08cddb98 filter out test files in coverage results 2013-01-16 22:27:23 -06:00
Matt Rogers 00d74fa53f Add SimpleCov to the unit tests 2013-01-16 22:20:34 -06:00
Matt Rogers f460a6cf71 Merge branch 'master' into issue-653 2013-01-16 21:52:32 -06:00
Parker Moore e383bfe65d Merge pull request #743 from mccxj/master
add glob support to include, exclude option
2013-01-12 22:16:07 -08:00
Parker Moore 5a3e05dbff Ensuring that layout is only set to the default value if layout is not specified 2013-01-12 15:31:14 -08:00
Parker Moore e2affb2257 Added passing tests for #616 2013-01-12 00:14:00 -08:00
Parker Moore a05b9159d9 Merge pull request #616 from hokaccha/fix_pygments_opt
fixed pygments linenos options for pygments.rb
2013-01-12 00:11:18 -08:00
Parker Moore d2e750cc74 removed extraneous whitespace in test_site.rb 2013-01-11 15:54:57 -08:00
edeustace 0fa55418e9 merge lastest from mojombo/jekyll master 2013-01-11 12:23:53 +01:00
Piotr Usewicz 9b8b5b2bda Dont test kramdown
It should have it's own tests for that
2013-01-11 11:02:07 +00:00
mccxj 660e5e0e14 Merge remote-tracking branch 'jekyll/master' 2013-01-11 15:45:54 +08:00
mccxj 3cf29eeee2 add Enumerable#glob_include? 2013-01-11 15:33:11 +08:00
Matt Rogers 92eb926bf8 Look for plugins under the source directory by default 2013-01-10 21:24:28 -06:00
Eric Theise a5c908ac3f no good reason for making 'name' an instance variable 2013-01-10 14:13:11 -08:00
Eric Theise cf42c56630 stick to good coding standards 2013-01-10 14:07:10 -08:00
Eric Theise 3e7f00ae19 test the path, not the parts 2013-01-10 13:01:50 -08:00
Piotr Usewicz 5d48c5390d Add test/unit 2013-01-10 20:47:55 +00:00
Eric Theise ba48870ead outputting full path when file does not parse 2013-01-10 12:29:04 -08:00
xiaojian cai adba101734 update test for include,exclude glob support 2013-01-09 16:44:53 +08:00
xiaojian cai 655cf3b3a8 Update test/test_site.rb 2013-01-09 16:23:58 +08:00
edeustace 6eed91871f Changes based on @mojombo's feedback 2013-01-08 23:17:06 +01:00
stereobooster da096f307b Add testcases for YAML syntax error and non UTF-8 encoding 2012-12-30 02:39:02 +02:00
Tom Preston-Werner c23302f4fa Merge branch 'deletion_protection' of https://github.com/jasonroelofs/jekyll into jasonroelofs-deletion_protection 2012-12-26 14:02:41 -07:00
Tom Preston-Werner 3a8ebb4b71 Merge branch 'fix/front-matter-regexp' of https://github.com/zimbatm/jekyll into zimbatm-fix/front-matter-regexp 2012-12-15 22:09:41 -08:00
Tom Preston-Werner 0b62b37122 Remove newline to fix failing Redcarpet test. 2012-12-15 16:34:32 -08:00
Matt Rogers 8fb4e8fcca Convert slashes in titles to dashes when migrating from WordPress
When a post has a title that contains a slash, such as 'This is my cool
blog post part 1/2', convert the slash to a dash so that the post
filename is created correctly.

Fixes issue #680
2012-12-04 20:45:20 -06:00
edeustace 7c800d3b07 Added a configuration variable: keep_files (default: ['.git']), based on this pull request: https://github.com/mojombo/jekyll/pull/556 2012-08-23 12:07:30 +02:00
Tom Bell 7f706f47fc Update redcarpet support to version 2 2012-08-13 15:03:33 +01:00
hokaccha 3d2664d983 pygments options for pygments.rb 2012-08-09 00:34:44 +09:00
Jonas Pfenniger da4e8f2ee1 Front-matter should be at start of file
It's the theme of the moment ; regexp checking.

Just in case we have two line start with --- in the file, we want to
make sure it's not interpreted as a front-matter.
2012-05-25 18:59:26 +01:00
Tom Preston-Werner 8a0fbf02f5 Cleanup for RDiscount TOC support. Closes #333. 2012-04-23 16:15:55 -07:00
Michishige Kaito 6471ebf0ef Fixed helper inclusion in redcarpet test 2012-04-23 15:57:06 -07:00
Michishige Kaito fd5447a6e6 Added a test case for rdiscount toc rendering. 2012-04-23 15:56:46 -07:00
Tom Preston-Werner e29490c1c6 Allow setting of Kramdown smart_quotes. Fixes #482. 2012-04-23 15:34:54 -07:00
Fotos Georgiadis 4090500c5a Added path in url.
Page#dir was returning the wrong dir ('/') for pages in directories.
2012-04-09 03:08:41 +03:00
Jason Roelofs 604b60c9ba Add checks to prevent accidental deletion of the source directory 2012-04-03 22:05:18 -05:00
Jason Roelofs 8368485fa0 Remove deletion of dot files on cleanup.
This is a potentially very dangerous action that's impossible to test that it's correct.
If the '..' check line ever disappears, even running the tests will start deleting
everything accessible on the person's computer.

All dot-files that are generated are already known by Jekyll as either a static file or
a page (yaml front matter), only remove those files.
2012-04-03 21:33:35 -05:00
Tom Preston-Werner 02366ae5ff Merge branch 'PluginsAsArray' of https://github.com/simensen/jekyll into simensen-PluginsAsArray 2012-01-29 12:32:59 -08:00
Beau Simensen e6d89c6a0f More testing, whitespace and comment cleanup. 2012-01-22 22:17:25 -08:00
Beau Simensen dcf546275b Tweaked plugin directory handling, tests. 2012-01-22 22:10:12 -08:00
Tom Preston-Werner 16a4855200 Merge branch 'post_url' of https://github.com/thatguystone/jekyll into thatguystone-post_url 2012-01-22 16:03:10 -08:00
Tom Preston-Werner 65890da3d1 Merge branch 'categories_with_space' of https://github.com/spk/jekyll into spk-categories_with_space 2012-01-21 19:36:09 -08:00
Tom Preston-Werner d0d143452a Merge branch 'master' of https://github.com/laumann/jekyll 2012-01-15 20:39:55 -08:00
Tom Preston-Werner c14eb346a3 Allow [+.#-] in highlight lang shortnames. Fixes #282. 2012-01-15 20:35:09 -08:00
Tom Preston-Werner 89180169a4 Merge branch 'include' of https://github.com/lukebayes/jekyll into lukebayes-include
Conflicts:
	lib/jekyll.rb
	lib/jekyll/site.rb
2012-01-14 19:48:04 -08:00
Thomas Laumann d80c773b01 New solution for passing restrictions to RedCloth - all tests pass with ruby 1.8 (just invoking rake) 2011-11-28 14:05:34 +01:00
Carl Groner 69e7f4abef Add test cases for default values with no explicit config. for `hard_breaks`. 2011-11-03 11:54:49 -07:00
Andrew Stone 5cffe5ecb5 Adding in the ability to link to posts internally. Syntax: {% post_url 2010-07-21-name-of-post %}; useful for: [Some Link]({% post_url 2010-07-21-name-of-post %}) 2011-07-21 19:49:09 -04:00
Laurent Arnoud 1356e75811 Generate escaped url for categories with space.
Space in URLs should be encoded.

Signed-off-by: Laurent Arnoud <laurent@spkdev.net>
2011-07-10 23:56:56 +02:00
Thomas Laumann fccb6c7f74 Merge git://github.com/mojombo/jekyll 2011-06-29 12:07:21 +02:00
Tom Preston-Werner 851172b5ef Replace rdiscount filter with config-aware markdownify. 2011-05-31 14:40:21 -07:00
Tom Preston-Werner cae0eaf19c Merge remote-tracking branch 'mjschultz/master'
Conflicts:
	lib/jekyll/filters.rb
2011-05-30 12:27:11 -07:00
Tom Preston-Werner da9930657e Merge remote-tracking branch 'derekprior/configurable_coverter_file_extensions' 2011-05-30 11:38:59 -07:00
Tom Preston-Werner 2ad0fbc8ff Merge remote-tracking branch 'MattHall/redcarpet' 2011-05-29 21:38:34 -07:00
Thomas Laumann 20d1bd1f10 Merge https://github.com/mojombo/jekyll 2011-05-09 12:01:17 +02:00
Tom Preston-Werner 6a31e650f3 Tests and specs run under 1.9. 2011-04-24 18:39:27 +08:00
Tom Preston-Werner 093a5efbe1 Merge remote-tracking branch 'jbw/ruby-v1.9' into devel 2011-04-23 18:08:34 +08:00
MattHall cf779b2760 Added Redcarpet for MD conversion 2011-04-20 10:04:42 +01:00
Derek Prior d2377b2581 Fixed mistake in default markdown extensions 2011-04-12 17:30:56 -04:00
Derek Prior 5801220a98 Added the ability to configure the file extensions to be processed by each converter. Test cases included. 2011-04-12 17:03:28 -04:00
Thomas Laumann 3f889ef077 added test case to hard_breaks (disable/enable in _config.yml) 2011-03-23 18:17:14 +01:00
Tom Preston-Werner dce4ccc5a4 Better error message for invalid post date. 2011-03-11 17:52:25 -08:00
Michael J Schultz 9e3ad69922 - added rdiscount filter for templating system (like the textilize filter, but for markdown) 2011-03-03 08:14:52 -06:00
lukebayes 717a2540e1 Added support for 'include' configuration parameter. This parameter
should work just like 'exclude', except it gives us the ability
to enumerate any files that should not be ignored - even if they
begin with the dastardly dot or underscore.
2010-12-30 16:41:34 -08:00
Stefan Schüßler 5b680f8dd8 remove orphaned files in destination 2010-12-01 18:04:50 +01:00
Tom Preston-Werner 61acd47ed2 Merge remote branch 'jasongraham/kramdown-support' 2010-11-22 19:26:58 -08:00
Jason Graham f85e229a9e Add support for kramdown HTML converter options
http://kramdown.rubyforge.org/converter/html.html#options

  Example: In the _config.yaml,

  markdown: kramdown

  kramdown:
    auto_ids: true
2010-11-20 17:40:27 -08:00
Jason Graham ac7a0cc95f Add Kramdown support and tests 2010-11-20 17:40:27 -08:00
Tom Preston-Werner f7ab019a39 Merge remote branch 'claco/uri-escape' 2010-11-17 15:30:34 -06:00
Tom Preston-Werner 4afee1bda1 Merge remote branch 'jlecour/master'
Conflicts:
	lib/jekyll/page.rb
2010-11-17 15:25:55 -06:00
Tom Preston-Werner 054b796b9f Merge remote branch 'cblunt/limit_posts' 2010-11-17 14:56:32 -06:00