Commit Graph

836 Commits

Author SHA1 Message Date
Benjamin J. Balter 1163fa905e Make template site HTML5
It would really pain me if the default Jekyll site were XHTML. That'd be bad for the internet.

Instead, use Twitter Bootstrap as a base (while still keeping @mojombo's origin design), to give users a great initial baseline to build beautiful, simple sites.

Defaults are more than just the starting point. It's what 80% of users are going to use. Look at WordPress and the default theme. May as well lead by example and start the user off right.

* Add Bootstrap base CSS as a better reset and base layer
* Update default layout to HTML5 with boilerplate best practices
* Add title and post date to post.html (rather than including in the post itself)
* Make site title a variable and add to _config.yml
* Add page title to header
* Add default .gitignore to ignore `_site`
* Remove unused `rss.png` and `.gitkeep`
* Add Modernizr for legacy IE support
2013-04-13 13:15:31 -04:00
Benjamin J. Balter 485b37e3d1 move template site to default markdown renderer 2013-04-13 12:41:03 -04:00
Brian Kim 028e580bb8 Remove short-circuits from Site 2013-04-13 12:39:49 -04:00
Brian Kim e7815d873c Add implicit defaults to DEFAULTS 2013-04-13 12:37:38 -04:00
Parker Moore 17f97cdbab Move manual printing to Jekyll.info and Jekyll.warn 2013-04-13 18:22:34 +02:00
Parker Moore c5f6e527b5 Bring Logger and Deprecator into the fold 2013-04-13 18:05:03 +02:00
Parker Moore bc6748f139 Add Jekyll::Deprecator 2013-04-13 18:03:38 +02:00
Parker Moore 61465053eb Add Jekyll::Logger 2013-04-13 18:02:16 +02:00
Parker Moore 891ccbd656 Merge pull request #953 from mojombo/refactor-configuration
Refactor Jekyll Configuration
2013-04-13 07:19:03 -07:00
Parker Moore a971fec801 rescue block for the method and added redcarpet as option for parser 2013-04-13 02:13:50 +02:00
Parker Moore 3bc497c1c9 Moved out conversion logic 2013-04-13 01:55:03 +02:00
Parker Moore 63cdd21353 Move initialization of parsers to separate classes 2013-04-13 01:47:40 +02:00
maul.esel 968f3b0911 allow overriding page.path in YAML frontmatter 2013-04-13 00:05:49 +02:00
Parker Moore 6881d3bfbf Refactored Configuration#config_files 2013-04-12 23:59:37 +02:00
Parker Moore 92db4ed89f Merge pull request #951 from maul-esel/liquid-file-path
Expose file path to Liquid
2013-04-12 14:33:19 -07:00
Parker Moore bd8d271ce3 Moving the backwards-compatibilizing to Configuration#read_config_files. @mattr- 2013-04-12 23:11:38 +02:00
Parker Moore 879b08a0b0 In Configuration#config_files, cascade to the Configuration's value of 'source' before the default 2013-04-12 22:29:52 +02:00
Parker Moore f2f20d18f0 TomDoc Jekyll::Configuration 2013-04-12 21:38:30 +02:00
Parker Moore 810a29c719 Rescue the entire method instead of just a `begin` block 2013-04-12 22:25:58 +03:00
Parker Moore e2967c96cd Jekyll.configuration should use the new Jekyll::Configuration class 2013-04-12 21:20:30 +02:00
Parker Moore 64f224933b Add Jekyll::Configuration 2013-04-12 21:20:14 +02:00
Parker Moore 04fd68a232 Move Jekyll::DEFAULTS to Jekyll::Configuration::DEFAULTS 2013-04-12 21:19:20 +02:00
Parker Moore 0884a52fea Add TomDoc for Jekyll::Command.process_site 2013-04-12 20:01:25 +02:00
Parker Moore 5f54507204 Remove code duplication 2013-04-12 19:35:46 +02:00
maul.esel dc4d7c0bf4 fix path for posts: must include "_posts" 2013-04-12 18:17:57 +02:00
maul.esel d64fd1e8fe expose file path relative to source dir to liquid
Fixes #633.
2013-04-12 17:37:16 +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 2b238786a2 one more indentation fix 2013-04-12 12:05:07 +02: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
Alex Kessinger 14a669530e Fixing tests, and making it more ruby friendly 2013-04-11 10:17:59 -07:00
maul.esel 951ee09a75 remove useless attr_reader for excerpt (is a method now) 2013-04-11 19:05:28 +02:00
maul.esel 654d598fcf rework excerpt to be an accessor method
Instead of setting self.excerpt, make it a method
that returns either the custom excerpt or the pre-
viously extracted excerpt.
2013-04-11 17:13:15 +02:00
maul.esel 069e70d1b3 do not override custom excerpt set in YAML frontmatter
Fixes #933.
2013-04-11 14:25:47 +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 abb8e5039e Merge pull request #413 from sethladd/master
add page variable to liquid custom tags and blocks
2013-04-09 16:54:20 -07:00
Parker Moore 1319b823f8 Release 1.0.0.beta4 2013-04-09 21:31:23 +02:00
Parker Moore 88f92729bc Use paginate_path and don't help too much 2013-04-09 21:00:27 +02:00
Parker Moore 9c296f04a9 Join the path with baseurl in Pager.paginate_url 2013-04-09 20:26:08 +02:00
Parker Moore b9e7a31ab8 Return nil if num_page is nil 2013-04-09 20:25:43 +02:00
Parker Moore e5bf5aa09e Documentation for Pager.paginate_url 2013-04-09 20:25:33 +02:00
Parker Moore b10939912f Add paginator.previous_page_path and paginator.next_page_path 2013-04-09 19:48:41 +02:00
Parker Moore b667a6a1a8 Merge pull request #935 from mojombo/baseurl-normalization
Fix cascade problem with site.baseurl.
2013-04-07 15:19:23 -07:00
Parker Moore dbb3dd3a1a Move port and host configuration options to Jekyll::DEFAULTS so Commander doesn't override in serving awkwardly. 2013-04-07 23:55:04 +02: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 1526aa3b1d Fix cascade problem with site.baseurl. Fixes #931. 2013-04-07 22:47:55 +02:00
Parker Moore ae462afb76 Backwards-compatibility for 'auto'. Fixes #821. 2013-04-07 22:29:30 +02: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
Parker Moore 28097a9ebb Updated version to 1.0.0.beta3. 2013-04-04 16:14:54 +02:00
Parker Moore cf461ea1a5 Merge pull request #909 from x3ro/symlinked-static-files
Fix symlinked static files not being correctly built in unsafe mode
2013-04-03 14:10:35 -07:00
Alexander Ekdahl 8810dc6479 Preloads directory_watcher glob 2013-04-02 17:46:07 +02:00
Lucas Jenss 2c7325223f Fix symlinked assets not being included, even in unsafe mode 2013-03-31 20:49:43 +02:00
Johan Sellström 8d1b6720c3 Added pkpass to the list 2013-03-31 18:22:41 +03: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
Matt Rogers fa39a97bc6 Remove unused code 2013-03-25 21:22:42 -05:00
Aleksey V. Zapparov 196e26b580 Flatten tags and categories lists. Fixes #741. 2013-03-19 23:16:53 +01:00
Parker Moore a72cdc9293 Auto-regeneration fails loudly. Fixes #470. 2013-03-19 22:31:37 +01:00
Parker Moore 6f6ad001d2 Ignore entries if they are directories. 2013-03-19 21:59:06 +01:00
Parker Moore de8f0c986c Update version for 1.0.0.beta2. 2013-03-19 00:08:56 +01:00
Parker Moore 73ca35ee81 Ensure all categories are downcase. Fix for #842. 2013-03-17 23:43:37 +01:00
Parker Moore 9d814a4eb7 Add method String#force_encoding to 1.8.7 2013-03-17 23:35:46 +01:00
Dave Wasmer f7f64576e5 Force encoding of the rdiscount TOC to UTF8 to avoid conversion errors 2013-03-17 22:28:52 +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 7ba5a27a74 Merge pull request #871 from mojombo/gh-pages-mime-types
Use GH Pages MIME types.
2013-03-17 13:22:51 -07:00
Parker Moore 4400e89898 Expect a 'baseurl' to be passed in to Site 2013-03-17 21:18:45 +01:00
Tom Preston-Werner 8c6c33a6c8 Use GH Pages MIME types. 2013-03-17 13:14:35 -07:00
Parker Moore ee697a6308 Add Jekyll::DEFAULTS['baseurl'] and set the default pygments option to _true_ 2013-03-17 21:09:58 +01:00
Parker Moore ebcf3eb385 Merge pull request #869 from mojombo/baseurl-in-liquid
Expose site.baseurl to Liquid templates.
2013-03-17 12:53:27 -07: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 d5ed4fc5d0 Add baseurl to Site attr_accessor list. 2013-03-17 20:42:11 +01:00
Parker Moore eef13d7d43 Expose site.baseurl to Liquid templates. 2013-03-17 17:26:33 +01:00
Daniel Grieve b9cbce5e5f fix regex 2013-03-17 15:04:03 +00: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
Aleksey V Zapparov 66c5ef2556 Fix typos and remove some obtrusive code 2013-03-17 13:42:46 +01:00
Daniel Grieve 22d1fdab54 tie down the regex match on gist filenames 2013-03-17 11:29:42 +00:00
paco 23a01e7766 Patch for multibyte URI problem. Closes #723. 2013-03-16 21:20:11 +01:00
Daniel Grieve 6c5d001986 replace \s with space 2013-03-16 19:20:54 +00: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
Tommy Sullivan caa6a4ebfd Sort instantiated subclasses in Site. 2013-03-16 15:24:34 +01:00
Matt Rogers 10ee5c8999 Remove the duplication when creating Converters and Generators
Encapsulate it in a method and give the method the class to walk the
subclass tree for to create new objects.
2013-03-16 15:20:11 +01:00
Parker Moore 7e1100962c Load in config from --config switch 2013-03-16 14:44:49 +01:00
Parker Moore 8acb1b29bd Using 1.8.7-compliant File.expand_path instead of >1.9 File.realpath 2013-03-16 14:24:34 +01:00
Parker Moore 1d920f52f1 Fix bug where Command.globs didn't delete the destination directory.
There was often a mix between absolute and relative paths and in the
previous version, the destination argument was usually an absolute
path where the glob array (from Dir['*']) was a relative path.
2013-03-16 13:57:28 +01:00
Daniel Grieve 92d9c4301b display single files from gist 2013-03-15 22:37:14 +00:00
Parker Moore 5c35a84662 Updated version and gemspec to reflect 1.0.0.beta1 release 2013-03-14 21:26:06 +01:00
Parker Moore dbc356f9f4 Bump version to 1.0.0.pre. 2013-03-14 21:23:34 +01:00
Daniel Grieve 4be5dfdb9a fix copying of site template files 2013-03-13 21:27:41 +00:00
Daniel Grieve 099fcc27d6 raise ArgumentError if no args. rename sample post 2013-03-13 19:21:11 +00:00
Parker Moore df9964c3b5 Merge pull request #838 from mattr-/dedupe-entry-generation
Remove code duplication during site generation
2013-03-12 11:27:56 -07:00
Parker Moore 2473bdbd7c Merge pull request #847 from mojombo/mime_file
Load in Apache MIME Types
2013-03-12 11:06:26 -07:00
Jonathan Roes 7a86d901f1 Refactor Commands::New a bit and remove scaffold post once copied. 2013-03-12 00:48:22 -04:00
Jonathan Roes b71ec624f8 Add commands/new and scaffold post to gemspec so they get copied over. 2013-03-12 00:47:42 -04: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
Fotos Georgiadis f79662719b Fix indentation. 2013-03-09 15:07:27 +02:00
Parker Moore 524aa1f36a Jekyll::Commands::Serve reads in mime.types file. 2013-03-08 20:12:52 +01:00
Parker Moore 5e6c2f6e4b Added mime.types file from Apache SVN repo. 2013-03-08 20:12:21 +01:00
Matt Rogers 6399ec9b2b Remove duplication when aggregating post information 2013-03-05 19:11:07 -06:00
Matt Rogers 2dd98816d4 Remove duplication when generating list of entries to process
Posts and Drafts share the same logic to get the list of files to
process into objects when generating the site. Factor this logic into
its own method and use it when reading posts and reading drafts.
2013-03-05 19:06:20 -06:00
Aleksey V Zapparov 22dcc4e20f Adds excerpt to posts 2013-03-04 17:13:25 +01:00
larrylv 035bbdf99f Fix typo. 2013-03-04 14:59:34 +08:00
Tom Preston-Werner 3a9ca0a796 Merge branch 'drafts-fixup'
Add a drafts feature. This allows you to place draft posts into an _drafts
folder in the site root while you're working on them, and then request that
they be rendered as normal posts via a command line switch.

Draft files should be named just like normal posts, except they must not
contain the date prefix. When you're ready to make a post live, rename it
with the date and move it to the proper place.

To preview your drafts, run Jekyll with the `--drafts` switch. This will
render all the posts with a date corresponding to the last time the file
was modified.
2013-03-03 18:57:36 -08:00
Tom Preston-Werner b46000f6af Kill unnecessary return keyword. 2013-03-03 18:43:54 -08:00
Parker Moore 0d3ea5b710 Forgot to escape newlines. 2013-03-04 03:41:18 +01:00
Tom Preston-Werner 2b9b613687 Normalize CLI options to match configuration expectations. 2013-03-03 18:23:02 -08:00
Parker Moore 5af8e1f40c Applying a more 'Ruby' style to post_url.rb 2013-03-04 03:20:59 +01:00
Tom Preston-Werner 4caf613be8 Merge branch 'drafts' of https://github.com/scribu/jekyll into scribu-drafts 2013-03-03 12:57:55 -08:00
Daniel Hilgarth 87f6f8c971 Fix invalid ordering of posts published on the same day and move post_url specific comparison of posts where it belongs: Into post_url 2013-03-03 15:36:16 +01:00
Daniel Hilgarth ce8e1afba6 Add support for Ruby < 1.9 2013-03-03 15:12:21 +01:00
Daniel Hilgarth cc83501489 Fix broken post_url with posts with a time in their YAML front matter. 2013-03-03 14:56:18 +01:00
scribu 1a351284ca rename get_base() to containing_dir() 2013-03-03 12:56:12 +02:00
Parker Moore 7258b10f88 We don't need YAML in the new command. 2013-02-28 22:19:38 +01:00
Parker Moore 149b95d767 Typos in sample post. 2013-02-28 22:17:24 +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 bd9a112ff1 Merge pull request #785 from lenniboy/master
Improve debugability of error message for a malformed highlight tag
2013-02-26 16:58:36 -08: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
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 5a9c20983d Rename setup_plugins to plugins_path 2013-02-25 13:20:32 -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
sterebooster 425f466842 'gist' liquid tag by @stereobooster. Fixes #463. 2013-02-24 00:38:19 +01:00
Parker Moore 7457cbae25 Fix issue with watching (auto-regeneration) continuously running if destination is not '_site'. #457. 2013-02-22 00:59:44 +01:00
Parker Moore 5d8e012899 Fixed merge with new log output in lib/jekyll.rb 2013-02-20 23:10:42 +01:00
Parker Moore 9eb79ff135 Improved output for auto-regeneration. 2013-02-20 23:09:54 +01:00
Parker Moore bf79b0ac37 Fixed merge with new log output in lib/jekyll.rb 2013-02-20 23:09:34 +01:00
Parker Moore 11eb1ecae1 Safe loading of files and YAML. 2013-02-10 19:07:38 +01:00
scribu 538c2086a5 whitespace fixes 2013-02-10 04:49:27 +02:00
scribu 3e164d6daf don't check if draft is published or if its date is in the future 2013-02-09 23:48:38 +02:00
scribu 2588d681c9 fix draft filename processing 2013-02-09 23:38:13 +02:00
scribu 78831d94cd don't mess with dir parameter 2013-02-09 23:19:35 +02:00
scribu 642349f797 implement and use Draft.valid? 2013-02-09 22:41:47 +02:00
scribu 1ac46b17c4 Don't require date in draft filenames. 2013-02-09 21:35:41 +02:00
Alexander Ekdahl 4cd7c22ee7 Now uses the more semantically correct AND operator 2013-02-04 22:17:03 +01:00
Alexander Ekdahl 7512e6bb66 Allow symlinked folders in unsafe mode 2013-02-04 17:16:01 +01:00
Parker Moore 28a074ff7a Remove Jekyll::Commands::Migrate 2013-01-31 00:18:22 +01:00
Parker Moore b70c59667c Requiring jekyll-import gem. Printing error and exiting if it does not exist. 2013-01-30 23:43:26 +01:00
Parker Moore cff4ec72ea Using .erb file for the new post 2013-01-30 21:05:52 +01:00
Leonard Ehrenfried a7f0d04bda Improve error message for malformed highlight tags 2013-01-29 12:16:33 +01:00
Parker Moore 704307d7fe Added very basic code snippet example to sample post 2013-01-27 23:30:32 +01:00
Parker Moore bf78fe9b75 Move post scaffold content to a separate method. 2013-01-27 23:23:53 +01:00
Parker Moore a68b67c65e Added newline to New command for stylistic congruence. 2013-01-27 23:21:31 +01:00
Parker Moore ac691a1465 removed related posts segment of scaffold site. 2013-01-27 23:21:02 +01:00
Parker Moore a8671ed52b Using modularized commands (Jekyll::Commands) as per @tombell's latest PR merge 2013-01-27 23:17:45 +01:00
Parker Moore 272dd5ef35 Added the NewCommand class 2013-01-27 23:16:34 +01:00
Parker Moore ce7e307cba Scaffold site, based on @mojombo's site (with permission). 2013-01-27 23:16:34 +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 b736676904 Merge pull request #775 from metamatt/issue773
Address issue 773 (bugs preventing tumblr.rb from running)
2013-01-27 14:06:41 -08: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
Matt Ginzton c95c5e3b7d Use Dir.pwd instead of "." as the source argument to Post.new, since
this has historically supplied an absolute path in this call.
2013-01-25 15:57:45 -08:00
Parker Moore 4041579b70 Merge pull request #777 from mastahyeti/safe_yaml
Safe YAML
2013-01-25 08:22:10 -08:00
Jordon Bedwell 4f7881ba40 Add SVG support to Jekyll/Webrick. Fixes #406. 2013-01-25 06:20:07 +01:00
Ben Toews 1528cfe1cd adding safe_yaml to protect against object instantiation from yaml 2013-01-23 11:30:24 -06:00
Matt Ginzton fbc9d0c663 Fix truncation of overly long post names.
Delete the old truncate_post_name; it was called too late (if url rewriting
is enabled which it is by default), didn't run (it tried to use + to concat
a Fixnum onto a String), and even with those problems fixed, didn't actually
shorten the string enough to use as a pathname.

Instead, apply simple string truncation at the point we generate the slug,
which is used in the filename and is the part that could be unboundedly
long. I arbitrarily chose 200 as the maximum length; even shorter might be
better (really long slugs are just visually ugly); it might also be nicer
to truncate at a hyphen boundary.

This fixes the rest of issue #773 (subissue 4).
2013-01-22 10:25:07 -08:00
Matt Ginzton 863643c7e8 Look for _posts directory relative to cwd, not relative to tumblr.rb.
That's where we put it earlier, so that's where we'll find it now.

This addresses part of issue #773 (subissue 3).
2013-01-22 10:24:33 -08:00
scribu 0ad623fb85 first pass at --drafts flag 2013-01-20 05:23:56 +02:00
Tom Bell 517e6f81d3 Remove new lines between module and class 2013-01-20 00:00:49 +00:00
Tom Bell 2c45150545 Update tag classes moving into a module 2013-01-19 23:50:44 +00:00
Tom Bell 10d980b6e1 Update pagination classes moving into a module 2013-01-19 23:42:40 +00:00
Tom Bell 663a1321d2 Update converter classes moving into a module 2013-01-19 23:07:38 +00:00
Tom Bell 6514fe2d22 Strip extra newlines 2013-01-19 22:38:51 +00:00
Tom Bell e03f48085a Update command classes moving into a module 2013-01-19 22:36:46 +00:00
Parker Moore f231ef7644 Merge pull request #684 from mattr-/issue-680. 2013-01-18 10:28:14 -05:00
Parker Moore 2615291e6d Printing error message in WP.com migrator. #671. 2013-01-17 22:33:37 -05:00
Parker Moore 3bca5c3297 Merge pull request #671 from fzero/master
Rescue from import errors on Wordpress.com plugin.
2013-01-17 19:30:51 -08:00
Parker Moore cd05f6be78 Ensures that categories are Strings before escaping. Fixes #759. 2013-01-17 21:55:01 -05:00
Matt Rogers f460a6cf71 Merge branch 'master' into issue-653 2013-01-16 21:52:32 -06:00
Parker Moore faf5e44c47 Merge pull request #664 from Jashank/faster_lsi
faster_lsi: Massively accelerate LSI performance.
2013-01-16 18:36:01 -08:00
Parker Moore 2e76edd837 Merge pull request #496 from dunsmoreb/issue/481
Truncate post slugs when importing from Tumblr.
2013-01-16 18:34:21 -08: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
7rans e8c74fe7a8 Layouts default to page or post depending upon type. 2013-01-12 13:49:45 -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
Tom Bell 7f072ed578 Merge branch 'master' 2013-01-12 01:18:41 +00:00
edeustace 0fa55418e9 merge lastest from mojombo/jekyll master 2013-01-11 12:23:53 +01:00
Jashank Jeremy 68333cd221 Slight stylistic tweak to LSI initialisation.
Recommended-by: parkr
2013-01-11 20:02:31 +11: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
Parker Moore 6253f79de2 Added space between arguments in Convertible errors 2013-01-10 22:11:13 -08:00
Matt Rogers 151275d09e Add TomDoc 2013-01-10 21:53:21 -06:00
Matt Rogers 92eb926bf8 Look for plugins under the source directory by default 2013-01-10 21:24:28 -06:00
Matt Rogers f3f181484d Merge remote-tracking branch 'upstream/master' into issue-653 2013-01-10 20:41:32 -06:00
Tom Bell e210a0603f Revert "Remove migrators"
This reverts commit b9da30bc8f.
2013-01-11 00:30:17 +00:00
Eric Theise ba48870ead outputting full path when file does not parse 2013-01-10 12:29:04 -08:00
xiaojian cai b3e27f2c5d fixed a syntax error 2013-01-10 19:41:11 +08:00
xiaojian cai c627cd3519 use any? instead 2013-01-10 09:16:09 +08:00
Tom Bell b70b57cb89 Merge branch 'master' into 'jekyll-command-redux' 2013-01-09 23:40:27 +00:00
xiaojian cai 1e892678bc Update lib/jekyll/site.rb 2013-01-09 16:06:43 +08:00
edeustace 6eed91871f Changes based on @mojombo's feedback 2013-01-08 23:17:06 +01:00
xiaojian cai 44822a252e add regexp support for option 'include','exclude' 2013-01-06 21:23:31 +08:00
Tom Preston-Werner dd0e208daa Merge branch 'patch-1' of https://github.com/jlecour/jekyll into jlecour-patch-1 2013-01-03 22:26:09 -08:00
Tom Preston-Werner 4c70c036e7 TomDoc lib/jekyll/post.rb. 2013-01-03 22:20:42 -08:00
Tom Preston-Werner 9328a1a0dd Merge branch 'docs' of https://github.com/icco/jekyll into icco-docs 2013-01-03 22:06:50 -08:00
Tom Preston-Werner 72c8ceba4e Merge pull request #651 from alagu/master
Posterous importer update
2012-12-31 18:24:43 -08:00