Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #178 from matrixagent/patch-1 | Frederic Hemberger | 2011-09-25 | 1 | -1/+2 |
|\ | | | | | Changed rsync deployment so the ssh port is configurable as well. | ||||
| * | Typo. | Manu | 2011-09-26 | 1 | -1/+1 |
| | | |||||
| * | Changed it so the ssh port is configurable as well. (As I ran into the same ↵ | Manu | 2011-09-26 | 1 | -1/+2 |
| | | | | | | | | issue already described at https://github.com/imathis/octopress/issues/30 ) | ||||
* | | Ender.js is now loaded locally instead of hotlinking | Brandon Mathis | 2011-09-25 | 2 | -2/+38 |
| | | |||||
* | | now layouts or pages can specify "sidebar: collapse" in the yaml front ↵ | Brandon Mathis | 2011-09-25 | 2 | -10/+12 |
|/ | | | | matter for an always collapsed sidebar | ||||
* | Merge branch 'master' of github.com:imathis/octopress | Brandon Mathis | 2011-09-25 | 1 | -1/+1 |
|\ | |||||
| * | Fixes child selector for param[name=movie], #168 | Frederic Hemberger | 2011-09-24 | 1 | -1/+1 |
| | | |||||
* | | mobile nav javascript updated to still work with role='main-navigation' ↵ | Brandon Mathis | 2011-09-25 | 1 | -0/+1 |
|/ | | | | since changes affecting custom partials don't get updated with the standard update script | ||||
* | Merge branch 'master' of github.com:imathis/octopress | Brandon Mathis | 2011-09-22 | 1 | -0/+1 |
|\ | |||||
| * | Merge pull request #171 from fmcypriano/master | Brandon Mathis | 2011-09-22 | 1 | -0/+1 |
| |\ | | | | | | | Add .rbenv-version file to simplify the installation when using rbenv | ||||
| | * | Add .rbenv-version file to simplify the installation using rbenv | Felipe Cypriano | 2011-09-22 | 1 | -0/+1 |
| |/ | |||||
* | | added slugignore to help with heroku deployment | Brandon Mathis | 2011-09-22 | 1 | -0/+3 |
| | | |||||
* | | now Github pages :push task forces | Brandon Mathis | 2011-09-22 | 1 | -1/+1 |
|/ | |||||
* | renamed github pages configuration task | Brandon Mathis | 2011-09-22 | 1 | -1/+1 |
| | |||||
* | Restored copying public into _deploy. fixes #169 | Brandon Mathis | 2011-09-22 | 1 | -0/+1 |
| | |||||
* | improved github configuration raketask | Brandon Mathis | 2011-09-22 | 1 | -9/+38 |
| | |||||
* | copydot task can be called with parameters, no need for separate copydot_deploy | Frederic Hemberger | 2011-09-22 | 1 | -19/+8 |
| | |||||
* | Fixed issue where dotfiles were not being copied to _deploy for github pages ↵ | Brandon Mathis | 2011-09-21 | 1 | -2/+13 |
| | | | | deployments | ||||
* | fixed issue where public was being copied into _deploy | Brandon Mathis | 2011-09-21 | 1 | -1/+1 |
| | |||||
* | Minor fixes | Frederic Hemberger | 2011-09-21 | 3 | -6/+6 |
| | |||||
* | Fixed misuse of ARIA roles (see ↵ | Frederic Hemberger | 2011-09-21 | 12 | -29/+29 |
| | | | | http://dev.opera.com/articles/view/introduction-to-wai-aria/) | ||||
* | Refactored inclusion of disqus script | Frederic Hemberger | 2011-09-21 | 6 | -44/+44 |
| | | | | | | | | - Added ARIA setting `aria-live="polite"` to comment output - Removed duplicate <div id="disqus_thread"> from page/post templates - Moved blocking JavaScript loading to the end of the document body. - Merged JavaScript code for index and pages/posts using conditionals - Moved global JavaScript disqus variables into the anonymous function to stop pollution of global namespace | ||||
* | Added optional comment count for disqus, fixes #88 | Frederic Hemberger | 2011-09-21 | 2 | -1/+7 |
| | |||||
* | Updated regex to select less content on posts | Frederic Hemberger | 2011-09-21 | 1 | -1/+1 |
| | |||||
* | Fixes whitespace, removed unnecessary closing '/' in HTML5 | Frederic Hemberger | 2011-09-21 | 1 | -4/+4 |
| | |||||
* | Adds first 150 chars of content as meta description, if no page.description ↵ | Frederic Hemberger | 2011-09-21 | 2 | -6/+11 |
| | | | | specified. Fixes #162 | ||||
* | Merge pull request #159 from tmiller/patch-1 | Frederic Hemberger | 2011-09-19 | 1 | -1/+1 |
|\ | | | | | Removing glob because globbing does not pick up dotfiles. | ||||
| * | Removing glob because globbing does not pick up dotfiles. | Tom Miller | 2011-09-19 | 1 | -1/+1 |
|/ | |||||
* | Fixes styling of <figure> code header | Frederic Hemberger | 2011-09-18 | 2 | -4/+4 |
| | |||||
* | Wraps git commit message in double quotes, fixes #139 | Frederic Hemberger | 2011-09-18 | 1 | -2/+2 |
| | |||||
* | Fixes HTML validation issues with code highlighting | Frederic Hemberger | 2011-09-18 | 3 | -7/+7 |
| | |||||
* | Fixes spacing and global variable leaks, JSHint check | Frederic Hemberger | 2011-09-18 | 1 | -41/+44 |
| | | | | | | octopress.js now almost passes JSHint (http://jshint.com). The only issues left are due to undefined Modernizr and swfobject objects and the compressed swfobject code at the end of the file, but those are neglectable. | ||||
* | Aligns naming of .pygments-cache, .gist-cache and .sass-cache | Frederic Hemberger | 2011-09-18 | 4 | -6/+6 |
| | |||||
* | Merge pull request #154 from jcsims/rake_dotcopy_fix | Brandon Mathis | 2011-09-17 | 1 | -1/+1 |
|\ | | | | | Fixes #150. Strip leading path before checking for excluded file. | ||||
| * | Fixes #150. Strip leading path before checking for excluded file. | Chris Sims | 2011-09-17 | 1 | -1/+1 |
|/ | |||||
* | removes index.html from canonical urls. closes #153 | Brandon Mathis | 2011-09-17 | 1 | -2/+2 |
| | |||||
* | added itegration to gen_deploy | Brandon Mathis | 2011-09-12 | 1 | -1/+1 |
| | |||||
* | Fix an issue in 'watch' and 'preview' where main process is terminated with ↵ | fhemberger | 2011-09-12 | 1 | -9/+6 |
| | | | | child processes still running | ||||
* | Move generate + deploy to separate task | fhemberger | 2011-09-12 | 1 | -1/+6 |
| | |||||
* | Generate site before deploying, execute tasks in sequence | fhemberger | 2011-09-12 | 1 | -1/+2 |
| | |||||
* | Copy dotfiles also for subdirectories | fhemberger | 2011-09-12 | 1 | -4/+4 |
| | |||||
* | moved from Posix::Span to Process.span, fixing #46 | Brandon Mathis | 2011-09-08 | 1 | -5/+5 |
| | |||||
* | updated Gemfile.lock | Brandon Mathis | 2011-09-08 | 1 | -4/+0 |
| | |||||
* | Merge branch 'sinatra_static_server' of ↵ | Brandon Mathis | 2011-09-08 | 3 | -36/+39 |
|\ | | | | | | | | | | | | | | | https://github.com/scottwater/octopress into scottwater-sinatra_static_server Conflicts: Gemfile Gemfile.lock | ||||
| * | Static Server based on Sinatra | Scott Watermasysk | 2011-08-21 | 3 | -36/+35 |
| | | | | | | | | | | | | | | | | Using Sinatra provides better handling of mime types and supports 304's/etc. Also updated the Gemfile to exclude most gem outside of developemnt (default). | ||||
* | | improved backtick codeblock's handling of the raw option | Brandon Mathis | 2011-09-07 | 1 | -4/+5 |
| | | |||||
* | | 1. Vastly improved backtick code blocks and added support for Textile | Brandon Mathis | 2011-09-07 | 7 | -55/+107 |
| | | | | | | | | | | | | | | | | 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 | ||||
* | | Merge branch 'post_filters' | Brandon Mathis | 2011-09-07 | 1 | -0/+176 |
|\ \ | |||||
| * \ | Merge branch 'post_filters_plugin' of https://github.com/tedkulp/octopress ↵ | Brandon Mathis | 2011-09-05 | 1 | -0/+176 |
| |\ \ | | | | | | | | | | | | | into post_filters | ||||
| | * | | Added post_filters plugin | Ted Kulp | 2011-09-04 | 1 | -0/+176 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. |