Commit Graph

329 Commits

Author SHA1 Message Date
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
Matt Rogers
6d0a168d6d Update history to reflect merge of #1817 2013-12-11 16:47:37 -06:00
Matt Rogers
379093f940 Update history to reflect merge of #1815 2013-12-11 16:00:47 -06:00
Parker Moore
827c4b9bda Update history to reflect merge of #1812 2013-12-11 16:53:39 -05:00
Matt Rogers
e5c8c94cd1 Update history to reflect merge of #1780 2013-12-11 08:08:14 -06:00
Matt Rogers
fc760c1604 Update history to reflect merge of #1706 2013-12-10 23:16:44 -06:00
Matt Rogers
b49c6508f5 Update history to reflect merge of #1805 2013-12-10 22:58:48 -06:00
Matt Rogers
48834891ac Update history to reflect merge of #1799 2013-12-10 22:30:55 -06:00
Parker Moore
8d44fa913b Update history to reflect merge of #1803 2013-12-10 17:49:44 -05:00
Parker Moore
01ee2ada7c Update history to reflect merge of #1804 2013-12-10 16:14:25 -05:00
Parker Moore
6e74ec2f71 Update history to reflect merge of #1788 2013-12-10 11:49:44 -05:00
Matt Rogers
c669d1519d Reformat to match the rest of the file 2013-12-09 21:39:24 -06:00
Matt Rogers
a81479adbf Update history to reflect merge of #1795 2013-12-09 21:36:23 -06:00
Matt Rogers
8ebd5852cd Updates for the 1.4.1 release
The 1.4.1 release is on the v1-stable branch
2013-12-09 20:49:15 -06:00
Matt Rogers
10e350d47b Update history to reflect merge of #1796 2013-12-09 20:24:31 -06:00
Parker Moore
df1a999031 Update history to reflect merge of #1800 2013-12-09 18:00:09 -05:00
Parker Moore
5495e0b21a Update history to reflect merge of #1797 2013-12-09 17:57:40 -05:00
Parker Moore
4fb6022113 Update history to reflect merge of #1791 2013-12-09 12:33:36 -05:00