| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #1399 from aleiphoenix/master | Brandon Mathis | 2013-10-24 | 1 | -2/+1 |
| |\ | | | | | fix minor mis-spelling | ||||
| | * | fix minor mis-spelling | AR | 2013-10-24 | 1 | -2/+1 |
| |/ | |||||
| * | Removed space to fix HAML compatibility on include_code. | Brandon Mathis | 2013-10-12 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #1254 from kAworu/master | Brandon Mathis | 2013-10-12 | 1 | -1/+1 |
| |\ | | | | | make codeblock play nice with HAML | ||||
| | * | Merge branch 'master' of https://github.com/imathis/octopress | Alexandre Perrin | 2013-10-07 | 3 | -11/+29 |
| | |\ | |||||
| | * \ | Merge branch 'master' of https://github.com/imathis/octopress | Alexandre Perrin | 2013-09-27 | 15 | -26/+46 |
| | |\ \ | |||||
| | * | | | Fix codeblock rendering with HAML when there is a filetype defined. | Alexandre Perrin | 2013-05-11 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #1390 from pfista/master | Parker Moore | 2013-10-09 | 1 | -1/+1 |
| |\ \ \ \ | |_|_|/ |/| | | | Use a protocol-relative url to load disqus over https or http | ||||
| | * | | | removed superfluous parentheses | Michael Pfister | 2013-10-09 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Use a protocol-relative url to load disqus over https or http | Michael Pfister | 2013-10-09 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #1385 from imathis/aleiphoenix-fix-gist-plugin | Parker Moore | 2013-10-05 | 1 | -9/+26 |
| |\ \ \ | | | | | | | | | Handle Gists returning 302's | ||||
| | * | | | Error handling FTW | Parker Moore | 2013-10-05 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | Clean up Gist redirection. | Parker Moore | 2013-10-05 | 1 | -14/+12 |
| | | | | | |||||
| | * | | | Merge branch 'fix-gist-plugin' of git://github.com/aleiphoenix/octopress ↵ | Parker Moore | 2013-10-05 | 1 | -8/+24 |
| | |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | into aleiphoenix-fix-gist-plugin * 'fix-gist-plugin' of git://github.com/aleiphoenix/octopress: fix old style gist url not found issue | ||||
| | * | | | fix old style gist url not found issue | AR | 2013-09-20 | 1 | -8/+24 |
| | | | | | |||||
| * | | | | Merge pull request #1384 from kAworu/fix-disqus-over-https | Parker Moore | 2013-10-03 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Fix Disqus over https. | ||||
| | * | | | | Fix Disqus over https. | Alexandre Perrin | 2013-10-03 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | | Forcing http:// as protocol will make Disqus fail when server over https for security reasons. | ||||
| * | | | | Add proper disqus identifier comment count links | Trey Hunner | 2013-09-29 | 1 | -1/+2 |
| | |_|/ |/| | | | | | | | | Fixes #277 | ||||
| * | | | Merge pull request #1367 from nagimov/patch-1 | Parker Moore | 2013-09-19 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | ".git" added to sample string with SSH repository URL | ||||
| | * | | | ".git" added to sample string with SSH repository URL | nagimov | 2013-09-20 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | Octopress does not work with a repo URL like a "git@github.com:your_username/your_username.github.io" ("ERROR: repository not found" error appears). It is necessary to add ".git" to the end of this line. | ||||
| * | | | Remove .ruby-version file and add note to README regarding minimum Ruby version. | Parker Moore | 2013-09-19 | 2 | -1/+1 |
| |/ / | | | | | | | | | | | @imathis - look ok? Closes #1365. | ||||
| * | | Update Gemfile.lock. | Parker Moore | 2013-09-04 | 1 | -1/+2 |
| | | | |||||
| * | | Set a fixed version for directory_watcher gem. | Brandon Mathis | 2013-08-29 | 1 | -0/+1 |
| | | | |||||
| * | | Fixed blog_url for personal github pages projects. #1328 | Brandon Mathis | 2013-08-23 | 1 | -0/+1 |
| | | | |||||
| * | | Fixed setup_github_pages success message. #1328 | Brandon Mathis | 2013-08-23 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #1330 from rslifka/master | Parker Moore | 2013-08-22 | 3 | -2/+1 |
| |\ \ | | | | | | | Use version-manager-agnostic Ruby version specification | ||||
| | * | | Let's use the specified format - https://gist.github.com/fnichol/1912050 | Rob Slifka | 2013-08-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | Removed outdated ruby version manager configurations; update to .ruby-version | Rob Slifka | 2013-08-22 | 3 | -2/+1 |
| | | | | |||||
| * | | | Merge pull request #1328 from sharethrough/master | Brandon Mathis | 2013-08-22 | 1 | -3/+10 |
| |\ \ \ | |/ / |/| | | Use the CNAME from /source when (re)generating _config.yml | ||||
| | * | | Improved readability | Rob Slifka | 2013-08-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | Extract method | Rob Slifka | 2013-08-21 | 1 | -7/+10 |
| | | | | |||||
| | * | | Use source/CNAME (if it exists) to set _config.yml url property | Rob Slifka | 2013-08-21 | 1 | -1/+5 |
| |/ / | |||||
| * | | Merge pull request #1300 from daphotron/master | Parker Moore | 2013-07-16 | 1 | -1/+0 |
| |\ \ | | | | | | | Remove redundant reset-html5 call | ||||
| | * | | Remove redundant reset-html5, global-reset already calls reset-html5 | Daphne Lin | 2013-07-15 | 1 | -1/+0 |
| |/ / | |||||
| * | | Merge pull request #1297 from ndbroadbent/patch-1 | Brandon Mathis | 2013-07-13 | 1 | -0/+1 |
| |\ \ | | | | | | | Fix http generated images path when using Compass sprites | ||||
| | * | | Fix http generated images path when using Compass sprites | Nathan Broadbent | 2013-07-13 | 1 | -0/+1 |
| | | | | | | | | | | Otherwise compass uses '/source/images' for the sprite image URL | ||||
| * | | | Merge pull request #1298 from imathis/deprecate-192-whoops | Parker Moore | 2013-07-13 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | Deprecate 1.9.2, add 2.0.0 | ||||
| | * | | Deprecate 1.9.2, add 2.0.0 :) | Parker Moore | 2013-07-13 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #1141 from joelclermont/patch-1 | Brandon Mathis | 2013-07-09 | 1 | -2/+2 |
| |\ \ | | | | | | | Enable inline PHP syntax highlighting | ||||
| | * | | Enable inline PHP syntax highlighting | Joel Clermont | 2013-03-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Pygments has a "startinline" option which is only relevant for the PhpLexer. It allows syntax highlighting without the opening <?php tag. I believe this option is ignored for every other lexer. Could you either set this to true by default using the proposed change? Or could this be exposed as a setting somewhere in _config.yml? I can't think of a reason someone would not want this enabled. | ||||
| * | | | Merge pull request #1291 from stevenharman/patch-1 | Parker Moore | 2013-07-02 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Use HTTPS for Rubygems | ||||
| | * | | | Use HTTPS for Rubygems | Steven Harman | 2013-07-02 | 1 | -1/+1 |
| |/ / / | | | | | | | It is now recommended to use HTTPS for connecting to Rubygems. | ||||
| * | | | updated Sass to 3.2 | Brandon Mathis | 2013-07-01 | 2 | -3/+5 |
| | | | | |||||
| * | | | 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. | ||||
 |
index : website/my_new_personal_website | |
| This is my current personnal website (frontend and backend) | git version control |
| aboutsummaryrefslogtreecommitdiff |