Commit Graph

683 Commits (1c7919902d38a15835a1657a19ec9cf9bbb151be)
 

Author SHA1 Message Date
Brandon Mathis 1c7919902d Merge pull request from peterboni/patch-1
Mobile nav fixed.
Brandon Mathis c35ff7b660 Fixed GitHub jsonp call. Closed
Brandon Mathis 4157cda54c removed Twitter configuration for timeline and follow buton which are no longer integrated
peterboni dee2900ba2 Mobile nav fixed.
Now shows links instead of 'undefined'.
Brandon Mathis 98013543d9 Removed Twitter and Ender.js. Added jQuery and updated Modernizr
Parker Moore cf5e909626 Merge branch 'master' of github.com:imathis/octopress
* '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.
Parker Moore 3548752af0 Added .gitattributes file to keep CRLF's out of the codebase.
Parker Moore 16c18e4191 Merge pull request from rretsiem/patch-2
Async load of Facebook JS
Parker Moore 392e32bef0 Merge pull request from sjml/patch-1
Generate can fail if Pygments can't parse a code block
Parker Moore 524e337aec Merge pull request from earaya/master
Styles & scripts optimization in the document head
Parker Moore e2596c02cb Merge pull request from vyper/master
Added stringex and changed to use #to_url for create directory.
Parker Moore 880b0fbdac Merge pull request from treyhunner/topic/editorconfig
Add EditorConfig files to define indentation styles
Parker Moore 7f4cf25546 Merge branch 'master' of github.com:imathis/octopress
* 'master' of github.com:imathis/octopress:
  Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh. 
  Fix for bottom margin in nested lists.
Parker Moore de8e79f348 Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh.
Parker Moore e7a9b3fe40 Merge pull request from NSError/list-fix
Fix for bottom margin in nested lists.
Parker Moore 407a242f2d Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh.
Parker Moore 51905b6a90 Merge pull request from roman-yepishev/gist_error
Raise RuntimeError when gist is unavailable - 
Parker Moore f4f42823f6 Merge pull request from joneslee85/bump-sinatra
Bump sinatra to 1.3.5
Trung Lê 960145fa20 Bump sinatra to 1.3.5
Leonardo Saraiva 2fe9da91f5 Merge branch 'master' of github.com:imathis/octopress
Conflicts:
	plugins/category_generator.rb
Parker Moore 4790b93980 It's 2013. Hi, MIT License.
Parker Moore cc5f508a10 Use HTML5 '&' character to connect query params in GitHub API call. .
Parker Moore 8fada73b78 Merge pull request from schwern/github_repo_sorting
Use the Github API repo sorting.
Michael G. Schwern cc93e6fc98 Use the Github API repo sorting.
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.
Floyd Pink 43751b76d3 Fixed issue with mobile nav choosing the last option by default. Fixes .
Floyd Pink 510c6d602b fixed issue using @alexkirmse's patch
Shane Liesegang 35e23f59ca Update plugins/pygments_code.rb
Giving a more helpful error message instead of silently failing.
René d5b491f704 Async load of Facebook JS
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.
sjml 9293ecc174 Update plugins/pygments_code.rb
Making it so the build doesn't fail if a bad lexer is passed to the code highlighting.
Parker Moore f109abe9f6 Added travis stamp of approval to README.
Parker Moore d65618f60c Added travis.yml so travis doesn't fail for every master branch PR and push
Brandon Mathis 5b887fef97 improved regexes for setup_github_pages task
Brandon Mathis 963eff26eb Removed unnecessary passive group from octopress origin regex
Vaz Allen 54fb2173d1 setup_github_pages: allow for clones missing .git extension
Brandon Mathis 8bf09b178d Video tag plugin now supports mp4,ogv,webm formats, closes
Brandon Mathis cd6926e41b Striped whitespace from titles in blockquote plugin
Sean Kerr d686105bda Fixed blockquote plugin (author alone would not show up without title)
Brandon Mathis d774630d3e Improved error message for category_generator plugin. Addresses
Parker Moore 745e8f77bb Merge pull request from richo/cleanup/whitespace
Whitespace
richo 5b332f5c95 Whitespace
Brandon Mathis 9decd23b5a updated ender.js to latest
Brandon Mathis 0a2fb6c4d8 Merge pull request from rixth/master
Escape github repo descriptions, as they may contain HTML.
Thomas Rix bcdc904843 Escape github repo descriptions, as they may contain HTML.
Brandon Mathis c814560c86 removed accidentally added file
Brandon Mathis 65f7f7f0b3 Rake task new_post now accepts titles through stdin
This should help resolve issues for zsh users and make it easier to enter titles which freak out Rake's argument processing
Brandon Mathis 67d07b9dce Merge pull request from joseprio/master
robots.txt generation
Brandon Mathis e179277e40 updated gems
Brandon Mathis ce7f6e92a2 Merge pull request from dtchepak/category_link_filter
Extract category_link filter from category_generator.rb plugin
Brandon Mathis 55fa9b3d8e Removed unnecessary regex in code block plugin
Brandon Mathis c18de55875 Titles in code plugins can have slashes in them. Closes