902 Commits (main)
 

Author SHA1 Message Date
Michael Pfister 556fa9fe4d Use a protocol-relative url to load disqus over https or http 11 years ago
Alexandre Perrin 9225798c0b Merge branch 'master' of https://github.com/imathis/octopress 11 years ago
Parker Moore ff71657c43 Merge pull request #1385 from imathis/aleiphoenix-fix-gist-plugin
Handle Gists returning 302's
11 years ago
Parker Moore f43163b9b7 Error handling FTW 11 years ago
Parker Moore e692d8ea1a Clean up Gist redirection. 11 years ago
Parker Moore 6a7cced3aa Merge branch 'fix-gist-plugin' of git://github.com/aleiphoenix/octopress into aleiphoenix-fix-gist-plugin
* 'fix-gist-plugin' of git://github.com/aleiphoenix/octopress:
  fix old style gist url not found issue
11 years ago
Parker Moore 8aa851e9e3 Merge pull request #1384 from kAworu/fix-disqus-over-https
Fix Disqus over https.
11 years ago
Alexandre Perrin 0a1b94d222 Fix Disqus over https.
Forcing http:// as protocol will make Disqus fail when server over
  https for security reasons.
11 years ago
Trey Hunner 4cc7682033 Add proper disqus identifier comment count links
Fixes #277
11 years ago
Alexandre Perrin 8bfd5ef323 Merge branch 'master' of https://github.com/imathis/octopress 11 years ago
AR cbf4b6570f fix old style gist url not found issue 11 years ago
Parker Moore f0674c6936 Merge pull request #1367 from nagimov/patch-1
".git" added to sample string with SSH repository URL
11 years ago
nagimov d7a4bf5fc0 ".git" added to sample string with SSH repository URL
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.
11 years ago
Parker Moore 9c41abf5e0 Remove .ruby-version file and add note to README regarding minimum Ruby version.
@imathis - look ok?

Closes #1365.
11 years ago
Parker Moore f75547f61f Update Gemfile.lock. 11 years ago
Brandon Mathis 3e1707d289 Set a fixed version for directory_watcher gem. 11 years ago
Daniel Escoz 631069f427 Made blog_url becalled just once...
...and stored in the `url` variable.
11 years ago
Brandon Mathis a604dce258 Fixed blog_url for personal github pages projects. #1328 11 years ago
Brandon Mathis 77dc6a1ccf Fixed setup_github_pages success message. #1328 11 years ago
Daniel Escoz a4236cae1b Fixed blog_url when user contains uppercase letters 11 years ago
Daniel Escoz 498116b774 Fixed blog_url not returning & rake setup_github_pages failing
When executing `rake setup_github_pages`, an error tells that `url` don't exist. The reference to that variable has been changed to a call to `blog_url`.

The function `blog_url` was not returning anything, failing to properly write the `_config.yml` file. It now does return what should have.
11 years ago
Parker Moore b030e0c204 Merge pull request #1330 from rslifka/master
Use version-manager-agnostic Ruby version specification
11 years ago
Brandon Mathis b7756c462b Merge pull request #1328 from sharethrough/master
Use the CNAME from /source when (re)generating _config.yml
11 years ago
Rob Slifka af8c4cad70 Let's use the specified format - https://gist.github.com/fnichol/1912050 11 years ago
Rob Slifka 56a1868dfb Removed outdated ruby version manager configurations; update to .ruby-version 11 years ago
Rob Slifka 7f19c78cd5 Improved readability 11 years ago
Rob Slifka f56cbb5589 Extract method 11 years ago
Rob Slifka def01cb444 Use source/CNAME (if it exists) to set _config.yml url property 11 years ago
Mason Stewart fc37d922da Fixed typo in path to jQuery fallback
The `libs` folder was typoed as `lib`
12 years ago
Parker Moore 9cf6b5ff83 Merge pull request #1300 from daphotron/master
Remove redundant reset-html5 call
12 years ago
Daphne Lin 962798293b Remove redundant reset-html5, global-reset already calls reset-html5 12 years ago
Blake Johnson b19dbff510 update style rake task to copy from new sass to old sass folder. it seems like it was backwards before which makes no sense 12 years ago
Brandon Mathis 2432f9997b Merge pull request #1297 from ndbroadbent/patch-1
Fix http generated images path when using Compass sprites
12 years ago
Parker Moore d85c2414ad Merge pull request #1298 from imathis/deprecate-192-whoops
Deprecate 1.9.2, add 2.0.0
12 years ago
Parker Moore bd2caadf50 Deprecate 1.9.2, add 2.0.0 :) 12 years ago
Nathan Broadbent 7a4feb1e31 Fix http generated images path when using Compass sprites
Otherwise compass uses '/source/images' for the sprite image URL
12 years ago
Brandon Mathis 64bb9a346b Merge pull request #1141 from joelclermont/patch-1
Enable inline PHP syntax highlighting
12 years ago
Parker Moore b8a981db5f Merge pull request #1291 from stevenharman/patch-1
Use HTTPS for Rubygems
12 years ago
Steven Harman 7b52209f45 Use HTTPS for Rubygems
It is now recommended to use HTTPS for connecting to Rubygems.
12 years ago
Brandon Mathis dbdf64e4df updated Sass to 3.2 12 years ago
Parker Moore 1bcfe84ded Merge pull request #1286 from SamWhited/master
Use protocol relative URL's for Twitter
12 years ago
Sam Whited 09789773eb Fix second Twitter URL to be protocol relative 12 years ago
Sam Whited 27dcfa1a51 Use protocol relative URL for Twitter 12 years ago
Brandon Mathis bc67475148 Github Pages deployment is now using `git add -A` for compatability with Git 1.8.2+ 12 years ago
Parker Moore 0e2bff1336 Merge pull request #1282 from myoung34/gist-fix
The gist hashes have changed. They include letters now
12 years ago
Marcus Young 3cac6b9a16 The gist hashes have changed. They include letters now 12 years ago
Parker Moore 84ee8d0d8a Merge pull request #1281 from elbowdonkey/master
Allow for JsFiddle versions.
12 years ago
Brandon Mathis 82e247320e Merge pull request #1275 from erizhang/add_https_support
add https protocol supporting during rake setup_github_pages
12 years ago
Brandon Mathis 2292fc03d6 Merge pull request #1267 from vinc/feature-default
Added !default to $img-border
12 years ago
Michael Buffington a2ee7a0af1 Revised the regex for JsFiddle plugin after further testing. 12 years ago