Commit Graph

346 Commits

Author SHA1 Message Date
Parker Moore e7139cbd85 Update history to reflect merge of #1953 [ci skip] 2014-01-15 23:40:17 -08:00
Matt Rogers 8337cbb31f Update history to reflect merge of #1958 2014-01-15 23:24:27 -06:00
Matt Rogers 0be62fa2e0 Update history to reflect merge of #1947 2014-01-15 22:13:37 -06:00
Matt Rogers 5dc4c67344 Merge pull request #1947 from jekyll/1-4-3-release-info 2014-01-15 20:13:31 -08:00
Parker Moore ea94e5dd1c Update history to reflect merge of #1949 [ci skip] 2014-01-14 08:56:28 -08:00
Parker Moore b3064a9b7d Forgot #1943 in the line, whoopsie 2014-01-14 08:44:20 -08:00
Parker Moore dc599121a0 Update history to reflect merge of #1943 [ci skip] 2014-01-14 08:43:53 -08:00
Parker Moore e87cd8d53c Update History.markdown with 1.4.3 release. 2014-01-13 22:27:41 -08:00
Matt Rogers 750a56d1fe Update history to reflect merge of #1940 2014-01-13 13:13:31 -06:00
Matt Rogers 2c2beb9c1f Update history to reflect merge of #1938 2014-01-13 09:16:29 -06:00
Parker Moore 0d6db1613f Update history to reflect merge of #1936 [ci skip] 2014-01-12 21:30:18 -08:00
Parker Moore f8c904908a Update history to reflect merge of #1933.
[ci skip]
2014-01-12 13:53:56 -08:00
Parker Moore 8bc51fdb5c Update history to reflect merge of #1928 [ci skip] 2014-01-11 15:32:12 -08:00
Matt Rogers cc2ac99487 Update history to reflect merge of #1916 2014-01-11 12:37:33 -06:00
Matt Rogers 60524a1b6c Update history to reflect merge of #1923 2014-01-11 12:35:51 -06:00
Matt Rogers 649e5a156a Update history to reflect merge of #1927 2014-01-11 12:20:19 -06:00
Parker Moore 459a4c1e55 Update history to reflect merge of #1883 [ci skip] 2014-01-06 20:55:43 -08:00
Parker Moore 437693e744 Update history to reflect merge of #1912 [ci skip] 2014-01-04 14:09:49 -08:00
Matt Rogers b05a44cb2a Update history to reflect merge of #1910 2014-01-04 10:12:24 -06:00
Matt Rogers 6184c4e44b Update history to reflect merge of #1899 2014-01-04 10:04:24 -06:00
Matt Rogers bbcd94e7fa Update history to reflect merge of #1875 2014-01-04 10:01:58 -06:00
Parker Moore 32b952803e Update history to reflect merge of #1898 2014-01-03 21:14:12 -08:00
Parker Moore eb67894e0f Update history to reflect merge of #1900 2014-01-03 11:12:48 -08:00
Parker Moore b273ac38a6 Update history to reflect merge of #1902 2014-01-02 13:26:08 -08:00
Parker Moore 36495487a3 Update history to reflect merge of #1889 2013-12-31 18:52:24 -08:00
Parker Moore 29720674dc Update history to reflect merge of #1896 2013-12-31 18:50:07 -08:00
Parker Moore b0ca19c67b Update history to reflect merge of #1897 2013-12-31 18:48:46 -08:00
Matt Rogers 012387396a Merge pull request #1859 from robin850/rouge 2013-12-30 22:45:07 -06:00
Matt Rogers 47e4e81053 Update history to reflect merge of #1849 2013-12-30 22:32:21 -06:00
Parker Moore 7c276c6f64 Update history to reflect merge of #1894 2013-12-30 16:35:48 -08:00
Parker Moore ac9bca80c8 Update history to reflect merge of #1893 2013-12-30 11:07:50 -08:00
Parker Moore 194109d677 Update history to reflect merge of #1886 2013-12-28 13:46:40 -05:00
Parker Moore da8571beec Update history to reflect merge of #1879 2013-12-26 15:23:28 -05:00
Parker Moore 7093d3aa82 Update history to reflect merge of #1877 2013-12-26 02:02:42 -05:00
Parker Moore a2853456b6 Update history to reflect merge of #1825 2013-12-26 01:33:17 -05:00
Parker Moore 46e47e6713 Update history to reflect merge of #1831 2013-12-26 01:14:48 -05:00
Parker Moore 92c3d6d3fd Update history to reflect merge of #1841 2013-12-26 01:12:40 -05:00
Parker Moore fbf2b5734e Update history to reflect merge of #1866 2013-12-26 01:07:01 -05:00
Parker Moore 0ebec0b03f Update history to reflect merge of #1872 2013-12-26 01:06:02 -05:00
Parker Moore 1550c60278 Update history to reflect merge of #1847 2013-12-24 14:05:54 -05:00
Parker Moore 169e526f2f Update history to reflect merge of #1867 2013-12-24 14:05:00 -05:00
Parker Moore 42aef79ab3 Update history to reflect merge of #1864 2013-12-22 22:15:09 -05: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
Robin Dupret 92064134d6 Rename the pygments option to highlighter
Rename the pygments configuration option to highlighter to allow
different highlighters in the future. For now, the allowed values are
`pygments` and `null`.

It's now more straightforward to plug another syntax highlighter.
2013-12-22 12:45:15 +01:00
Robin Dupret 903cce2745 Fix the highlight tag feature
Previously, the assertion made wasn't enough to check whether the code
block was correctly parsed through Pygments (and it was not the case).
This commit simply ensure there is a div with the "highlight" class and
fix the test to correctly invoke the Liquid tag rendering.
2013-12-22 12:29:19 +01:00
Parker Moore 354b4b9c54 Update history to reflect merge of #1854 2013-12-19 19:58:36 -05:00
Parker Moore 8cb1dc47d9 Update history to reflect merge of #1848 2013-12-19 15:20:51 -05:00
Parker Moore 12a55b86ac Update history to reflect merge of #1836 2013-12-16 20:32:28 -05:00
Parker Moore 6b5ce3a9f0 Add v1.4.2 to History.markdown 2013-12-16 20:26:43 -05:00
Parker Moore b7bdcb19ca Update history to reflect merge of #1818 2013-12-11 18:31:13 -05:00