Commit Graph

813 Commits

Author SHA1 Message Date
Parker Moore 6b9ef70d7b Merge pull request #1037 from djui/patch-1
Add newer `language-` class name prefix to code blocks
2013-05-07 07:41:08 -07:00
Matt Rogers 39d33b48b0 Fix the index build with LSI 2013-05-07 06:58:54 -05:00
Parker Moore d0a9948eed Let Commander handle bad args after printing of deprecation warning. Fixes #1040. 2013-05-07 13:15:03 +02:00
Parker Moore a0ad8a4031 Don't print deprecation warning if no arg is specified. Fixes #1041. 2013-05-07 13:10:29 +02:00
Uwe Dauernheim 3770bcbdb7 Use newer `language-` class name prefix
This change makes it partly possible to use Jekyll+RedCarpet+Prism.js without using a plugin.

Another change will respect Jekyll's `pygments` configuration option and not render the code block using Pygments. Together, these two changes allow using prism.js with Jekyll out of the box.
2013-05-07 02:33:58 +03:00
Pascal Borreli 29b3dc97f0 Fixed typos 2013-05-06 20:27:00 +01:00
Pascal Borreli 410e5912a2 Fixed html 2013-05-06 20:26:39 +01:00
Parker Moore c7b707cdfd Ignore --help and --version in Deprecator. Fixes #1030 2013-05-06 20:17:28 +02:00
Parker Moore 4d9d6b689b Cleaning up the site template CSS. 2013-05-06 01:00:00 +02:00
Parker Moore 06beb4b72b Bump version for 1.0.0. 2013-05-05 23:02:45 +02: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 50d66831ff Merge pull request #964 from benbalter/html-template-site
Make Template site HTML5
2013-05-05 12:05:47 -07:00
Benjamin J. Balter 8ec08fceb6 Downgrade default site template for Internet exploder
Swap `<header>` and `<footer>` tags to `<div>`s, so we can support IE without the need for an html5 shim.
2013-05-05 14:28:58 -04:00
Parker Moore 050e982006 Add extra question to ensure that the index.html file is in thepagination path's directory 2013-05-05 17:26:29 +02:00
Parker Moore ea71036e8c Paginate in subdirectories properly. Fixes #878. 2013-05-05 15:40:13 +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 1b994a9682 Merge pull request #1015 from mojombo/loose-pygments-dep
Loosen Pygments Dependency
2013-05-05 04:48:37 -07:00
Parker Moore dcf3911176 Merge pull request #1014 from mojombo/string-times
Parse strings into Time objects for date-related parsing
2013-05-05 04:42:26 -07:00
Parker Moore ca888cad76 When pygments is required after Jekyll::Logger is required, its internal require to Ruby's stdlib Logger class chokes. This is an ugly-ass work-around. 2013-05-04 15:31:02 +02:00
Parker Moore 3feb18bb56 Redcarpet Parser requires pygments 2013-05-04 15:29:43 +02:00
Parker Moore 3c218d2dcd Only require pygments where it's needed. 2013-05-04 15:04:57 +02:00
Parker Moore 67aaada839 Clean up some copy in the limit_posts error handling. 2013-05-04 14:57:27 +02:00
Parker Moore 7554c4ce61 Parse strings into Time objects for date-related parsing. Fixes #997. 2013-05-04 14:01:44 +02:00
Parker Moore c32b570114 Checking the arguments to ensure we have a subcommand before proceeding. (#1008) 2013-04-30 22:17:22 +02:00
Michael Klishin 82ec02905e Catch all exceptions, not just StandardError descendents
We've hit a few edge cases in Liquid/Markdown rendering
with http://clojurewerkz.org documentation sites.
They resulted in exceptions Jekyll silently swallowed because
they were not StandardException subclasses.
2013-04-30 23:33:08 +04:00
Parker Moore 7efd0a8d11 Merge pull request #1004 from uu59/fix_limit_posts_from_cli
Fix `jekyll serve --limit_posts n` failed
2013-04-30 06:53:05 -07: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
Parker Moore b4b66d5713 Merge pull request #1001 from mojombo/refactoring-convertible
Refactoring Jekyll::Convertible
2013-04-28 16:43:38 -07: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
Parker Moore f7fde70f5f 'The Best of Both Worlds,' à la @chad's comment 2013-04-28 15:21:17 +02:00
uu59 ad2c706a34 Fix `jekyll serve --limit_posts n` failed 2013-04-28 02:03:08 +09:00
Parker Moore 5f13e00791 Comments for Convertible.render_all_layouts and Convertible.render_liquid 2013-04-26 21:09:02 +02:00
Parker Moore fcbab9a3ca Post#is_published ~> Post#published? 2013-04-26 21:00:47 +02:00
Parker Moore f7841d1713 Remove unnecessary self.tags.flatten! in favour of a one-line sol'n. 2013-04-26 20:59:54 +02:00
Parker Moore 422a4bd5cd Renamed tag- and category-instantiation methods 2013-04-26 20:25:07 +02:00
Parker Moore 6d9845a58b Refactor Post category instantiation 2013-04-26 20:23:58 +02:00
Parker Moore 482986e346 Refactored setting of Post.published flag 2013-04-26 20:21:17 +02:00
Parker Moore 266a52b161 The call to Post#read_yaml was in an unnecessary begin...rescue block. 2013-04-26 20:09:18 +02:00
Parker Moore 09c1c01d07 Refactor Post#related_posts to build the index in a different method 2013-04-26 20:05:52 +02:00
Parker Moore ffa93c22f1 Refactor Post#to_liquid 2013-04-26 20:03:57 +02:00
Parker Moore 29a1c18300 Refactoring Jekyll::Convertible 2013-04-26 19:36:52 +02:00
Dave Cole fc09ac4862 Use post's directory path when matching for the post_url tag 2013-04-25 13:58:05 -04:00
Parker Moore 61c24c601a Add UTF-8 encoding where we read in YAML so it reads in UTF-8 characters properly. Fixes #836. 2013-04-25 02:15:25 +02:00
Parker Moore 24aabbe05f Moving comparison for PostUrl tag to the PostComparer class 2013-04-22 12:57:52 +02:00
maul.esel d73841c961 always ADD a leading slash to page.url or post.url 2013-04-20 13:15:40 +02:00
maul.esel c6df2e150a remove leading slash from page.url and post.url 2013-04-19 16:37:48 +02:00
Parker Moore ba64a9fe30 Fail if destination directory for jekyll new exists and is not empty. Fixes #981. 2013-04-16 18:24:10 +02:00
Benjamin J. Balter 11419868dc CSS reorganization
1. Fix regression on s/.footer/footer/
2. Fix whitespace and tabbing
3. Reorganize properties more logically
2013-04-16 09:48:18 -04:00
Parker Moore 6ed41e373c Remove code duplication: #write in Page and Post is the same. 2013-04-16 02:55:31 +02:00
Parker Moore c0c0150bb5 Release 1.0.0.rc1 2013-04-16 00:47:31 +02:00
Parker Moore 82f32d5c02 Merge configuration properly. Closes #978. 2013-04-16 00:41:10 +02:00
Benjamin J. Balter 55b890b407 Move site title to H1 tag, wrap header in header tag. 2013-04-15 16:50:01 -04:00
Benjamin J. Balter 223dbdc155 86'd conditional IE classes 2013-04-15 13:37:05 -04:00
Parker Moore e7546a98f6 Remove unnecessary override of #read_yaml in Page. 2013-04-15 19:24:23 +02:00
Benjamin J. Balter 14ca57893f 86'd Chrome Frame in template site 2013-04-15 12:04:27 -04:00
maul.esel b7064a4bc3 remove 'post' and 'page' default layouts 2013-04-15 17:24:09 +02:00
Parker Moore b4f68baafb Jekyll.set_timezone accepts just the timezone, not the config 2013-04-15 15:39:36 +02:00
Parker Moore c0a2d0f888 Fixed syntax error 2013-04-15 00:42:13 +02:00
Parker Moore b249289b9d Set the timezone for the process 2013-04-15 00:42:13 +02:00
Parker Moore d33f45ff05 Merge branch 'master' of github.com:mojombo/jekyll
* 'master' of github.com:mojombo/jekyll:
  Print deprecation warnings for 'server', 'watch' and 'auto' when loaded from files. Fixes #972
  Fixes multiple config loading. Closes #973. Rel: #945.
2013-04-15 00:32:17 +02:00
Parker Moore f7310f554e Whitespace in post.rb 2013-04-15 00:32:04 +02:00
Parker Moore 55a964a7da Print deprecation warnings for 'server', 'watch' and 'auto' when loaded from files. Fixes #972 2013-04-14 23:18:47 +02:00
Parker Moore e531925cae Fixes multiple config loading. Closes #973. Rel: #945. 2013-04-14 23:04:20 +02:00
Parker Moore e0335e2167 .formatted_topic has moved back to Jekyll::Logger. Update Build.watch to use it 2013-04-14 20:21:39 +02:00
Parker Moore 398cd633b6 Merge pull request #959 from mojombo/deprecator
Refactor Logging and Deprecation Messaging
2013-04-14 11:05:07 -07:00
Parker Moore 4ef107f3e8 Remove Logger methods from main Jekyll module. 2013-04-14 19:27:19 +02:00
Benjamin J. Balter ba2281c4a3 Strip CSS, JS, and IMG from template site
Per #964, just upgrade the template site from XHTML to HTML5,
leaving the existing CSS. No need to get fancy.

The HTML is essentially HTML5 Boilerplate. No need for a holy war.

Look and feel should remain the same.
2013-04-14 12:52:27 -04:00
Parker Moore 81e44bf5f4 Merge pull request #955 from mojombo/refactor-markdown
Refactor Markdown Parser Logic
2013-04-13 20:25:37 -07:00
Parker Moore 7a7990fb9a Moved markdown converters into lib/jekyll/converters/markdown 2013-04-14 05:23:42 +02:00
Parker Moore c708d1d71b Merge pull request #907 from advatar/pkpass_mime_type_support
Added pkpass to the list
2013-04-13 19:17:35 -07:00
Parker Moore ef51b0f9e4 Error message is red 2013-04-13 20:27:44 +02:00
Parker Moore ef9d8ddb7d Matching tests to new colorized output 2013-04-13 20:24:45 +02:00
Parker Moore b99baeae27 Colorize warns as yellow 2013-04-13 19:58:41 +02:00
Parker Moore 9b5ebb874f Merge pull request #961 from benbalter/default-markdown-engine
Move template site to default markdown renderer
2013-04-13 10:26:34 -07:00
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