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

854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Parker Moore
c5141ef70d Merge pull request #1390 from pfista/master 
Use a protocol-relative url to load disqus over https or http
 2013-10-09 21:23:44 -07:00
Michael Pfister
f11df1b6ac removed superfluous parentheses 2013-10-09 22:37:16 -05:00
Michael Pfister
556fa9fe4d Use a protocol-relative url to load disqus over https or http 2013-10-09 21:29:10 -05:00
Alexandre Perrin
9225798c0b Merge branch 'master' of https://github.com/imathis/octopress 2013-10-07 09:39:05 +02:00
Parker Moore
ff71657c43 Merge pull request #1385 from imathis/aleiphoenix-fix-gist-plugin 
Handle Gists returning 302's
 2013-10-05 20:01:27 -07:00
Parker Moore
f43163b9b7 Error handling FTW 2013-10-05 20:57:03 -04:00
Parker Moore
e692d8ea1a Clean up Gist redirection. 2013-10-05 20:52:12 -04:00
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
 2013-10-05 20:48:23 -04:00
Parker Moore
8aa851e9e3 Merge pull request #1384 from kAworu/fix-disqus-over-https 
Fix Disqus over https.
 2013-10-03 10:25:08 -07:00
Alexandre Perrin
0a1b94d222 Fix Disqus over https. 
Forcing http:// as protocol will make Disqus fail when server over
  https for security reasons.
 2013-10-03 10:00:27 +02:00
Trey Hunner
4cc7682033 Add proper disqus identifier comment count links 
Fixes #277
 2013-09-29 22:22:00 -04:00
Alexandre Perrin
8bfd5ef323 Merge branch 'master' of https://github.com/imathis/octopress 2013-09-27 10:53:43 +02:00
AR
cbf4b6570f fix old style gist url not found issue 2013-09-20 10:45:12 +08:00
Parker Moore
f0674c6936 Merge pull request #1367 from nagimov/patch-1 
".git" added to sample string with SSH repository URL
 2013-09-19 19:05:14 -07:00
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.
 2013-09-20 02:17:07 +06:00
Parker Moore
9c41abf5e0 Remove .ruby-version file and add note to README regarding minimum Ruby version. 
@imathis - look ok?

Closes #1365.
 2013-09-19 12:10:19 -04:00
Parker Moore
f75547f61f Update Gemfile.lock. 2013-09-04 17:37:56 +00:00
Brandon Mathis
3e1707d289 Set a fixed version for directory_watcher gem. 2013-08-29 11:49:00 -05:00
Daniel Escoz
631069f427 Made blog_url becalled just once... 
...and stored in the `url` variable.
 2013-08-25 12:29:21 +02:00
Brandon Mathis
a604dce258 Fixed blog_url for personal github pages projects. #1328 2013-08-23 15:03:57 -05:00
Brandon Mathis
77dc6a1ccf Fixed setup_github_pages success message. #1328 2013-08-23 14:07:42 -05:00
Daniel Escoz
a4236cae1b Fixed blog_url when user contains uppercase letters 2013-08-23 12:36:08 +02:00
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.
 2013-08-23 12:26:49 +02:00
Parker Moore
b030e0c204 Merge pull request #1330 from rslifka/master 
Use version-manager-agnostic Ruby version specification
 2013-08-22 22:34:22 -07:00
Brandon Mathis
b7756c462b Merge pull request #1328 from sharethrough/master 
Use the CNAME from /source when (re)generating _config.yml
 2013-08-22 22:23:03 -07:00
Rob Slifka
af8c4cad70 Let's use the specified format - https://gist.github.com/fnichol/1912050 2013-08-22 22:18:15 -07:00
Rob Slifka
56a1868dfb Removed outdated ruby version manager configurations; update to .ruby-version 2013-08-22 22:12:30 -07:00
Rob Slifka
7f19c78cd5 Improved readability 2013-08-22 22:01:41 -07:00
Rob Slifka
f56cbb5589 Extract method 2013-08-21 20:58:45 -07:00
Rob Slifka
def01cb444 Use source/CNAME (if it exists) to set _config.yml url property 2013-08-21 16:42:03 -07:00
Mason Stewart
fc37d922da Fixed typo in path to jQuery fallback 
The `libs` folder was typoed as `lib`
 2013-07-25 12:30:50 -04:00
Parker Moore
9cf6b5ff83 Merge pull request #1300 from daphotron/master 
Remove redundant reset-html5 call
 2013-07-16 00:41:05 -07:00
Daphne Lin
962798293b Remove redundant reset-html5, global-reset already calls reset-html5 2013-07-15 23:28:45 -04:00
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 2013-07-15 12:10:35 -04:00
Brandon Mathis
2432f9997b Merge pull request #1297 from ndbroadbent/patch-1 
Fix http generated images path when using Compass sprites
 2013-07-13 10:03:51 -07:00
Parker Moore
d85c2414ad Merge pull request #1298 from imathis/deprecate-192-whoops 
Deprecate 1.9.2, add 2.0.0
 2013-07-13 07:46:02 -07:00
Parker Moore
bd2caadf50 Deprecate 1.9.2, add 2.0.0 :) 2013-07-13 16:42:19 +02:00
Nathan Broadbent
7a4feb1e31 Fix http generated images path when using Compass sprites 
Otherwise compass uses '/source/images' for the sprite image URL
 2013-07-13 23:22:29 +12:00
Brandon Mathis
64bb9a346b Merge pull request #1141 from joelclermont/patch-1 
Enable inline PHP syntax highlighting
 2013-07-09 08:16:15 -07:00
Parker Moore
b8a981db5f Merge pull request #1291 from stevenharman/patch-1 
Use HTTPS for Rubygems
 2013-07-02 08:20:19 -07:00
Steven Harman
7b52209f45 Use HTTPS for Rubygems 
It is now recommended to use HTTPS for connecting to Rubygems.
 2013-07-02 11:01:11 -04:00
Brandon Mathis
dbdf64e4df updated Sass to 3.2 2013-07-01 22:15:26 -05:00
Parker Moore
1bcfe84ded Merge pull request #1286 from SamWhited/master 
Use protocol relative URL's for Twitter
 2013-06-26 04:13:48 -07:00
Sam Whited
09789773eb Fix second Twitter URL to be protocol relative 2013-06-25 18:34:06 -04:00
Sam Whited
27dcfa1a51 Use protocol relative URL for Twitter 2013-06-25 18:29:28 -04:00
Brandon Mathis
bc67475148 Github Pages deployment is now using git add -A for compatability with Git 1.8.2+ 2013-06-23 18:06:02 -05:00
Parker Moore
0e2bff1336 Merge pull request #1282 from myoung34/gist-fix 
The gist hashes have changed. They include letters now
 2013-06-15 10:07:11 -07:00
Marcus Young
3cac6b9a16 The gist hashes have changed. They include letters now 2013-06-15 12:58:52 -04:00
Parker Moore
84ee8d0d8a Merge pull request #1281 from elbowdonkey/master 
Allow for JsFiddle versions.
 2013-06-15 09:55:05 -07:00
Brandon Mathis
82e247320e Merge pull request #1275 from erizhang/add_https_support 
add https protocol supporting during rake setup_github_pages
 2013-06-15 09:33:58 -07:00