Commit Graph

403 Commits (7e75d2f65490c43e4ae0ef97c1cf6fedac4b76c6)
 

Author SHA1 Message Date
Brandon Mathis 7e75d2f654 updated Gemfile.lock
Brandon Mathis 71ad7185bc Merge branch 'sinatra_static_server' of https://github.com/scottwater/octopress into scottwater-sinatra_static_server
Conflicts:
	Gemfile
	Gemfile.lock
Brandon Mathis a289c90909 improved backtick codeblock's handling of the raw option
Brandon Mathis 3d2d1a8be4 1. Vastly improved backtick code blocks and added support for Textile
2. Refactored Octopress filters into Liquid filters and pre/post render filters (using post_filters plugin)
3. Added methods to raw plugin to prevent Markdown and Textile from parsing blocks
4. Updated render partial to invoke the pre_render method of post_filters
5. Moved Rubypants filter out of default.html into Octopress post_render filters
6. Added raw's safe_wrapper method to codeblock and include_code filters
Brandon Mathis b25db54f93 Merge branch 'post_filters'
Brandon Mathis 9d2c76e189 Added {% raw %} liquid block, allowing for blocks of code which are not parsed by Liquid
Brandon Mathis 3d05721908 fixed missing date in page headers
Brandon Mathis fd99f9f7cf Merge branch 'post_filters_plugin' of https://github.com/tedkulp/octopress into post_filters
Brandon Mathis 31b5388402 Downcased category urls
Brandon Mathis c604af28da removed unicode_utils as a dependency
Chun-wei Kuo 7e976cbc60 Improved support for non Latin characters in category names. Fixes
Brandon Mathis 4c21e69093 Time metadata for updated pages and posts are now displayed where and when it is appropriate
Brandon Mathis 8c0dd58ee6 changed left angle quote to dash for page titles
Ted Kulp 5eea47c8d6 Added post_filters plugin
Plugins that extend PostFilter will get three
additional methods: pre_render, post_render and
post_write. These will be called when every page
or post is processed and allows for the plugin to
modify the post/page object directly to modify
the output beyond what can be done with just
markup.
Brandon Mathis b812500f39 Updated new_post and new_page taks to use new ask method for dialogs
Brandon Mathis ed0c220523 Merge branch 'master' of https://github.com/fhemberger/octopress into fhemberger-master
Conflicts:
	plugins/category_generator.rb
fhemberger f03c4cdb2a install: Adds confirmation before overwriting existing source_dir
fhemberger 80f8a609f6 Improved support for non Latin characters in category names. Fixes
fhemberger dae6cceec2 show page.title first, best practice for SEO and usability (e.g. bookmarks)
fhemberger 8de095bfa9 move code for Twitter, Google +1 and Google Analytics to bottom of page, as inline <script> tags are always blocking page load
fhemberger 2efe11e0eb 'updated' is not a valid attribute for <time>, moved to data attribute
fhemberger b6f1451b77 datetime must be valid date format, see: http://www.whatwg.org/specs/web-apps/current-work/multipage/common-microsyntaxes.html#concept-datetime
fhemberger 104bff64ee use semantic HTML5 element for Google +1 button, see: http://code.google.com/intl/en-US/apis/+1button/#plusonetag
Brandon Mathis 3cedd387a0 Merge branch 'pilif-github-repositories-plugin'
Brandon Mathis c8eded1d0e changed order for Github 3rd-party configs
Brandon Mathis 9bc641d4a8 added github asides to the default asides list
Brandon Mathis 597c7eb2b1 Merge branch 'master' of github.com:imathis/octopress
Brandon Mathis 17301879cd reverted back to \W in category_generator. Tracking on
Brandon Mathis 5324fa9e4c Merge branch 'github-repositories-plugin' of https://github.com/pilif/octopress into pilif-github-repositories-plugin
Brandon Mathis 3a7b581afe Merge pull request from tobym/master
Fixes issue 126, broken line height on "diff" syntax highlighting
Brandon Mathis 4f9c45f24a Improved support for non Latin characters in category names. Fixes
Brandon Mathis 3f07677276 Added prompt for overwriting posts and pages when a new_post and new_page tasks are run and the file already exists. Fixes
Brandon Mathis 724fd1dbc8 fixed bug where update_source Rake task was not copying over changes from .themes
Brandon Mathis bd44056045 fixed bug with twitter feed where it would sometimes say "undefined" if the post was more than a month old
Toby Matejovsky f033475b4a Fix broken line height in diff syntax highlighting
Brandon Mathis 376a22a355 removed right border from #content when sidebar has been removed
Brandon Mathis 5efd0fb08e Merge pull request from rtgibbons/master
rsync deploy broken (fix included)
Ryan Gibbons aa095689e4 not using cd in copydot, breaks chained task when further cd's are called
Brandon Mathis 9b52d40a54 removed octopress.org rsync deploy config from Rakefile. Oops
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 35a158dd14 Somehow I replaced Rakefile with oder version, oops
Brandon Mathis b38b613908 Added warning if users try to add posts, pages, or generate their site
before installing an Octopress theme, fixes 
Brandon Mathis 94fcb60958 removed unnecessary mkdir_p in update_style, fixed
Brandon Mathis ebd5fb002b sleeps wait, cleaned up rake preview and rake watch a bit
Benjamin R Doerr efb7522491 Do not rely on system specifc syntax for preview or watch.
Benjamin R Doerr 5f08abe6dd Removes system specific File IO from Rakefile, rather we make use of FileUtils.
Ben Doerr 9d57455e0f Makes update_source and update_style much more windows friendly.
Brandon Mathis 599cd4e07c updated date now shows up properly
Brandon Mathis 282723ef3e updated Gemfile.lock, fixes
Brandon Mathis 806d27db13 using @extend for responsive blocks, added shadow-box mixin to utlities for configurable border shadow box styling, moved .left, .right, .center classes to .basic-alignment class for @extending as needed in layouts. Fixes