github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-10 07:28:07 -05:00
Code Issues Packages Projects Releases Wiki Activity
11,859 Commits 60 Branches 160 Tags
master
Commit Graph

324 Commits

Author SHA1 Message Date
Parker Moore
344906deb9 Release 2.0.0. 2014-05-06 20:11:44 -04:00
Parker Moore
e04e11c84d Swap env of maruku and kramdown dependencies. 
Maruku is now sunsetted, i.e. a dev dep, not a runtime dep.
Kramdown is now the default, i.e. a runtime dep, not a dev dep.
Closes #2285.
 2014-05-04 21:05:14 -04:00
Parker Moore
4a40187f8e Update jekyll-sass-converter to the latest RC 
To see a detailed history of the changes, please visit https://github.com/jekyll/jekyll-sass-converter/compare/v1.0.0.rc3...v1.0.0.rc4

Notable change is that you can now set the style of the outputted Sass.
Ref: https://github.com/jekyll/jekyll-sass-converter/issues/3
 2014-04-27 19:15:02 -04:00
Parker Moore
744fb2865d Lock to cucumber v1.3.11 because 1.3.12 is failing like crazy. 2014-03-18 23:53:19 -04:00
Parker Moore
ed30920984 Use jekyll-sass-converter 1.0.0.rc3 2014-03-04 15:57:15 -05:00
Parker Moore
e2af1b547b Extract core extensions into a Utils module 
Fixes #2111
 2014-03-03 22:13:03 -05:00
Parker Moore
80c39cf670 Choose jekyll-sass-converter 1.0.0.rc1 2014-02-28 21:12:00 -05:00
Parker Moore
9ffb984f37 Sass support should be shipped outside core. 2014-02-28 21:12:00 -05:00
Parker Moore
77f26d5681 Upgrade to guard/listen 2.x 2014-02-24 17:10:43 -05:00
Parker Moore
8a0d036b87 Greatly simplify Jekyll's gemspec. 2014-02-24 16:15:51 -05:00
Parker Moore
d54764924b Bump Mercenary to ~> 0.3.1 2014-02-21 14:13:35 -05:00
Parker Moore
05ea209d5f Bump to Mercenary ~> 0.3.0 
https://github.com/jekyll/mercenary/releases/tag/v0.3.0
 2014-02-20 18:58:14 -05:00
Parker Moore
e1fa657f2b Update gemspec file list. 2014-02-19 23:27:18 -05:00
Matt Rogers
41325ab308 Merge pull request #2045 from jekyll/kill-1-9-2 2014-02-14 12:46:07 -06:00
Parker Moore
36b2963343 Kill 1.9.2 support. 2014-02-14 13:30:14 -05:00
Matt Rogers
ad9250d106 Bump Redcarpet to 3.1.0 
- Footnotes
- GitHub style header anchors
- quotation marks as <q> tags
- A few other bug fixes
 2014-02-14 12:17:29 -06:00
Parker Moore
88e35f0852 Release 2.0.0.alpha.1 2014-02-13 18:02:49 -05:00
Parker Moore
d43341fab0 Merge pull request #2009 from penibelst/test-sass-include 2014-02-13 17:56:38 -05:00
Parker Moore
f607aefeb8 Update jekyll.gemspec with new files. 
Ref: #2020
 2014-02-09 18:43:46 -05:00
Jashank Jeremy
f8d6ff42ff Update Jekyll gemspec. 
The master gemspec has gotten a tad out of date; this updates the
manifest, notably, but also the version number, to bring it in line with
v1-stable.  I'm not sure this is precisely the right way for the latter
to work; @parkr, would you like to comment on this?
 2014-02-04 12:45:14 +11:00
Anatol Broder
ce2b4ae963 Upgrade gemspec 2014-02-04 02:06:50 +01:00
Parker Moore
fdbfd719ca Add CoffeeScript converter. 2014-01-25 20:38:51 -05:00
Parker Moore
774bf96c61 Merge master into sass 2014-01-24 12:17:35 -05:00
Matt Rogers
3b485b4497 Lock Maruku to 0.7.0 
This fixes the errors we see in our tests due to the upgrade to Maruku
0.7.1
 2014-01-15 23:11:27 -06:00
Parker Moore
45c0523e55 update dat gemspec 2014-01-14 08:43:29 -08:00
Parker Moore
245597c2db Require Liquid 2.5.5 <= x < 2.6 2014-01-13 22:28:16 -08:00
Parker Moore
66732b91c1 Make sass a runtime dependency. 2014-01-12 21:30:30 -08:00
Parker Moore
824a84ef2a Add support for Sass and SCSS. 2014-01-12 21:30:29 -08:00
Aidan Feldman
716b8ede0e Loosen dependency on Shoulda 
Fixes build for Ruby 2.1.0.
 2014-01-03 05:44:47 -05:00
Matt Rogers
012387396a Merge pull request #1859 from robin850/rouge 2013-12-30 22:45:07 -06:00
Christoph Hochstrasser
dd919751ac Update kramdown to 1.3 2013-12-30 22:14:41 +01:00
Parker Moore
3744e70128 Raise restriction of safe_yaml to ~>1.0 
Amends #1886
 2013-12-28 13:47:35 -05:00
Ivan Tse
9d5683dc71 Bump safe_yaml version to include the fix for dtao/safe_yaml#35 2013-12-28 02:42:48 -05:00
Parker Moore
d2314d360a Bump mercenary to ~> 0.2.0 2013-12-26 14:34:28 -05:00
Robin Dupret
036cbda2f6 Require at least 1.3.0 for Rouge 
Rouge 1.3.0 introduced a `rouge_formatter` helper which is handy to
overwrite the formatter default when using the Redcarpet plugin so let's
require this version at the very least.

An abort statement will be thrown when the installed version is not
correct.
 2013-12-25 18:06:29 +01:00
Robin Dupret
0831d2b0f8 Add support for the Rouge syntax highlighter 
By setting the `highlighter` setting to `rouge` you can now easily
highlight your code with it instead of relying on Pygments. However,
Jekyll doesn't depend on Rouge explicitly, you will need to install it
or add it to your Gemfile.

The documentation has been updated accordingly.
 2013-12-22 18:45:40 +01:00
Parker Moore
6195192bcf mojombo/jekyll ~> jekyll/jekyll 2013-12-11 17:44:33 -05:00
Parker Moore
1c22b3f751 Bump RedCarpet dependency to ~> 3.0 2013-12-11 16:51:57 -05:00
Matt Rogers
39b6fe732f Merge pull request #1780 from mojombo/kill-1-8 2013-12-11 06:08:10 -08:00
Matt Rogers
58159389b8 Merge pull request #1706 from mojombo/drop-commander 2013-12-10 21:16:42 -08:00
Parker Moore
585e074cda Update files list in gemspec. 
Fixes #1793
 2013-12-09 12:29:45 -05:00
Parker Moore
b58cd5c132 Merge pull request #1657 from mojombo/safe-whitelist 
A gem-based plugin whitelist for `safe` mode
 2013-12-07 21:41:55 -08:00
Matt Rogers
3788c08b13 prep the gemspec for 1.4.0 2013-12-07 17:59:21 -06:00
Matt Rogers
9f1593299a Merge pull request #1775 from Ivoz/maruku 
Update to maruku 0.7
 2013-12-06 20:56:52 -08:00
Parker Moore
96ecfb30ef Require Ruby version >= 1.9.2 in gemspec 2013-12-06 01:42:23 -05:00
Parker Moore
8d898dafde Add "jekyll_test_plugin_malicious" as gem dep 2013-12-06 00:22:07 -05:00
Parker Moore
aabb3e96cc Upgrade toml gem to 0.1.0 2013-12-05 18:08:32 -05:00
Matthew Iversen
0bdfed4b25 Update requirements to maruku 0.7 2013-12-05 11:59:36 +11:00
Parker Moore
51706e8da7 Parse TOML or YAML in Jekyll::Configuration. 2013-11-28 22:11:56 -05:00
Matt Rogers
4f337df2d8 Update the gemspec with the release post 2013-11-26 20:45:57 -06:00