aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1116 from peterboni/patch-1Brandon Mathis2013-03-101-2/+2
|\ | | | | Mobile nav fixed.
| * Mobile nav fixed.peterboni2013-03-101-2/+2
| | | | | | Now shows links instead of 'undefined'.
* | Fixed GitHub jsonp call. Closed #1118Brandon Mathis2013-03-101-1/+1
| |
* | removed Twitter configuration for timeline and follow buton which are no ↵Brandon Mathis2013-03-101-5/+1
|/ | | | longer integrated
* Removed Twitter and Ender.js. Added jQuery and updated ModernizrBrandon Mathis2013-03-0913-3370/+22
|
* Merge branch 'master' of github.com:imathis/octopressParker Moore2013-03-064-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-2Parker Moore2013-03-051-1/+1
| |\ | | | | | | Async load of Facebook JS
| | * Async load of Facebook JSRené2013-01-301-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-1Parker Moore2013-03-051-1/+5
| |\ \ | | | | | | | | Generate can fail if Pygments can't parse a code block
| | * | Update plugins/pygments_code.rbShane Liesegang2013-01-301-2/+2
| | | | | | | | | | | | Giving a more helpful error message instead of silently failing.
| | * | Update plugins/pygments_code.rbsjml2013-01-301-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/masterParker Moore2013-03-051-2/+2
| |\ \ | | | | | | | | Styles & scripts optimization in the document head
| | * | optimized order of styles and scripts in headerearaya2012-07-111-2/+2
| | | |
| * | | Merge pull request #629 from vyper/masterParker Moore2013-03-051-2/+4
| |\ \ \ | | | | | | | | | | Added stringex and changed to use #to_url for create directory.
| | * \ \ Merge branch 'master' of github.com:imathis/octopressLeonardo Saraiva2013-02-2427-1529/+3331
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/category_generator.rb
| | * | | | Upgrade ruby versionLeonardo Saraiva2012-11-081-1/+1
| | | | | |
| | * | | | Added stringex and changed to use #to_url for create directory. To don't ↵Leonardo Saraiva2012-06-191-2/+4
| | | |/ / | | |/| | | | | | | | | | | | receive error in url to accented characters.
* | | | | Added .gitattributes file to keep CRLF's out of the codebase.Parker Moore2013-03-061-0/+1
|/ / / /
* | | | Merge pull request #452 from treyhunner/topic/editorconfigParker Moore2013-03-052-0/+66
|\ \ \ \ | | | | | | | | | | Add EditorConfig files to define indentation styles
| * | | | Add EditorConfig file for classic themeTrey Hunner2012-02-261-0/+44
| | | | |
| * | | | Add EditorConfig file for Ruby filesTrey Hunner2012-02-261-0/+22
| | | | |
* | | | | Merge branch 'master' of github.com:imathis/octopressParker Moore2013-03-051-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-fixParker Moore2013-03-051-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix for bottom margin in nested lists.
| | * | | | | Fix for bottom margin in nested lists.Chris Miller2012-02-241-0/+1
| | |/ / / /
| * | | | | Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh. #438Parker Moore2013-03-051-2/+2
| | | | | |
* | | | | | Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh. #438Parker Moore2013-03-051-2/+2
|/ / / / /
* | | | | Merge pull request #438 from roman-yepishev/gist_errorParker Moore2013-03-051-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Raise RuntimeError when gist is unavailable - #437
| * | | | | Convert to integer before comparing. data.code is StringRoman Yepishev2012-02-211-1/+1
| | | | | |
| * | | | | Raise RuntimeError when gist is unavailableRoman Yepishev2012-02-201-0/+3
| |/ / / /
* | | | | Merge pull request #1074 from joneslee85/bump-sinatraParker Moore2013-02-282-6/+6
|\ \ \ \ \ | |_|_|/ / |/| | | | Bump sinatra to 1.3.5
| * | | | Bump sinatra to 1.3.5Trung Lê2013-02-262-6/+6
|/ / / /
* | | | It's 2013. Hi, MIT License.Parker Moore2013-02-221-1/+1
| | | |
* | | | Use HTML5 '&' character to connect query params in GitHub API call. #1031.Parker Moore2013-02-201-1/+1
| | | |
* | | | Merge pull request #1031 from schwern/github_repo_sortingParker Moore2013-02-181-9/+1
|\ \ \ \ | | | | | | | | | | Use the Github API repo sorting.
| * | | | Use the Github API repo sorting.Michael G. Schwern2013-02-181-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 Pink2013-02-151-0/+1
| | | |
* | | | fixed issue #949 using @alexkirmse's patchFloyd Pink2013-02-131-1/+1
| |_|/ |/| |
* | | Added travis stamp of approval to README.Parker Moore2013-01-271-0/+2
| | |
* | | Added travis.yml so travis doesn't fail for every master branch PR and pushParker Moore2013-01-271-0/+5
| | |
* | | improved regexes for setup_github_pages taskBrandon Mathis2013-01-131-2/+2
| | |
* | | Removed unnecessary passive group from octopress origin regexBrandon Mathis2013-01-121-1/+1
| | |
* | | setup_github_pages: allow for clones missing .git extensionVaz Allen2013-01-121-1/+1
| | |
* | | Video tag plugin now supports mp4,ogv,webm formats, closes #931Brandon Mathis2013-01-121-8/+17
| | |
* | | Striped whitespace from titles in blockquote pluginBrandon Mathis2013-01-121-2/+2
| | |
* | | Fixed blockquote plugin (author alone would not show up without title)Sean Kerr2013-01-121-6/+5
| | |
* | | Improved error message for category_generator plugin. Addresses #116Brandon Mathis2013-01-121-1/+11
| | |
* | | Merge pull request #936 from richo/cleanup/whitespaceParker Moore2013-01-116-10/+10
|\ \ \ | | | | | | | | Whitespace
| * | | Whitespacericho2013-01-116-10/+10
|/ / /
* | | updated ender.js to latestBrandon Mathis2013-01-062-1400/+3159
| | |
* | | Merge pull request #914 from rixth/masterBrandon Mathis2013-01-021-1/+4
|\ \ \ | | | | | | | | Escape github repo descriptions, as they may contain HTML.