github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-02-03 03:05:07 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,421 Commits 60 Branches 160 Tags
0d62e7fb416c1cbf00aef6a5dfa6aba68a61ba60
Commit Graph

2651 Commits

Author SHA1 Message Date
maul.esel
b5d25427e5 Merge branch 'master' into minor-refactors 2013-07-28 21:21:50 +02:00
maul.esel
01922a10ac Convertible#to_liquid: allow an alternate attribute set to be passed 2013-07-28 21:18:54 +02:00
Parker Moore
e973e59306 Remove redundant argument in Jekyll::Commands::New#scaffold_post_content 2013-07-26 16:25:39 +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
Lucas Jenss
41b2f0824e Merge branch 'master' of https://github.com/mojombo/jekyll into permalink-special-characters 2013-07-25 21:33:55 +02:00
Parker Moore
0db5dcf832 Release 1.1.2 2013-07-25 09:15:34 +02:00
Parker Moore
fe10f21d8d Release 1.1.1 2013-07-24 22:42:03 +02:00
maul.esel
6c6dd173c7 Post + Page: extract real path retrieval into separate method (@parkr) 2013-07-24 16:30:24 +02:00
maul.esel
d815e2b2a2 coding style preferences (@parkr) 2013-07-24 16:28:03 +02:00
Matt Rogers
d68d29c06f Merge pull request #1339 from mojombo/no-layouts-for-excerpt 
No layouts for excerpt
 2013-07-23 18:43:08 -07:00
Parker Moore
0bb2af8dee Remove superfluous conditional, props @mattr- 2013-07-23 20:04:39 +02:00
maul.esel
ba5db5ad5b refactor Include tag file validation 
Split validation into a separate method, and give a more
descriptive error on symlinks.
 2013-07-23 14:23:33 +02:00
maul.esel
86e007f970 remove no-longer needed LSI accessor 
LSI has been moved to another class (Jekyll::RelatedPosts),
but this was left in Post.
 2013-07-23 11:24:23 +02:00
maul.esel
75d6587d27 Move #to_liquid to Convertible 2013-07-22 16:34:01 +02:00
maul.esel
21de43090a Posts: move slug to title in a separate method 2013-07-22 16:23:40 +02:00
maul.esel
5efadd6674 Support missing kramdown coderay option 2013-07-22 16:02:50 +02:00
maul.esel
955f913f04 simplify Site#initialize 2013-07-22 16:02:50 +02:00
maul.esel
fd907fa631 simplify coderay option handling 2013-07-22 16:02:50 +02:00
maul.esel
5d777eb9e9 With the move of path handling, Page#to_liquid can be simplified 2013-07-22 16:02:50 +02:00
maul.esel
08567b1091 move path handling in pages to the path method, as in posts 2013-07-22 16:02:50 +02:00
maul.esel
f0e2468249 simplify some code with Hash#fetch 2013-07-22 16:02:42 +02:00
Parker Moore
f883acc664 Remove debug statements 2013-07-22 11:33:19 +02:00
Parker Moore
26dc14881c Moving data around to make sure excerpts have no layouts but that they are still converted with liquid and the proper converter 2013-07-22 11:31:15 +02:00
Parker Moore
e359472870 May as well add Stevenson#debug 2013-07-22 11:30:19 +02:00
Parker Moore
c6a37a424b Debug statements - take them out later 2013-07-22 10:11:32 +02:00
Parker Moore
f99c726085 Override Excerpt#render_all_layouts to just assign content to output 2013-07-22 10:11:32 +02:00
Parker Moore
0e0e25b9ba start with Excerpt#output, otherwise call #to_s 2013-07-22 10:11:32 +02:00
Parker Moore
04e0b318c8 Remove duplicate comment 2013-07-22 10:11:32 +02:00
Parker Moore
374e6fcdf4 Add Jekyll::Stevenson#abort_with 2013-07-22 10:07:15 +02:00
Wlodek Bzyl
a880b7f99f Remove superfluous 'table' selector from main.css in 'jekyll new' site template. 
Closes #1323
 2013-07-19 16:01:32 +02:00
Lucas Jenss
2ac98a7358 Merge branch 'master' into permalink-special-characters 
Conflicts:
	lib/jekyll/page.rb
	lib/jekyll/post.rb
 2013-07-14 23:58:22 +02:00
Parker Moore
d572e588e8 Release 1.1.0 2013-07-14 19:52:44 +02:00
Parker Moore
5d91b8f346 merge bang to modify in place. Woops. #1201 2013-07-14 17:48:34 +02:00
Parker Moore
e95086b211 Fix for kramdown coderay options. #1201. 2013-07-14 17:47:13 +02:00
Parker Moore
4ce89ac96d Merge pull request #1201 from zachgersh/all_kramdown 
Supporting more kramdown options.
 2013-07-14 08:45:05 -07:00
zachgersh
90500f37ac Deleted unused code. 2013-07-14 00:24:57 -05:00
zachgersh
774bf07380 Supporting more kramdown options. 2013-07-14 00:24:56 -05:00
Parker Moore
d815c12571 Don't try to be smarter than the computer. Pass Excerpt#to_liquid to its parent post. 2013-07-14 04:22:34 +02:00
Parker Moore
015ace6773 Shuffle around rendering of extracted excerpt so it can be liquified. 2013-07-13 16:18:20 +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
a7efb86d5c Throw ArgumentError when there's an invalid config file, and catch only that. 2013-07-12 11:56:22 +02:00
Parker Moore
456ac01890 Crash if a config file isn't there. 
If a configuration file is specified via the command line but does not exist,
fail loudly and crash to preserve the current state. Do not fail if the requested
file is the default configuration file, _config.yml. In that case, fall back on
the defaults.
 2013-07-12 11:18:46 +02:00
Parker Moore
e1ecae250c Site#site_files_each ~> Site#each_site_file 2013-07-12 10:52:00 +02:00
Parker Moore
979d5c13c4 Merge pull request #1144 from jpiasetz/cleanup 
Refactor Jekyll::Site
 2013-07-12 01:48:34 -07:00
John Piasetzki
13fd798ec0 Extracted each method 2013-07-09 20:50:22 -04: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
maul.esel
9d2849c562 set value outside if/else block 2013-07-08 20:43:03 +02:00
Parker Moore
e8d82fd88c Merge pull request #1271 from sanandnarayan/related_posts 
Latest post  first in related posts
 2013-07-08 10:55:39 -07:00
maul.esel
f72365da4f more code improvements 
Remove unused variable, extract validation to method (@mattr-).
Do not require markup to be passed to parse_params as argument.
 2013-07-08 18:48:47 +02:00
Parker Moore
9d3d095bca Simplify check for String include/exclude option. 2013-07-08 18:35:16 +02:00