Commit Graph

51 Commits (ed0c220523f81a9f29009f8bbb75ff50052465d4)

Author SHA1 Message Date
Brandon Mathis ed0c220523 Merge branch 'master' of https://github.com/fhemberger/octopress into fhemberger-master
Conflicts:
	plugins/category_generator.rb
fhemberger 80f8a609f6 Improved support for non Latin characters in category names. Fixes
Brandon Mathis 17301879cd reverted back to \W in category_generator. Tracking on
Brandon Mathis 4f9c45f24a Improved support for non Latin characters in category names. Fixes
masukomi e20e68139c sitemap_generator dies if public dir doesn't exist yet
this tests for the presence of the public dir and creates
it if needed. This situation can arise in a new install.
Brandon Mathis 11c6e1f7a7 include_code now defaults to relative urls for easy testing on a development server
Brandon Mathis 089af26b02 improved lang:language for codeblock and include code. It no longer strips out surrounding whitespace.
Brandon Mathis 83d87f98cc added option to force syntax highlighting language, example: {% include_code file lang:ruby %}. Fixes
Brandon Mathis 358d02a4a7 centralized pygments aliases into pygments_code.rb. Added alias for .ru (ruby), which sort of fixes
Brandon Mathis 596ec87c37 now only excerpted articles show the "read on" link. Also the text for that link can be set in the _config.yml
Brandon Mathis cf31601d4b reordered arguments in pagination
Brandon Mathis ef4a42f977 Codeblock regex improved to better detect extensions fixes , added support for tableizing non highlighted code blocks from liquid codeblock tag and backtick code blocks
Brandon Mathis 1c555116be Added support for pagination with a blog index in any directory (helps with landing pages). Added configuration for pagination directory base
Brandon Mathis a5f87149fe expand_urls now correctly matches urls pointing to the root directory, allowing / to be replaced with /subdir/ if site is configured with a different root directory
Brigham Brown 648d4cc238 Fix extra subdirectories appearing in category links and atom.xml link.
Brandon Mathis 7b52fb492e added yml alias for yaml code highlighting
Brandon Mathis 08dc63a95e added a raw option to render_partial. Now you can import partials without having them parsed by the Liquid template parser
Brandon Mathis 6009daa8a2 code_block and inlcude_code no longer needlessly render through the Liquid template parser
Brandon Mathis ff1dba19f2 Backtick codeblocks now correctly replace & with & and Textile support for back tick code blocks has been removed. It never really worked. Textile makes me sad.
Brandon Mathis 141800087f Merge branch 'woodwardjd-master'
Brandon Mathis cb6442e624 fixed empty line stripping from codeblocks
Brandon Mathis ffc730fc0d Merge branch 'master' of https://github.com/woodwardjd/octopress into woodwardjd-master
Brandon Mathis c837acd497 added support for width and height to image tag plugin
Brandon Mathis 20de112526 include_code is now more forgiving, stripping leading forward slashes from the code_dir config
Brandon Mathis 49a67785dc Add support using github backtick code blocks without supplying a language
Brandon Mathis a516c773d1 improved replacement filters for textile markup on github backtick codeblocks, added comment to show regular HTML support
Brandon Mathis 7209aaf64c updated Github style backtick filter to support textile, markdown and html
Jason Woodward d8b17814e0 allow select and order of sidebar components to be configurable in jekyll's _config.yml
Andreas Arnold 2d8a17cd41 making textile and code blocks work nice together
Brandon Mathis 4a2254665c fixed bug where multiple github style codeblcoks were getting eaten
Brandon Mathis d0f56ef1ca fixed bug in backtick_codeblock where indentations were being unintentionally removed
Brandon Mathis 6e2beaa969 added support for github style backtick code blocks
Brandon Mathis 7b81aab5ac added support for pygments.rb removing dependency on pygments, added support for caching highlighted code from pygments.rb and added default line numbering. Javascript auto line numbering now only occurs for embedded gists
Brandon Mathis 20764e31ee updated syntax highlighting support for perl and objective c in code_block and include_code plugins
Brandon Mathis d5aa08d3f3 added video tag plugin
Brandon Mathis a80cb12c8c fixed typos and cleand up the image tag plugin
Brandon Mathis fe074b2c1b removed some unnecessary steps from the category_generator plugin to avoid confusion
Brandon Mathis da38dbe584 fixed misspelling of exerpt to excerpt for in the Octopress filters
Brandon Mathis a2bc6f9762 1. Added image tag plugin
2. Removed figure tag plugin
3. Renamed custom_filters to octopress_filters
4. Added styles to support new image tag plugin
Brandon Mathis 8e489ac2da fixed error in pullquote plugin
Brandon Mathis 967eeb46e8 blockquote plugin now allows for source attribution with out a link, see docs
Brandon Mathis ba0e5ef4a3 Render partial now automatically stirps out yaml front matter
Brandon Mathis 39d56bc988 Finally a nice solution for mapping relative urls
Brandon Mathis 44e1351fc7 1. Added condition to full_url filter to allow it to be used as a root_url appending filter for remapping root "/" urls when octopress is deployed to a subdirectory. Updated _includes/article and _layouts/page to use the filter
2. Added documentation for the include_code plugin
Brandon Mathis 0843c02f4e improved documentation on codeblock plugin
Brandon Mathis c030550917 added optional title to include code tag
Brandon Mathis ae51fe859e removed incorrect usage of gsub! which was returning nil if the substitution was not found. Now strips leading and trailing whitespace
Brandon Mathis 3587076aed updated gist_tag.rb to use <div>s to get around RDiscount's foolishness
Brandon Mathis 6f646e7290 added <div> wrappers to code blocks because rdiscount stupidly wraps <figure> tags with paragraphs. Grr.
Brandon Mathis a71a709cb3 Fixed a bug where blockquotes broke without an author, also refactored a bit for reability