Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1116 from peterboni/patch-1 | Brandon Mathis | 2013-03-10 | 1 | -2/+2 |
|\ | | | | | Mobile nav fixed. | ||||
| * | Mobile nav fixed. | peterboni | 2013-03-10 | 1 | -2/+2 |
| | | | | | | Now shows links instead of 'undefined'. | ||||
* | | Fixed GitHub jsonp call. Closed #1118 | Brandon Mathis | 2013-03-10 | 1 | -1/+1 |
| | | |||||
* | | removed Twitter configuration for timeline and follow buton which are no ↵ | Brandon Mathis | 2013-03-10 | 1 | -5/+1 |
|/ | | | | longer integrated | ||||
* | Removed Twitter and Ender.js. Added jQuery and updated Modernizr | Brandon Mathis | 2013-03-09 | 13 | -3370/+22 |
| | |||||
* | Merge branch 'master' of github.com:imathis/octopress | Parker Moore | 2013-03-06 | 4 | -6/+12 |
|\ | | | | | | | | | | | | | | | | | | | * 'master' of github.com:imathis/octopress: Update plugins/pygments_code.rb Async load of Facebook JS Update plugins/pygments_code.rb Upgrade ruby version optimized order of styles and scripts in header Added stringex and changed to use #to_url for create directory. To don't receive error in url to accented characters. | ||||
| * | Merge pull request #991 from rretsiem/patch-2 | Parker Moore | 2013-03-05 | 1 | -1/+1 |
| |\ | | | | | | | Async load of Facebook JS | ||||
| | * | Async load of Facebook JS | René | 2013-01-30 | 1 | -1/+1 |
| | | | | | | | | | | | | added async switch = TRUE to loader. According to Google PageSpeed the Facebook JS was not loaded async which blocks rendering of the page as long as the JS isn't fully loaded. | ||||
| * | | Merge pull request #990 from sjml/patch-1 | Parker Moore | 2013-03-05 | 1 | -1/+5 |
| |\ \ | | | | | | | | | Generate can fail if Pygments can't parse a code block | ||||
| | * | | Update plugins/pygments_code.rb | Shane Liesegang | 2013-01-30 | 1 | -2/+2 |
| | | | | | | | | | | | | Giving a more helpful error message instead of silently failing. | ||||
| | * | | Update plugins/pygments_code.rb | sjml | 2013-01-30 | 1 | -1/+5 |
| | |/ | | | | | | | Making it so the build doesn't fail if a bad lexer is passed to the code highlighting. | ||||
| * | | Merge pull request #664 from earaya/master | Parker Moore | 2013-03-05 | 1 | -2/+2 |
| |\ \ | | | | | | | | | Styles & scripts optimization in the document head | ||||
| | * | | optimized order of styles and scripts in header | earaya | 2012-07-11 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #629 from vyper/master | Parker Moore | 2013-03-05 | 1 | -2/+4 |
| |\ \ \ | | | | | | | | | | | Added stringex and changed to use #to_url for create directory. | ||||
| | * \ \ | Merge branch 'master' of github.com:imathis/octopress | Leonardo Saraiva | 2013-02-24 | 27 | -1529/+3331 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/category_generator.rb | ||||
| | * | | | | Upgrade ruby version | Leonardo Saraiva | 2012-11-08 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Added stringex and changed to use #to_url for create directory. To don't ↵ | Leonardo Saraiva | 2012-06-19 | 1 | -2/+4 |
| | | |/ / | | |/| | | | | | | | | | | | | receive error in url to accented characters. | ||||
* | | | | | Added .gitattributes file to keep CRLF's out of the codebase. | Parker Moore | 2013-03-06 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #452 from treyhunner/topic/editorconfig | Parker Moore | 2013-03-05 | 2 | -0/+66 |
|\ \ \ \ | | | | | | | | | | | Add EditorConfig files to define indentation styles | ||||
| * | | | | Add EditorConfig file for classic theme | Trey Hunner | 2012-02-26 | 1 | -0/+44 |
| | | | | | |||||
| * | | | | Add EditorConfig file for Ruby files | Trey Hunner | 2012-02-26 | 1 | -0/+22 |
| | | | | | |||||
* | | | | | Merge branch 'master' of github.com:imathis/octopress | Parker Moore | 2013-03-05 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:imathis/octopress: Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh. #438 Fix for bottom margin in nested lists. | ||||
| * \ \ \ \ | Merge pull request #448 from NSError/list-fix | Parker Moore | 2013-03-05 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix for bottom margin in nested lists. | ||||
| | * | | | | | Fix for bottom margin in nested lists. | Chris Miller | 2012-02-24 | 1 | -0/+1 |
| | |/ / / / | |||||
| * | | | | | Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh. #438 | Parker Moore | 2013-03-05 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh. #438 | Parker Moore | 2013-03-05 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #438 from roman-yepishev/gist_error | Parker Moore | 2013-03-05 | 1 | -0/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Raise RuntimeError when gist is unavailable - #437 | ||||
| * | | | | | Convert to integer before comparing. data.code is String | Roman Yepishev | 2012-02-21 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Raise RuntimeError when gist is unavailable | Roman Yepishev | 2012-02-20 | 1 | -0/+3 |
| |/ / / / | |||||
* | | | | | Merge pull request #1074 from joneslee85/bump-sinatra | Parker Moore | 2013-02-28 | 2 | -6/+6 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Bump sinatra to 1.3.5 | ||||
| * | | | | Bump sinatra to 1.3.5 | Trung Lê | 2013-02-26 | 2 | -6/+6 |
|/ / / / | |||||
* | | | | It's 2013. Hi, MIT License. | Parker Moore | 2013-02-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | Use HTML5 '&' character to connect query params in GitHub API call. #1031. | Parker Moore | 2013-02-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #1031 from schwern/github_repo_sorting | Parker Moore | 2013-02-18 | 1 | -9/+1 |
|\ \ \ \ | | | | | | | | | | | Use the Github API repo sorting. | ||||
| * | | | | Use the Github API repo sorting. | Michael G. Schwern | 2013-02-18 | 1 | -9/+1 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Github API can sort by pushed time, no need to do it manually. http://developer.github.com/v3/repos/#list-user-repositories This is both more efficient, Github does the sorting, but it also fixes a bug. Because the list of results are paginated, if you have more than a page's worth of repositories it will only sort that page. This results in a false view of what has been recently pushed. For a good example, try my github account "schwern" with and without this patch. | ||||
* | | | | Fixed issue with mobile nav choosing the last option by default. Fixes #950. | Floyd Pink | 2013-02-15 | 1 | -0/+1 |
| | | | | |||||
* | | | | fixed issue #949 using @alexkirmse's patch | Floyd Pink | 2013-02-13 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Added travis stamp of approval to README. | Parker Moore | 2013-01-27 | 1 | -0/+2 |
| | | | |||||
* | | | Added travis.yml so travis doesn't fail for every master branch PR and push | Parker Moore | 2013-01-27 | 1 | -0/+5 |
| | | | |||||
* | | | improved regexes for setup_github_pages task | Brandon Mathis | 2013-01-13 | 1 | -2/+2 |
| | | | |||||
* | | | Removed unnecessary passive group from octopress origin regex | Brandon Mathis | 2013-01-12 | 1 | -1/+1 |
| | | | |||||
* | | | setup_github_pages: allow for clones missing .git extension | Vaz Allen | 2013-01-12 | 1 | -1/+1 |
| | | | |||||
* | | | Video tag plugin now supports mp4,ogv,webm formats, closes #931 | Brandon Mathis | 2013-01-12 | 1 | -8/+17 |
| | | | |||||
* | | | Striped whitespace from titles in blockquote plugin | Brandon Mathis | 2013-01-12 | 1 | -2/+2 |
| | | | |||||
* | | | Fixed blockquote plugin (author alone would not show up without title) | Sean Kerr | 2013-01-12 | 1 | -6/+5 |
| | | | |||||
* | | | Improved error message for category_generator plugin. Addresses #116 | Brandon Mathis | 2013-01-12 | 1 | -1/+11 |
| | | | |||||
* | | | Merge pull request #936 from richo/cleanup/whitespace | Parker Moore | 2013-01-11 | 6 | -10/+10 |
|\ \ \ | | | | | | | | | Whitespace | ||||
| * | | | Whitespace | richo | 2013-01-11 | 6 | -10/+10 |
|/ / / | |||||
* | | | updated ender.js to latest | Brandon Mathis | 2013-01-06 | 2 | -1400/+3159 |
| | | | |||||
* | | | Merge pull request #914 from rixth/master | Brandon Mathis | 2013-01-02 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | Escape github repo descriptions, as they may contain HTML. |