Commit Graph

6257 Commits

Author SHA1 Message Date
Parker Moore 5647b91689 Release 💎 3.0.0.pre.beta7 2015-06-18 20:52:40 -07:00
Parker Moore 8cecdde288 Release 💎 3.0.0.pre.beta6 2015-06-18 20:52:15 -07:00
chrisfinazzo a14f08b2bf Clarify CoffeeScript requirement 2015-06-18 17:55:57 -04:00
Parker Moore 4b2b5ea8b1 Update history to reflect merge of #3795
[ci skip]
2015-06-17 10:50:12 -07:00
Parker Moore d09c4cdf79 Merge pull request #3795 from jekyll/update-dependencies
Merge pull request 3795
2015-06-17 10:37:33 -07:00
Jordon Bedwell 9c4bf19c71 Update dependencies. 2015-06-17 10:31:44 -05:00
Parker Moore c6ee8a150a Update history to reflect merge of #3762
[ci skip]
2015-06-16 10:22:18 -07:00
Parker Moore 8b44a7bb42 Merge pull request #3762 from fw42/liquid_profiler
Merge pull request 3762
2015-06-16 10:21:33 -07:00
Parker Moore 407fc82b2d Update history to reflect merge of #3779
[ci skip]
2015-06-10 14:14:00 -07:00
Parker Moore b6e15977de Merge pull request #3779 from jekyll/move-highlight-div-to-figure
Merge pull request 3779
2015-06-10 14:13:25 -07:00
Parker Moore 32cb87af90 remove circle.yml, because we have disabled CircleCI. 2015-06-10 13:59:36 -07:00
Jordon Bedwell 137efdc9f4 Fix: #3738; Move code wrapper from div to figure. 2015-06-10 15:20:44 -05:00
chrisfinazzo 872efb0bcc Add Python to requirements for Jekyll 2 2015-06-09 12:07:56 -04:00
Parker Moore 80f63949cd Update history to reflect merge of #3763
[ci skip]
2015-06-09 08:12:03 -07:00
Parker Moore 649399dcf8 Merge pull request #3763 from tasken/patch-1
Merge pull request 3763
2015-06-09 08:10:45 -07:00
Parker Moore 83a29e7f4e Merge pull request #3767 from cpicanco/patch-2
fixing typo on line 31
2015-06-08 09:30:32 -07:00
Rafael Picanço e84a7aadee fixing typo on line 31
- front matter
2015-06-08 13:24:53 -03:00
Florian Weingarten 7bc9e1aae6 Add byte counter 2015-06-07 16:49:22 +00:00
Florian Weingarten 1e9163fdf4 Liquid profiler 2015-06-07 16:38:05 +00:00
Jordon Bedwell 6dbb5ac80c Update history.markdown to reflect the merger of #3732. 2015-06-06 06:31:26 -05:00
Jordon Bedwell e9215ec047 Merge pull request #3732 from jekyll/fix-frontmatter-defaults
Fix it so that 'blog.html' matches 'blog.html'
2015-06-06 06:30:43 -05:00
Jordon Bedwell d2fdac12c2 Update history.markdown to reflect the merger of #3760 2015-06-06 06:20:53 -05:00
Jordon Bedwell c421a4148a Merge pull request #3760 from cpicanco/patch-1
Fix typo on line 19 of pagination.md
2015-06-06 06:20:04 -05:00
tasken f00e217448 fix for pagination in a directory different that / 2015-06-06 03:20:56 -03:00
Parker Moore a134e05fda Release 💎 3.0.0.pre.beta6 2015-06-04 16:57:13 -07:00
Rafael Picanço 37f373fd38 fixing typo on line 19
- `pagination_path` to `paginate_path`
2015-06-04 17:37:24 -03:00
Parker Moore 2c0a535801 Update history to reflect merge of #3750
[ci skip]
2015-06-01 15:02:30 -07:00
Parker Moore 2567c885b0 Merge pull request #3750 from mnuessler/plugins
Merge pull request 3750
2015-06-01 15:01:54 -07:00
Alfred Xing bc806fd2a7 Update history to reflect merge of #3717 [ci skip] 2015-05-31 11:11:21 -07:00
Alfred Xing bba7870f8b Merge pull request #3717 from alfredxing/regenerator-handle-deleted-files
Merge pull request 3717
2015-05-31 11:10:42 -07:00
Matthias Nuessler bbd32980a1 Add asciinema liquid tag plugin 2015-05-31 14:45:49 +02:00
Matt Rogers fb716d6b83 Update history to reflect merge of #3728 [ci skip] 2015-05-28 17:59:31 -05:00
Matt Rogers 6f2e3b8238 Merge pull request #3728 from jordanthornquest/new-website-once-again 2015-05-28 17:59:23 -05:00
Matt Rogers 174d2f98ed Update history to reflect merge of #3745 [ci skip] 2015-05-28 17:46:18 -05:00
Matt Rogers 0435871785 Merge pull request #3745 from C4K3/update_welcome_post 2015-05-28 17:46:11 -05:00
Jordan Thornquest f04c9bb469 Moved blog with an article about Jekyll to a new location and updated the resources page to reflect the change. 2015-05-28 15:24:55 -06:00
Seb e68d18c3cc Update link in welcome post to talk.jekyllrb.com
Previously the link pointed to the jekyll-help repository on github
which no longer accepts issues.
2015-05-28 21:19:24 +02:00
Parker Moore c1d44fc83f Update history to reflect merge of #3743
[ci skip]
2015-05-28 09:14:06 -07:00
Parker Moore 60bdc7119a Remove Ozon from jekyllrb.com list of sites for learning
Reverts #3712.
2015-05-28 09:13:34 -07:00
Parker Moore 33fcb0a263 Merge pull request #3743 from mxstbr/master
Merge pull request 3743
2015-05-28 09:13:29 -07:00
Max f6bc58dd30 Docs now reflect correct redcarpet version 2015-05-28 16:56:57 +02:00
Ben Balter 82bb18176f use jekyll-feed 2015-05-25 16:09:16 -04:00
Jordon Bedwell 581dee7ba9 Merge pull request #3731 from jekyll/fix-script-test-file
Fix script/test so that testing individual files works.
2015-05-25 02:20:32 -05:00
Jordon Bedwell 14ed5cc954 Fix it so that 'blog.html' matches 'blog.html' 2015-05-25 02:07:21 -05:00
Jordon Bedwell 981e32d462 Fix script/test so that testing invidual files works. 2015-05-25 02:05:39 -05:00
Alfred Xing 7a12f32078 Update history to reflect merge of #3713 [ci skip] 2015-05-19 22:54:47 -07:00
Alfred Xing f6b34f74a9 Merge pull request #3713 from fw42/fix_marshal_bugs
Merge pull request 3713
2015-05-19 22:53:04 -07:00
Alfred Xing a2ee820609 Regenerator: handle deleted/renamed/moved dependencies
Should fix #3716
2015-05-19 22:47:58 -07:00
Florian Weingarten 87400f2155 regression test for corrupted marshal file 2015-05-19 20:00:50 +00:00
Florian Weingarten 376c87b62e Don't crash when reading/writing Marshal 2015-05-19 15:51:55 +00:00