Commit Graph

460 Commits

Author SHA1 Message Date
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
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
Parker Moore d2e948600f Update history to reflect merge of #1787 2013-12-08 01:05:10 -05:00
Parker Moore fa3476dd2a Update history to reflect merge of #1657 2013-12-08 00:43:44 -05:00
Parker Moore 315fb0cf20 Use YYYY-MM-DD in History file :) 2013-12-07 19:31:48 -05:00
Matt Rogers 7da676bcc2 Update History.markdown for the 1.4.0 release 2013-12-07 17:58:51 -06:00
Matt Rogers & Persa Zula 8b0ea62535 Update history to reflect merge of #1779 2013-12-06 23:03:59 -06:00
Parker Moore e14fe116db Update history to reflect merge of #1778 2013-12-05 21:43:11 -05:00
Matt Rogers 654fe6117b Update history to reflect merge of #1682 2013-12-04 20:40:58 -06:00
Matt Rogers dc7be86970 Update history to reflect merge of #1765 2013-12-04 20:28:58 -06:00
Matt Rogers 4076b12400 Update history to reflect merge of #1772 2013-12-04 20:25:34 -06:00
Parker Moore 7af757a3fc Update history to reflect merge of #1762 2013-12-02 15:36:55 -05:00
Parker Moore 6768977c27 Update history to reflect merge of #1755 2013-12-02 15:35:43 -05:00
Parker Moore 9cfe1f0a9c Update history to reflect merge of #1769 2013-12-01 19:27:03 -05:00
Matt Rogers 91a4c5611e Prep for the 1.3.1 release 2013-11-26 20:27:27 -06:00
Matt Rogers 4cc0bdf8ff Update history to reflect merge of #1759 2013-11-26 19:46:46 -06:00
Matt Rogers 47eac96fdc Update history to reflect merge of #1754 2013-11-25 20:56:51 -06:00
Matt Rogers 7cda916faa Update history to reflect merge of #1448 2013-11-22 23:00:24 -06:00
Matt Rogers 33be5b0361 Update history to reflect merge of #1746 2013-11-22 22:30:29 -06:00
Matt Rogers 16f4d025ab Update history to reflect merge of #1736 2013-11-22 22:23:27 -06:00
Matt Rogers 8595ea812c Update history to reflect merge of #1718 2013-11-22 20:32:27 -06:00
Parker Moore ed7fb46b96 Update history to reflect merge of #1741 2013-11-21 15:57:03 -05:00
Parker Moore 063ee6fb67 Update history to reflect merge of #1734 2013-11-19 13:49:52 -05:00
Parker Moore f4918a623b Update history to reflect merge of #1732 2013-11-18 18:59:10 -05:00
Matt Rogers 315cfcd727 Update history to reflect merge of #1730 2013-11-17 23:01:28 -06:00
Matt Rogers 1d81f2553d Update history to reflect merge of #1726 2013-11-15 08:26:45 -06:00
Matt Rogers 6842148389 Update history to reflect merge of #1669 2013-11-10 21:45:47 -06:00
Parker Moore 861f367de7 Update history to reflect merge of #1711 2013-11-08 23:16:36 -05:00
Parker Moore 0a359b586d Update history to reflect merge of #1707 2013-11-08 14:34:33 -05:00
Parker Moore 0819877701 Update history to reflect merge of #1708 2013-11-08 14:28:48 -05:00
Matt Rogers 0a0acaad37 Update history to reflect merge of #1697 2013-11-05 07:45:44 -06:00
Parker Moore a26663fb36 Update history to reflect merge of #1670 2013-11-04 23:21:40 -05:00
Parker Moore 93bd11ea05 Update history to reflect merge of #1695 2013-11-04 23:16:49 -05:00
Parker Moore 2b851be9bd Update history to reflect merge of #1693 2013-11-04 23:15:29 -05:00
Parker Moore 5d672782fb Update jekyllrb.com site history. 2013-11-04 21:07:51 -05:00
Parker Moore b9817ab47b Fix release date of v1.3.0 in History file 2013-11-04 14:40:53 -05:00
Matt Rogers cc0c82f9d2 Prep for the 1.3.0 release 2013-11-03 21:46:02 -06:00
Matt Rogers 3eed1cfed1 Update history to reflect merge of #1691 2013-11-03 09:55:54 -06:00
Matt Rogers e70c71edd4 Update history to reflect merge of #1687 2013-11-01 22:56:05 -05:00
Matt Rogers aebda2b7d8 Update history to reflect merge of #1677 2013-10-30 07:44:49 -05:00
Matt Rogers 700fb7cb6d Fix a typo. 2013-10-28 22:38:29 -05:00
Matt Rogers 1d72b1369f Update history to reflect merge of #1662 2013-10-28 22:37:31 -05:00
Matt Rogers 08adcd4a37 Update history to reflect merge of #1665 2013-10-28 14:36:25 -05:00
Matt Rogers 1eb55119a3 Update history to reflect merge of #1663 2013-10-26 22:11:13 -05:00
Matt Rogers 6949006051 Update history to reflect merge of #1405 2013-10-26 21:59:08 -05:00
Matt Rogers 727a705d67 Update history to reflect merge of #1660 2013-10-25 10:00:05 -05:00
Matt Rogers 9b40ae6b36 Update history to reflect merge of #1582 2013-10-23 22:59:43 -05:00
Matt Rogers 112aa8112d Update history to reflect merge of #1651 2013-10-23 22:51:13 -05:00
Matt Rogers 2397a16658 Update history to reflect merge of #1493 2013-10-23 22:49:50 -05:00
Matt Rogers 2c11a6ec27 Update history to reflect merge of #1589 2013-10-23 22:47:01 -05:00
Matt Rogers 32c7530ea6 Update history to reflect merge of #1656 2013-10-23 22:37:44 -05:00
Matt Rogers 6c001f10ab Update history to reflect merge of #1557 2013-10-23 09:40:39 -05:00
Matt Rogers 58ae8bc0cd Update history to reflect merge of #1543 2013-10-17 08:36:29 -05:00
Matt Rogers 3cd230d66e Update history to reflect merge of #1637 2013-10-17 08:23:26 -05:00
Matt Rogers 6e77788a06 Update history to reflect merge of #1638 2013-10-17 08:21:47 -05:00
Matt Rogers b0ae2c69c9 Update history to reflect merge of #1636 2013-10-17 08:13:28 -05:00
Matt Rogers 61e6a834cb Update history to reflect merge of #1635 2013-10-16 10:10:28 -05:00
Parker Moore 6f7935857a Update history to reflect merge of #1626 2013-10-11 15:35:25 +00:00
Matt Rogers 976cddf477 Update history to reflect merge of #1614 2013-10-10 20:49:55 -05:00
Matt Rogers 441b6d68c2 Update history to reflect merge of #1615 2013-10-10 20:48:27 -05:00
Matt Rogers 110aeee9a2 Update history to reflect merge of #1622 2013-10-10 20:39:23 -05:00
Parker Moore 848a11b3a8 Update history to reflect merge of #1616 2013-10-05 20:38:09 -04:00
Parker Moore 41adc30667 Update history to reflect merge of #1602 2013-10-04 14:40:39 -04:00
Parker Moore 55f4c3a0fd Update history to reflect merge of #1613 2013-10-04 13:37:11 -04:00
Parker Moore 06a757f156 Update history to reflect merge of #1610 2013-10-04 12:31:22 -04:00
Parker Moore 31b6a930c4 Update history to reflect merge of #1603 2013-10-04 12:29:39 -04:00
Parker Moore c32e317236 Update history to reflect merge of #1606 2013-10-04 12:28:56 -04:00
Parker Moore 9dc6fee9c5 Move version updates for development dependencies to 'Development Fixes' heading. 2013-10-04 12:27:53 -04:00
Parker Moore 87693eeffe Update history to reflect merge of #1607 2013-10-04 12:27:19 -04:00
Parker Moore 558dad7e70 Update history to reflect merge of #1604 2013-10-04 12:23:30 -04:00
Parker Moore 2763d785b8 Update history to reflect merge of #1608 2013-10-04 12:21:15 -04:00