Commit Graph

452 Commits

Author SHA1 Message Date
Parker Moore bbcd5bc8c7 Update history to reflect merge of #2105 [ci skip] 2014-02-27 17:56:49 -05:00
Parker Moore 12375846c8 Update history to reflect merge of #2102 [ci skip] 2014-02-27 08:34:22 -05:00
Parker Moore d21ab37abd Update history to reflect merge of #2081 [ci skip] 2014-02-24 18:58:41 -05:00
Parker Moore 644f012c42 Update history to reflect merge of #2097 [ci skip] 2014-02-24 18:56:46 -05:00
Parker Moore f5890e343f Update history to reflect merge of #2096 [ci skip] 2014-02-24 16:55:41 -05:00
Matt Rogers 83e3c0f7ba Update history to reflect merge of #2095 [ci skip] 2014-02-24 15:23:15 -06:00
Parker Moore 61397cd302 Update history to reflect merge of #2094 [ci skip] 2014-02-24 16:21:00 -05:00
Parker Moore ed5670eb48 Update history to reflect merge of #2050 [ci skip] 2014-02-24 16:09:10 -05:00
Parker Moore 87a3208df2 Update history to reflect merge of #2067 [ci skip] 2014-02-23 20:15:47 -05:00
Parker Moore de7a944601 Update history to reflect merge of #2065 [ci skip] 2014-02-23 20:07:05 -05:00
Parker Moore 89e914b160 Update history to reflect merge of #2084 [ci skip] 2014-02-21 18:22:47 -05:00
Parker Moore d6ecb5025a Update history to reflect merge of #2085 [ci skip] 2014-02-21 18:21:32 -05:00
Parker Moore 53ad55a1b2 Update history to reflect merge of #2090 [ci skip] 2014-02-21 18:19:53 -05:00
Matt Rogers 276b400a86 Update history to reflect merge of #2061 [ci skip] 2014-02-20 14:30:34 -06:00
Matt Rogers 1c4974f6ea Update history to reflect merge of #2074 2014-02-19 17:09:10 -06:00
Parker Moore de3570714f Update history to reflect merge of #2077 [ci skip] 2014-02-19 14:53:00 -05:00
Parker Moore 0d1fcc0691 Update history to reflect merge of #2075 [ci skip] 2014-02-19 14:15:41 -05:00
Parker Moore 45a5671c55 Update history to reflect merge of #2073 [ci skip] 2014-02-19 11:11:25 -05:00
Parker Moore b1812e7711 Move Kramdown version bump to Minor Enhancements section.
Closes #2069.
2014-02-19 00:13:24 -05:00
Parker Moore 9414280aa7 Update history to reflect merge of #2058 [ci skip] 2014-02-18 01:53:47 -05:00
Parker Moore 7706231f16 Update history to reflect merge of #2041 [ci skip] 2014-02-17 16:23:50 -05:00
Parker Moore 84471ba202 Update history to reflect merge of #1946 [ci skip] 2014-02-16 22:14:43 -05:00
Parker Moore 594e2a94c7 Update history to reflect merge of #2042 [ci skip] 2014-02-16 21:36:40 -05:00
Parker Moore c4f5415ece Update history to reflect merge of #2056 [ci skip] 2014-02-16 21:12:03 -05:00
Parker Moore c6b4c41aab Update history to reflect merge of #2048 [ci skip] 2014-02-15 17:28:06 -05:00
Parker Moore 8d39bf3850 Update history to reflect merge of #2049 [ci skip] 2014-02-15 17:26:34 -05:00
Parker Moore da446c0f19 Update history to reflect merge of #2047 [ci skip] 2014-02-14 15:41:07 -05:00
Matt Rogers c77ef87b05 Update history to reflect merge of #2045 2014-02-14 12:46:10 -06:00
Parker Moore 1482c8aecc Update history to reflect merge of #2044 [ci skip] 2014-02-14 13:36:32 -05:00
Parker Moore 729b6db7c2 Update history to reflect merge of #2009 [ci skip] 2014-02-13 17:56:57 -05:00
Matt Rogers & Persa Zula ec93743659 Update history to reflect merge of #1976 2014-02-13 12:39:00 -06:00
Parker Moore 54e5e660db Update history to reflect merge of #2031 [ci skip] 2014-02-13 12:54:21 -05:00
Parker Moore 8929d1bd63 Update history to reflect merge of #2038 [ci skip] 2014-02-13 12:52:54 -05:00
Parker Moore b6c8b39899 Update history to reflect merge of #1988 [ci skip] 2014-02-08 17:08:30 -05:00
Parker Moore 2e2563fab9 Update history to reflect merge of #2015 [ci skip] 2014-02-08 00:34:16 -05:00
Parker Moore 71b2257829 Update history to reflect merge of #2016 [ci skip] 2014-02-08 00:33:32 -05:00
Parker Moore a63e62f643 Update history to reflect merge of #2020 [ci skip] 2014-02-08 00:32:20 -05:00
Parker Moore 182a49fcff Update history to reflect merge of #2013 [ci skip] 2014-02-04 17:04:01 -05:00
Matt Rogers 1e6847c43f Update history to reflect merge of #1982 2014-01-31 08:48:18 -06:00
Matt Rogers 37dbc646a1 Update history to reflect merge of #2005 2014-01-31 08:45:14 -06:00
Matt Rogers 1470a8a997 Update history to reflect merge of #2004 2014-01-31 08:44:33 -06:00
Parker Moore 03ba5d8d18 Update history to reflect merge of #2001 [ci skip] 2014-01-31 00:24:59 -05:00
Matt Rogers 669cc496cd Update history to reflect merge of #1991 2014-01-30 20:39:46 -06:00
Parker Moore 1d014edca2 Update history to reflect merge of #1999 [ci skip] 2014-01-28 23:40:08 -05:00
Parker Moore dbd3d15f29 Update history to reflect merge of #1998 [ci skip] 2014-01-28 23:39:12 -05:00
Parker Moore c9a732c4f9 Update history to reflect merge of #1993 [ci skip] 2014-01-26 13:39:31 -05:00
Matt Rogers ea397d0946 Update history to reflect merge of #1984 2014-01-24 21:45:37 -06:00
Matt Rogers ecc05e57ae Update history to reflect merge of #1985 2014-01-24 21:42:59 -06:00
Matt Rogers 2e1ab7e6fe Update history to reflect merge of #1983 2014-01-24 21:10:50 -06:00
Matt Rogers b2c45aafdc Update history to reflect merge of #1932 2014-01-24 17:17:55 -06:00
Matt Rogers 8114ae6552 Update history to reflect merge of #1931 2014-01-22 07:38:33 -06:00
Parker Moore 30d8743853 Update history to reflect merge of #1951 [ci skip] 2014-01-21 23:07:28 -05:00
Parker Moore f2fadd6562 Update history to reflect merge of #1962 [ci skip] 2014-01-21 23:05:46 -05:00
Matt Rogers 9210d4ebd8 Update history to reflect merge of #1935 2014-01-21 07:50:14 -06:00
Parker Moore d37ea10cf8 Update history to reflect merge of #1970 [ci skip] 2014-01-19 23:18:59 -05:00
Matt Rogers a859c4509a Update history to reflect merge of #1971 2014-01-19 22:06:43 -06:00
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