Commit Graph

8697 Commits

Author SHA1 Message Date
Jordon Bedwell
3ab386f1b0 Update to JRuby 9K
Even though JRuby 9K on Travis still apparently points to pre1 we are updating so that when it finally points to stable release we can get those builds, once jruby-head diverges enough again we will re-add it to the list and start testing the next build and move JRuby 9K.  Remember though, JRuby support is still experimental.
2015-07-24 23:43:55 -05:00
Max White
8c485155ce Added documentation for new Static Publisher tool 2015-07-24 23:38:36 +01:00
Parker Moore
fe36329004 Update history to reflect merge of #3858
[ci skip]
2015-07-19 20:26:11 -07:00
Parker Moore
0eee6990d1 Merge pull request #3858 from AJ-Acevedo/shebang
Merge pull request 3858
2015-07-19 20:25:42 -07:00
AJ Acevedo
b0fa2462a6 Updated the scripts shebang for portability
- Updated all of the sh and bash shebangs for consistency and portability.
- set -e to the test script for portability
Resolves #3857
2015-07-18 22:23:56 -04:00
Jordon Bedwell
5af105ca71 Try to organize dependencies into dev and test groups. 2015-07-16 16:31:30 -05:00
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
Shinnosuke Kondo
1eb626b1df Fix keep_files not to match a file with repeated path. 2015-07-13 19:08:11 -05:00
Shinnosuke Kondo
3b60237cb1 Fix keep_files to be used as paths relative to the destination.
They were used as keywords to match files containing them in the paths.
2015-07-13 18:34:40 -05:00
Shinnosuke Kondo
e0b8539670 Added a new case for test_clearner
where a directory is not in keep_files, but its path contains a string in keep_files.
2015-07-13 17:47:42 -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
Günter Kits
b9f8fc1715 Fixes #3836. Fix site template header menu iteration variables 2015-07-06 21:02:56 +03: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
Lukas
6d196275fc Add build options (fixes #3744) 2015-06-30 20:53:31 +02: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 v3.0.0.pre.beta8 2015-06-29 14:33:38 -07:00
chrisfinazzo
5db3b5d709 Use square brackets instead 2015-06-25 17:30:50 -04:00
chrisfinazzo
4dd66e9448 Add missing flag to disable the watcher 2015-06-25 09:54:42 -04: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 v3.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
Jordon Bedwell
a58f23aeaf Add support for underscores. 2015-06-10 15:05:17 -05:00
Jordon Bedwell
34438ed325 Refactor: lib/jekyll/convertor/markdown.rb - tests: no additions/breaks.
Reason: #3770
2015-06-10 15:04:25 -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