github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-31 01:38:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,520 Commits 60 Branches 160 Tags
22f7380abe5f474271de43e70eb5285442c8fa5d
Commit Graph

3520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Rogers
22f7380abe Change the feature to not use page.name 
Use `page.description` in the cucumber feature instead. `page.name`
isn't overridable anymore.
 2014-04-15 20:15:16 -05:00
Parker Moore
955dc38400 Deep merge data overrides into defaults. 2014-04-05 15:42:53 -04:00
Parker Moore
09c6ff4f9c Post#published is no longer a thing. 2014-04-04 15:34:42 -04:00
Parker Moore
6bd07501e8 Merge branch 'frontmatter-defaults' of git://github.com/maul-esel/jekyll into maul-esel-frontmatter-defaults 
* 'frontmatter-defaults' of git://github.com/maul-esel/jekyll:
  move self.type to convertible
  oops, fix minor indentation quirk
  document frontmatter defaults precedence
  adjust frontmatter defaults precedence handling
  change cucumber feature to test for precedence too
  fix frontmatter defaults for custom paths
  more robust cucumber features
  fix slash handling for paths
  move cucumber features to own file
  fix minor docs quirk
  improve path checking, now using Pathname instead of regex
  Add site documentation for the new feature
  add inline code docs
  improve validation code
  fix for Ruby 1.8
  Add basic cucumber features for frontmatter defaults
  Retrieve frontmatter defaults when retrieved internally
  make frontmatter defaults available to liquid
  add a class `FrontmatterDefaults` for handling of frontmatter defaults
  Add a method to retrieve type to post, page and draft

Conflicts:
	lib/jekyll.rb
	lib/jekyll/convertible.rb
	lib/jekyll/core_ext.rb
	lib/jekyll/page.rb
	lib/jekyll/post.rb
 2014-04-04 15:32:27 -04:00
Parker Moore
69a9ce214f Update history to reflect merge of #2189 [ci skip] 2014-04-02 22:38:49 -04:00
Parker Moore
f3c54fcf50 Merge pull request #2189 from benhanzl/move_rouge_loading 2014-04-02 22:38:05 -04:00
Parker Moore
a096f9af50 Update history to reflect merge of #2197 [ci skip] 2014-04-02 22:16:18 -04:00
Parker Moore
9ace48c835 Merge pull request #2197 from jekyll/plugin-manager 2014-04-02 22:15:40 -04:00
Parker Moore
1863057b7e Ok handle the plugins_path stuff in the PluginManager. 2014-04-02 22:06:38 -04:00
Parker Moore
4a4c8846f4 Fetching/determining the plugin path is beyond this it's kind of sad. 2014-04-02 21:59:15 -04:00
Parker Moore
0540a3351c Update history to reflect merge of #1823 [ci skip] 2014-04-02 21:51:50 -04:00
Parker Moore
122b2233b1 Merge pull request #1823 from jekyll/highlight-without-newline 2014-04-02 21:50:54 -04:00
Parker Moore
9fe22546be Expect 41 posts, not just 40. 2014-04-02 15:10:28 -04:00
Parker Moore
795d240379 Update history to reflect merge of #2192 [ci skip] 2014-04-02 14:39:42 -04:00
Parker Moore
1437fb2621 Merge pull request #2192 from XhmikosR/docs-feed 2014-04-02 14:39:04 -04:00
Parker Moore
8ccdee4035 STRIP ALL THE NEWLINES FROM HIGHLIGHTED CODE ok just the ones at the beginning and end 2014-04-02 14:37:22 -04:00
XhmikosR
56f895db09 Add meta generator property in the HTML files. 2014-04-02 21:35:05 +03:00
XhmikosR
e9a7eff13f Improve feed.xml. 
* add `generator` property
* add image property
* use `xml_escape` instead of `![CDATA]`
* use `date_to_rfc822` instead of the date format string (thanks @troyswanson!)
* fix self reference url
* switch to `isPermaLink` for the `guid`
 2014-04-02 21:33:40 +03:00
Parker Moore
2a3f0c0ec3 Strip content of the {% highlight %} block 
A fix for #1801
 2014-04-02 14:11:19 -04:00
Parker Moore
781e257298 Update history to reflect merge of #1568 [ci skip] 2014-04-02 14:10:33 -04:00
Parker Moore
806f43cdbc Merge pull request #1568 from nitoyon/url-escape 2014-04-02 14:09:09 -04:00
Parker Moore
c2dff6bbf7 Update history to reflect merge of #1824 [ci skip] 2014-04-02 14:08:31 -04:00
Parker Moore
d579840870 Merge pull request #1824 from lachy-xe/master 2014-04-02 14:08:21 -04:00
Parker Moore
31443e978d Update history to reflect merge of #2110. [ci skip] 
Closes #2110.
 2014-04-02 14:06:54 -04:00
Lincoln Mullen
52ac2b3850 Permit YAML blocks to end with three dots 
The YAML spec permits blocks to end with three dots (...) in addition to
three dashes (---): http://www.yaml.org/spec/1.2/spec.html#id2760395. Some
programs that work with Jekyll (e.g., Pandoc) prefer the dots to dashes. This
commit permits the YAML metadata block to end with either dots or dashes. It
includes tests.

Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-04-02 14:06:22 -04:00
Parker Moore
21ea105a82 Update history to reflect merge of #2185 [ci skip] 2014-04-02 14:03:19 -04:00
Parker Moore
293d675523 Merge pull request #2185 from XhmikosR/docs-fonts 2014-04-02 14:02:44 -04:00
Parker Moore
d951ed6f0d Update history to reflect merge of #2193 [ci skip] 2014-04-02 14:01:02 -04:00
Parker Moore
1304f5ad6a Merge pull request #2193 from XhmikosR/docs-favicon 2014-04-02 14:00:38 -04:00
Parker Moore
48e1f23b86 Update history to reflect merge of #2177 [ci skip] 2014-04-02 14:00:21 -04:00
Parker Moore
ad86d063e4 Merge pull request #2177 from jekyll/help 2014-04-02 13:59:37 -04:00
Parker Moore
f68e4eeb72 Restore 'Documentation' ~> 'Docs' because long words are fun. 2014-04-02 13:58:55 -04:00
Parker Moore
f3e80267da With 5 items in the main navigation, limit the width to 20% rather than 25%. 2014-04-02 13:55:29 -04:00
Parker Moore
2267f81632 Update history to reflect merge of #2200 [ci skip] 2014-04-01 23:11:16 -04:00
Parker Moore
14d9902586 Merge pull request #2200 from fabianrbz/remove_unnecessary_post 2014-04-01 23:10:37 -04:00
Fabian Rodriguez
04666cd0cf remove default post with invalid date 2014-04-01 22:32:12 -03:00
Parker Moore
5d761a1c2b Require 'plugin_manager' in lib/jekyll.rb 2014-04-01 18:44:37 -04:00
Parker Moore
e2d95975f6 Redirect all the people to the help repo. 2014-04-01 18:30:36 -04:00
Parker Moore
f418ea5fc3 Extract plugin management into its own class. 2014-04-01 18:10:51 -04:00
Parker Moore
9603d8a013 Update history to reflect merge of #2191 [ci skip] 2014-04-01 17:31:15 -04:00
Parker Moore
8158c81377 Merge pull request #2191 from pilosus/site 2014-04-01 17:30:46 -04:00
Parker Moore
664ad0a32d Just freaking publish the site. 2014-04-01 17:30:14 -04:00
XhmikosR
eea8ed330b Switch to using an ico file. 
Works in all browsers plus it includes a 32x32 icon alongside with the 16x16 one.
 2014-04-01 21:26:19 +03:00
pilosus
8f9f804b58 Less code than in commit c3b327dbe7 
Thank you @budparr and @parkr
 2014-04-01 17:45:02 +02:00
Parker Moore
e20491759d Update dat history format so it's right whoopsies. 2014-04-01 11:07:45 -04:00
pilosus
c3b327dbe7 For the case when more than one category specified in the news item, make sure category names formatted nicely with comma delimiter like this: category1, category2. Instead of categor1category2. 2014-04-01 16:04:51 +02:00
Ben Hanzl
f2ed30dff5 Move rouge loading 2014-03-31 19:48:18 -04:00
Parker Moore
14470b8bc6 Update history to reflect merge of #2187 [ci skip] 2014-03-31 13:55:03 -04:00
Parker Moore
769d8bf52b Merge pull request #2187 from XhmikosR/rm-unused-img 2014-03-31 13:54:10 -04:00
XhmikosR
33acbec9ee docs: remove unused images. 2014-03-31 20:48:52 +03:00