Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #1286 from SamWhited/master | Parker Moore | 2013-06-26 | 2 | -2/+2 | |
|\ \ \ | | | | | | | | | Use protocol relative URL's for Twitter | |||||
| * | | | Fix second Twitter URL to be protocol relative | Sam Whited | 2013-06-25 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Use protocol relative URL for Twitter | Sam Whited | 2013-06-25 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Github Pages deployment is now using `git add -A` for compatability with Git ↵ | Brandon Mathis | 2013-06-23 | 1 | -4/+7 | |
| | | | | | | | | | | | | 1.8.2+ | |||||
* | | | Merge pull request #1282 from myoung34/gist-fix | Parker Moore | 2013-06-15 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | The gist hashes have changed. They include letters now | |||||
| * | | | The gist hashes have changed. They include letters now | Marcus Young | 2013-06-15 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #1281 from elbowdonkey/master | Parker Moore | 2013-06-15 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Allow for JsFiddle versions. | |||||
| * | | | Revised the regex for JsFiddle plugin after further testing. | Michael Buffington | 2013-06-11 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Adjusted JsFiddle plugin to detect jsFiddle versions. | Michael Buffington | 2013-06-11 | 1 | -1/+1 | |
| | |/ | |/| | | | | | | | | | | | | | Prior to this change, {% jsFiddle ccWP7/5 result,js,html %} wouldn't render the desired tab order properly since the regex pattern was being capturing the /5 as part of the first of the tabs. | |||||
* | | | Merge pull request #1275 from erizhang/add_https_support | Brandon Mathis | 2013-06-15 | 1 | -1/+7 | |
|\ \ \ | | | | | | | | | add https protocol supporting during rake setup_github_pages | |||||
| * | | | add https protocol supporting during rake setup_github_pages | erizhang | 2013-05-31 | 1 | -1/+7 | |
| |/ / | ||||||
* | | | Merge pull request #1267 from vinc/feature-default | Brandon Mathis | 2013-06-15 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | Added !default to $img-border | |||||
| * | | Added !default to $img-border | Vincent Ollivier | 2013-05-23 | 1 | -1/+1 | |
|/ / | ||||||
* | | Recent posts sidebar now correctly observes titlecase settings | Brandon Mathis | 2013-05-09 | 1 | -1/+1 | |
| | | ||||||
* | | Footnotes styling updates | Brandon Mathis | 2013-05-07 | 1 | -3/+4 | |
| | | ||||||
* | | Removed a couple of buggy filters on RDiscount (for now) | Brandon Mathis | 2013-05-07 | 1 | -2/+0 | |
| | | ||||||
* | | Updated RDiscount, added footnotes and other extensions | Brandon Mathis | 2013-05-07 | 2 | -1/+8 | |
| | | ||||||
* | | Sinatra now correctly returns code 404 when a page is not found. Closes #1198 | Brandon Mathis | 2013-04-09 | 3 | -12/+10 | |
| | | ||||||
* | | Added support for deploying to github.io | Brandon Mathis | 2013-04-09 | 1 | -3/+3 | |
| | | ||||||
* | | Accepting all non-whitespace characters as language names for Pygments code ↵ | Brandon Mathis | 2013-04-09 | 2 | -4/+4 | |
| | | | | | | | | highlighting | |||||
* | | Allowing dashes in code names. Closes #1166 | Brandon Mathis | 2013-04-09 | 2 | -4/+4 | |
| | | ||||||
* | | fixed video wrapping js | Brandon Mathis | 2013-04-04 | 1 | -12/+6 | |
| | | ||||||
* | | fixed mobile navigation | Brandon Mathis | 2013-04-04 | 1 | -11/+9 | |
|/ | ||||||
* | fixed addSidebarToggler where index and section were flip-flopped | Brandon Mathis | 2013-03-11 | 1 | -1/+1 | |
| | ||||||
* | Added sass-globbing, allowing plugin stylesheets to be auto-imported from ↵ | Brandon Mathis | 2013-03-11 | 5 | -0/+13 | |
| | | | | the assets/stylesheets/plugins directory | |||||
* | Improved: config_tag plugin is much more flexible now and can be used by ↵ | Brandon Mathis | 2013-03-11 | 1 | -11/+26 | |
| | | | | other plugins directly through the config_tag method | |||||
* | added config_tag plugin for integration of configuration into templates | Brandon Mathis | 2013-03-10 | 1 | -0/+29 | |
| | ||||||
* | 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. |