Commit Graph

2898 Commits

Author SHA1 Message Date
Parker Moore 1ebce26881 Default Maruku fenced_code_blocks to ON.
Extends https://github.com/jekyll/jekyll/pull/1799
2013-12-15 16:08:21 -05:00
Parker Moore b7bdcb19ca Update history to reflect merge of #1818 2013-12-11 18:31:13 -05:00
Parker Moore 53721dce03 Merge pull request #1818 from jekyll/windows-docs 2013-12-11 15:26:15 -08:00
Parker Moore c295060f69 Use Markdown, silly 2013-12-11 18:25:02 -05:00
Matt Rogers 3e2c229e97 Merge pull request #1817 from jekyll/move-to-jekyll-jekyll
mojombo/jekyll ~> jekyll/jekyll
2013-12-11 14:50:21 -08:00
Matt Rogers 6d0a168d6d Update history to reflect merge of #1817 2013-12-11 16:47:37 -06:00
Parker Moore 6195192bcf mojombo/jekyll ~> jekyll/jekyll 2013-12-11 17:44:33 -05:00
Matt Rogers 379093f940 Update history to reflect merge of #1815 2013-12-11 16:00:47 -06:00
Matt Rogers 85fcd0e757 Merge pull request #1815 from mojombo/redcarpet-3 2013-12-11 14:00:42 -08:00
Parker Moore 827c4b9bda Update history to reflect merge of #1812 2013-12-11 16:53:39 -05:00
Parker Moore 7b23fca86e Merge pull request #1812 from mojombo/openshift-cartridge 2013-12-11 13:53:16 -08:00
Parker Moore 1c22b3f751 Bump RedCarpet dependency to ~> 3.0 2013-12-11 16:51:57 -05:00
Parker Moore 1b8e6facd3 Add note about deployment on OpenShift using @developercorey's Jekyll cartridge. 2013-12-11 16:05:35 -05:00
Matt Rogers e5c8c94cd1 Update history to reflect merge of #1780 2013-12-11 08:08:14 -06:00
Matt Rogers 39b6fe732f Merge pull request #1780 from mojombo/kill-1-8 2013-12-11 06:08:10 -08:00
Matt Rogers fc760c1604 Update history to reflect merge of #1706 2013-12-10 23:16:44 -06:00
Matt Rogers 58159389b8 Merge pull request #1706 from mojombo/drop-commander 2013-12-10 21:16:42 -08:00
Matt Rogers b49c6508f5 Update history to reflect merge of #1805 2013-12-10 22:58:48 -06:00
Matt Rogers 6efb726e2b Merge pull request #1805 from ivantsepp/scaffold_vertical_scrollbar 2013-12-10 20:58:45 -08:00
Matt Rogers 48834891ac Update history to reflect merge of #1799 2013-12-10 22:30:55 -06:00
Matt Rogers a7d4ee8bfb Merge pull request #1799 from konklone/maruku_fenced_code_blocks 2013-12-10 20:30:44 -08:00
Ivan Tse b18f6505dd Remove margin-top of `.site` to prevent collapsing margins. 2013-12-10 18:39:16 -05:00
Parker Moore 8d44fa913b Update history to reflect merge of #1803 2013-12-10 17:49:44 -05:00
Parker Moore a1efc105d2 Merge pull request #1803 from penibelst/site-unminify-css 2013-12-10 14:49:17 -08:00
Anatol Broder 1033b4c1e7 Add comments and site.GH_ENV 2013-12-10 22:30:59 +01:00
Parker Moore 01ee2ada7c Update history to reflect merge of #1804 2013-12-10 16:14:25 -05:00
Parker Moore 8ebe19b835 Merge pull request #1804 from penibelst/site-fix-postv141 2013-12-10 13:13:59 -08:00
Anatol Broder b91ab3b334 Fix repo 2013-12-10 22:01:06 +01:00
Anatol Broder 59eaeed6e7 Fix version 2013-12-10 22:00:27 +01:00
Anatol Broder 288d2a8c6b Unminify css 2013-12-10 21:13:19 +01:00
Parker Moore 6e74ec2f71 Update history to reflect merge of #1788 2013-12-10 11:49:44 -05:00
Parker Moore a70726e554 Merge pull request #1788 from mojombo/group-by-filter-2 2013-12-10 08:48:44 -08:00
Eric Mill afe9387578 condensing code slightly 2013-12-10 11:04:04 -05:00
Matt Rogers c669d1519d Reformat to match the rest of the file 2013-12-09 21:39:24 -06:00
Matt Rogers a81479adbf Update history to reflect merge of #1795 2013-12-09 21:36:23 -06:00
Matt Rogers 812d55f843 Merge pull request #1795 from Ivoz/patch-1
Add link to Jekyll homepage
2013-12-09 19:35:37 -08:00
Matt Rogers 8ebd5852cd Updates for the 1.4.1 release
The 1.4.1 release is on the v1-stable branch
2013-12-09 20:49:15 -06:00
Matt Rogers 10e350d47b Update history to reflect merge of #1796 2013-12-09 20:24:31 -06:00
Matt Rogers ed82098162 Merge pull request #1796 from mojombo/fix-fetching-things
Reject nil entries in Site#read_things
2013-12-09 18:23:19 -08:00
Parker Moore df1a999031 Update history to reflect merge of #1800 2013-12-09 18:00:09 -05:00
Parker Moore 3b90f8b53c Merge pull request #1800 from cs/move-entry-filter-into-jekyll-module 2013-12-09 14:59:54 -08:00
Parker Moore 5495e0b21a Update history to reflect merge of #1797 2013-12-09 17:57:40 -05:00
Parker Moore 7de78d469b Merge pull request #1797 from dougjohnston/patch-1 2013-12-09 14:56:27 -08:00
Christoph Schiessl 695e5bbc40 move EntryFilter class from global namespace into Jekyll module 2013-12-09 23:06:27 +01:00
Eric Mill 28ca5d71ee Remove comments 2013-12-09 16:47:42 -05:00
Eric Mill 470abf46e2 better, simpler test case... 2013-12-09 16:42:51 -05:00
Doug Johnston ea244e507c Fix a broken link on the troubleshooting.md page 2013-12-09 15:04:48 -05:00
Parker Moore 063111737c Refactor data/[] fetching of item property. 2013-12-09 12:59:43 -05:00
Parker Moore bf9cf5340d Reject nil entries in Site#read_things 2013-12-09 12:46:57 -05:00
Parker Moore 4fb6022113 Update history to reflect merge of #1791 2013-12-09 12:33:36 -05:00