aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #1286 from SamWhited/masterParker Moore2013-06-262-2/+2
|\ \ \ | | | | | | | | Use protocol relative URL's for Twitter
| * | | Fix second Twitter URL to be protocol relativeSam Whited2013-06-251-1/+1
| | | |
| * | | Use protocol relative URL for TwitterSam Whited2013-06-251-1/+1
|/ / /
* | | Github Pages deployment is now using `git add -A` for compatability with Git ↵Brandon Mathis2013-06-231-4/+7
| | | | | | | | | | | | 1.8.2+
* | | Merge pull request #1282 from myoung34/gist-fixParker Moore2013-06-151-1/+1
|\ \ \ | | | | | | | | The gist hashes have changed. They include letters now
| * | | The gist hashes have changed. They include letters nowMarcus Young2013-06-151-1/+1
|/ / /
* | | Merge pull request #1281 from elbowdonkey/masterParker Moore2013-06-151-1/+1
|\ \ \ | | | | | | | | Allow for JsFiddle versions.
| * | | Revised the regex for JsFiddle plugin after further testing.Michael Buffington2013-06-111-1/+1
| | | |
| * | | Adjusted JsFiddle plugin to detect jsFiddle versions.Michael Buffington2013-06-111-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_supportBrandon Mathis2013-06-151-1/+7
|\ \ \ | | | | | | | | add https protocol supporting during rake setup_github_pages
| * | | add https protocol supporting during rake setup_github_pageserizhang2013-05-311-1/+7
| |/ /
* | | Merge pull request #1267 from vinc/feature-defaultBrandon Mathis2013-06-151-1/+1
|\ \ \ | |/ / |/| | Added !default to $img-border
| * | Added !default to $img-borderVincent Ollivier2013-05-231-1/+1
|/ /
* | Recent posts sidebar now correctly observes titlecase settingsBrandon Mathis2013-05-091-1/+1
| |
* | Footnotes styling updatesBrandon Mathis2013-05-071-3/+4
| |
* | Removed a couple of buggy filters on RDiscount (for now)Brandon Mathis2013-05-071-2/+0
| |
* | Updated RDiscount, added footnotes and other extensionsBrandon Mathis2013-05-072-1/+8
| |
* | Sinatra now correctly returns code 404 when a page is not found. Closes #1198Brandon Mathis2013-04-093-12/+10
| |
* | Added support for deploying to github.ioBrandon Mathis2013-04-091-3/+3
| |
* | Accepting all non-whitespace characters as language names for Pygments code ↵Brandon Mathis2013-04-092-4/+4
| | | | | | | | highlighting
* | Allowing dashes in code names. Closes #1166Brandon Mathis2013-04-092-4/+4
| |
* | fixed video wrapping jsBrandon Mathis2013-04-041-12/+6
| |
* | fixed mobile navigationBrandon Mathis2013-04-041-11/+9
|/
* fixed addSidebarToggler where index and section were flip-floppedBrandon Mathis2013-03-111-1/+1
|
* Added sass-globbing, allowing plugin stylesheets to be auto-imported from ↵Brandon Mathis2013-03-115-0/+13
| | | | the assets/stylesheets/plugins directory
* Improved: config_tag plugin is much more flexible now and can be used by ↵Brandon Mathis2013-03-111-11/+26
| | | | other plugins directly through the config_tag method
* added config_tag plugin for integration of configuration into templatesBrandon Mathis2013-03-101-0/+29
|
* 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.