Commit Graph

5875 Commits

Author SHA1 Message Date
Jordon Bedwell 56622c7ab6 Update history.markdown to reflect the merger of #3853. 2015-07-16 14:16:47 -05:00
Jordon Bedwell e164c2194d Merge pull request #3853 from jekyll/update-kramdown
Update Kramdown.
2015-07-16 14:15:52 -05:00
Jordon Bedwell 910cab5f84 Update history.markdown to reflect the merger of #3845. 2015-07-16 08:39:57 -05:00
Jordon Bedwell 48d6eea9b2 Merge pull request #3845 from fw42/fix_binread
Fix reading of binary metadata file
2015-07-16 08:38:57 -05:00
Jordon Bedwell dba6df907f Update Kramdown. 2015-07-16 08:36:44 -05:00
Florian Weingarten 8bdfdae0ab Fix reading of binary metadata file 2015-07-09 13:40:36 -04:00
Jordon Bedwell 90514b3536 Allow jRuby head to fail. 2015-07-06 17:52:50 -05:00
Parker Moore eeb6ef46f1 Update history to reflect merge of #3837
[ci skip]
2015-07-06 12:01:25 -07:00
Parker Moore 32c3089ea9 Merge pull request #3837 from jensechu/master
Merge pull request 3837
2015-07-06 12:00:37 -07:00
Jensen Kuras f4bbbd6952 Fixed an unclear code comment 2015-07-06 10:43:28 -07:00
Jordon Bedwell 5bf5c36ce0 Close #3833 by removing execute bit. 2015-07-04 04:59:06 -05:00
Jordon Bedwell feb84043dd Update history.markdown to reflect the merger of #3823. 2015-07-01 12:07:04 -05:00
Jordon Bedwell 3a49770ce2 Merge pull request #3823 from 18F/adapt-static-file
Adapt StaticFile for collections, config defaults
2015-07-01 12:06:08 -05:00
Mike Bland 250b6ebb7e Adapt StaticFile for collections, config defaults
This enables files such as images and PDFs to show up in the same relative
output directory as other HTML and Markdown documents in the same collection.

It also enables static files to be hidden using defaults from _config.yml in
the same way that other documents in the same collection and directories may
be hidden using `published: false`.
2015-06-29 19:58:27 -04:00
Parker Moore 8c9e9497a2 Release 💎 3.0.0.pre.beta8 2015-06-29 14:33:38 -07:00
Jordon Bedwell 0125af80a3 Update history.markdown to reflect the merger of #3818. 2015-06-24 20:47:05 -05:00
Jordon Bedwell 2eae07b7d9 Merge pull request #3818 from mgiuffrida/patch-2
Update windows.md with Ruby version info
2015-06-24 20:46:12 -05:00
Michael Giuffrida 197dd184f9 Update windows.md with Ruby version info
Jekyll dependency hitimes does not support Ruby 2.2 on Windows yet
2015-06-24 13:02:02 -07:00
Parker Moore 68c3988861 Update history to reflect merge of #3811
[ci skip]
2015-06-23 15:36:51 -07:00
Parker Moore fcb882e791 Merge pull request #3811 from fw42/bubble_up_liquid_exceptions
Merge pull request 3811
2015-06-23 15:36:13 -07:00
Florian Weingarten 3c656ae2ed Remove unnecessary 'ensure' in LiquidRenderer 2015-06-23 21:27:24 +00:00
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
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
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