Mic92/blog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
678 Commits 1 Branch 0 Tags 23 MiB
cf5e909626
Commit Graph

678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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.
 2013-03-06 01:29:52 +01:00
Parker Moore
3548752af0 Added .gitattributes file to keep CRLF's out of the codebase. 2013-03-06 01:29:40 +01:00
Parker Moore
16c18e4191 Merge pull request #991 from rretsiem/patch-2 
Async load of Facebook JS
 2013-03-05 16:11:33 -08:00
Parker Moore
392e32bef0 Merge pull request #990 from sjml/patch-1 
Generate can fail if Pygments can't parse a code block
 2013-03-05 16:03:33 -08:00
Parker Moore
524e337aec Merge pull request #664 from earaya/master 
Styles & scripts optimization in the document head
 2013-03-05 15:12:23 -08:00
Parker Moore
e2596c02cb Merge pull request #629 from vyper/master 
Added stringex and changed to use #to_url for create directory.
 2013-03-05 14:58:55 -08:00
Parker Moore
880b0fbdac Merge pull request #452 from treyhunner/topic/editorconfig 
Add EditorConfig files to define indentation styles
 2013-03-05 14:52:02 -08:00
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. #438
  Fix for bottom margin in nested lists.
 2013-03-05 23:44:02 +01:00
Parker Moore
de8e79f348 Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh. #438 2013-03-05 23:42:59 +01:00
Parker Moore
e7a9b3fe40 Merge pull request #448 from NSError/list-fix 
Fix for bottom margin in nested lists.
 2013-03-05 14:40:29 -08:00
Parker Moore
407a242f2d Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh. #438 2013-03-05 23:39:27 +01:00
Parker Moore
51905b6a90 Merge pull request #438 from roman-yepishev/gist_error 
Raise RuntimeError when gist is unavailable - #437
 2013-03-05 14:37:08 -08:00
Parker Moore
f4f42823f6 Merge pull request #1074 from joneslee85/bump-sinatra 
Bump sinatra to 1.3.5
 2013-02-28 12:55:13 -08:00
Trung Lê
960145fa20 Bump sinatra to 1.3.5 2013-02-26 00:13:28 +11:00
Leonardo Saraiva
2fe9da91f5 Merge branch 'master' of github.com:imathis/octopress 
Conflicts:
	plugins/category_generator.rb
 2013-02-24 20:51:31 -03:00
Parker Moore
4790b93980 It's 2013. Hi, MIT License. 2013-02-22 14:56:42 +01:00
Parker Moore
cc5f508a10 Use HTML5 '&' character to connect query params in GitHub API call. #1031. 2013-02-20 17:46:15 +01:00
Parker Moore
8fada73b78 Merge pull request #1031 from schwern/github_repo_sorting 
Use the Github API repo sorting.
 2013-02-18 18:00:55 -08:00
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.
 2013-02-18 14:17:32 +11:00
Floyd Pink
43751b76d3 Fixed issue with mobile nav choosing the last option by default. Fixes #950. 2013-02-15 02:22:58 +01:00
Floyd Pink
510c6d602b fixed issue #949 using @alexkirmse's patch 2013-02-13 13:51:25 +01:00
Shane Liesegang
35e23f59ca Update plugins/pygments_code.rb 
Giving a more helpful error message instead of silently failing.
 2013-01-30 21:51:26 -05:00
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.
 2013-01-30 15:00:14 +01:00
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.
 2013-01-30 01:53:04 -05:00
Parker Moore
f109abe9f6 Added travis stamp of approval to README. 2013-01-27 23:40:14 +01:00
Parker Moore
d65618f60c Added travis.yml so travis doesn't fail for every master branch PR and push 2013-01-27 23:39:28 +01:00
Brandon Mathis
5b887fef97 improved regexes for setup_github_pages task 2013-01-13 10:02:54 -06:00
Brandon Mathis
963eff26eb Removed unnecessary passive group from octopress origin regex 2013-01-12 21:24:15 -06:00
Vaz Allen
54fb2173d1 setup_github_pages: allow for clones missing .git extension 2013-01-12 21:22:09 -06:00
Brandon Mathis
8bf09b178d Video tag plugin now supports mp4,ogv,webm formats, closes #931 2013-01-12 19:24:10 -06:00
Brandon Mathis
cd6926e41b Striped whitespace from titles in blockquote plugin 2013-01-12 16:38:25 -06:00
Sean Kerr
d686105bda Fixed blockquote plugin (author alone would not show up without title) 2013-01-12 16:38:19 -06:00
Brandon Mathis
d774630d3e Improved error message for category_generator plugin. Addresses #116 2013-01-12 16:21:22 -06:00
Parker Moore
745e8f77bb Merge pull request #936 from richo/cleanup/whitespace 
Whitespace
 2013-01-11 16:07:26 -08:00
richo
5b332f5c95 Whitespace 2013-01-11 23:10:08 +11:00
Brandon Mathis
9decd23b5a updated ender.js to latest 2013-01-06 22:53:12 -06:00
Brandon Mathis
0a2fb6c4d8 Merge pull request #914 from rixth/master 
Escape github repo descriptions, as they may contain HTML.
 2013-01-02 21:07:38 -08:00
Thomas Rix
bcdc904843 Escape github repo descriptions, as they may contain HTML. 2013-01-02 20:55:09 -08:00
Brandon Mathis
c814560c86 removed accidentally added file 2013-01-02 21:02:50 -06:00
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
 2013-01-01 14:22:48 -06:00
Brandon Mathis
67d07b9dce Merge pull request #537 from joseprio/master 
robots.txt generation
 2012-12-29 14:54:39 -08:00
Brandon Mathis
e179277e40 updated gems 2012-12-29 02:15:19 -06:00
Brandon Mathis
ce7f6e92a2 Merge pull request #408 from dtchepak/category_link_filter 
Extract category_link filter from category_generator.rb plugin
 2012-12-29 00:05:37 -08:00
Brandon Mathis
55fa9b3d8e Removed unnecessary regex in code block plugin 2012-12-26 17:33:48 -06:00
Brandon Mathis
c18de55875 Titles in code plugins can have slashes in them. Closes #892 2012-12-26 17:19:50 -06:00
Brandon Mathis
48d3e75ff5 Merge pull request #844 from jsvensson/rsyncargs 
Rakefile option for any additional rsync arguments
 2012-12-19 22:13:04 -08:00
Brandon Mathis
c9f820f3ef Merge pull request #824 from liangsun/patch-1 
To support url without domain name like /path/file
 2012-12-19 21:56:03 -08:00
Brandon Mathis
72b4e8d562 gist tag plugin now works with the latest changes GitHub gists and does not fail if you do not specify a filename. 2012-12-18 11:38:37 -06:00
Johan Svensson
916b87a545 Rakefile option for any additional rsync arguments 
Added variable `rsync_args`
 2012-12-09 19:04:41 +01:00
Brandon Mathis
22105bebc9 Merge pull request #831 from parkr/english 
Fixing English error pet-peeve.
 2012-12-07 23:50:26 -08:00