dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,349 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

2349 Commits

Author SHA1 Message Date
Parker Moore 8a431686cd Update history to reflect merge of #1480 2013-08-30 18:41:56 -04:00
Parker Moore a2d67c5cd7 Merge pull request #1480 from mojombo/ignore-_site-in-deploy 
Ignore _site in jekyllrb.com deploy.
 2013-08-30 15:41:10 -07:00
Parker Moore 39d8f40b72 Update history to reflect merge of #1463 2013-08-30 18:39:27 -04:00
Parker Moore 6475cce179 Merge pull request #1463 from penibelst/add-site-repository 
Add site.repository for the URL on Github. Close #1456
 2013-08-30 15:38:35 -07:00
Parker Moore 9e0ed07399 Update history to reflect merge of #1477 2013-08-30 18:33:07 -04:00
Parker Moore bed2978255 Fix docs/templates.md private gist example. 
Duplicate of #1477 because we develop on the master branch.
 2013-08-30 18:32:37 -04:00
Parker Moore da1780f6d2 Ignore _site in jekyllrb.com deploy. 2013-08-30 18:30:53 -04:00
Matt Rogers 289117d4fe Update history to reflect merge of #1341 2013-08-29 22:21:48 -05:00
Matt Rogers a9e2a74ea6 Merge pull request #1341 from maul-esel/minor-refactors 
Minor refactors
 2013-08-29 20:21:08 -07:00
Matt Rogers 49c529f420 Update history to reflect merge of #1474 2013-08-29 21:58:47 -05:00
Matt Rogers 8fae7bbc95 Merge pull request #1474 from mgp/master 
Clarify that --config flag can take multiple files
 2013-08-29 19:56:22 -07:00
Michael Parker cccfe1be78 Clarify that --config flag can take multiple files 2013-08-29 16:27:47 -07:00
Parker Moore 590d22d628 Update history to reflect merge of #1462 2013-08-28 18:13:18 -04:00
Parker Moore 1a69c87cb1 Merge pull request #1462 from penibelst/patch-1 
Add trailing slash to site’s post URL
 2013-08-28 15:11:08 -07:00
Parker Moore b3d831d4ab Update history to reflect merge of #1382 2013-08-28 18:03:57 -04:00
Parker Moore 0d890e4b70 Merge pull request #944 from x3ro/permalink-special-characters 
WIP - Improve permalink generation for URLs with special characters
 2013-08-28 15:02:20 -07:00
Anatol Broder 0ab2b4207a Add site.repository for the URL on Github. Close #1456 2013-08-28 09:23:11 +02:00
Anatol Broder ff6cfc6bf8 Add trailing slash to post URL 
Related to #1411
 2013-08-28 08:36:41 +02:00
Parker Moore 5033437fa5 Update history to reflect merge of #1429 2013-08-26 17:02:46 -04:00
Parker Moore 8ea336945c Merge pull request #1429 from maul-esel/refactor-cleanup 
Refactor `Site#cleanup` into Jekyll::Site::Cleaner class
 2013-08-26 14:01:53 -07:00
Parker Moore 0c1d27fc66 Update history to reflect merge of #1458 2013-08-26 17:00:30 -04:00
Parker Moore 146ce3d577 Merge pull request #1458 from dafi/patch-1 
Fixed --layouts option
 2013-08-26 13:58:56 -07:00
Davide Ficano 79ac2d6b53 Fixed --layouts option 
The --layouts option isn't correctly declared causing a parse error when user specify it on command line
 2013-08-26 17:19:32 +02:00
Matt Rogers 0b4ba4f771 Update history to reflect merge of #1454 2013-08-25 21:34:23 -05:00
Matt Rogers 044ec036dd Merge pull request #1454 from bdesham/fix-typos-in-history 
Fix two typos in History.markdown
 2013-08-25 19:33:34 -07:00
Benjamin Esham 56e2bdd0da Fix two typos in History.markdown 2013-08-25 13:05:52 -04:00
Matt Rogers 34e3dcdb9f Update history to reflect merge of #1443 2013-08-24 22:17:37 -05:00
Matt Rogers 4fa4ad2232 Merge pull request #1443 from ddavison/detachment 
Detachment
 2013-08-24 20:16:42 -07:00
ddavison b163bf637e final mods 2013-08-24 21:31:05 -04:00
Matt Rogers e50217a2ce Update history to reflect merge of #1444 2013-08-24 11:08:32 -05:00
Matt Rogers 1b40226cfd Merge pull request #1444 from chrisnicotera/master 
Fix docs server options override
 2013-08-24 09:07:33 -07:00
maul.esel 4c015fc5ff move Jekyll::Cleaner to Jekyll::Site::Cleaner 2013-08-23 20:42:27 +02:00
maul.esel dbd368f6ee remove no longer necessary condition 2013-08-23 20:41:13 +02:00
Parker Moore 07d23535af Update history to reflect the merge of #1430 2013-08-23 18:08:14 +02:00
Parker Moore 319a09ae61 Merge pull request #1430 from penibelst/site-speed 
Update normalize.css to v2.1.2 and minify
 2013-08-23 09:06:32 -07:00
Parker Moore 06bf97d332 Fix TypeError on Generation 
After several page build fails, this seems to have fixed up the following error:

lib/jekyll/excerpt.rb:108:in `partition': type mismatch: NilClass given (TypeError)
 2013-08-23 01:39:54 -04:00
ddavison aedac6060b adding new -B flag for -background- 2013-08-23 01:19:41 -04:00
Matt Rogers a91988d436 Update history to reflect merge of #1445 2013-08-22 11:11:16 -05:00
Matt Rogers 025535a7d1 Merge pull request #1445 from penibelst/patch-1 
Add code tags
 2013-08-22 09:10:04 -07:00
Christopher Nicotera 4b4103cc4a Use more efficient merge 2013-08-22 11:31:55 -04:00
Christopher Nicotera fb1003c06f Revert "Use more efficient merging" 
This reverts commit 78df4ddb70.
 2013-08-22 11:29:23 -04:00
Christopher Nicotera 78df4ddb70 Use more efficient merging 2013-08-22 11:27:30 -04:00
ddavison 8463e62d92 adding note about running detached 2013-08-22 13:45:06 +00:00
Anatol Broder aadf992616 Add code tags 2013-08-22 08:32:56 +02:00
Christopher Nicotera a721dae0a8 Fix docs server options override 
Override the source and destination before passing it along to the
configuration
 2013-08-21 23:53:30 -04:00
Parker Moore a3b63662ba Update history to reflect merge of #1439 2013-08-21 22:00:03 -04:00
Parker Moore 9bdc20ad24 Merge pull request #1439 from bdesham/pluralize-and-reading-time 
Add "pluralize" and "reading_time" filters to docs
 2013-08-21 18:59:20 -07:00
Parker Moore eeabdd7bec Update history to reflect merge of #1441 2013-08-21 21:53:02 -04:00
Parker Moore 20b28f0fa8 Merge pull request #1441 from sleeper/master 
Fix a misleading typo
 2013-08-21 18:51:54 -07:00
ddavison 8efcca9ddc adding documentation on using detach 2013-08-21 21:10:42 +00:00