thomas
/
labnotes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
765 Commits
1 Branch
0 Tags
24 MiB
Commit Graph

765 Commits (cf4bdae818c312f6846d587115faf850ab965456)
 

Author SHA1 Message Date
Parker Moore cf4bdae818 Merge pull request from vernak2539/removing_frame_from_jsFiddle_iframe 
Removing border from iframe in jsFiddle plugin
Parker Moore abc9ef5113 Move '/.' back to first arg in :update_style 
Rel
Parker Moore 4a3c160a17 Merge pull request from blake41/master 
Fix update styles rake task
Parker Moore a1896c5126 Merge pull request from masondesu/patch-1 
Fixed typo in path to jQuery fallback
Parker Moore 133921ecbf Merge pull request from TheChymera/master 
changed sidebar content color so that it does not all change color on hover
J. B. Rainsberger b57935d42c Include timezone offset in new post template for YAML Front-Matter 
Closes .
Horea Christian a94e02b6ed changed sidebar content color so that it does not all change color on hover.
Parker Moore e01dc8ae27 Merge pull request from AlexVPopov/patch-1 
Fix a typo in Readme.markdown
AlexVPopov 519c0db07a Fix a typo in Readme.markdown
Alex Vernacchia 2f12296619 removing border from iframe in jsFiddle plugin
Brandon Mathis 74d7238934 Merge pull request from aleiphoenix/master 
fix minor mis-spelling
AR 628e0e4d9a fix minor mis-spelling
Brandon Mathis 4fd754a762 Removed space to fix HAML compatibility on include_code.
Brandon Mathis 050c393a4e Merge pull request from kAworu/master 
make codeblock play nice with HAML
Parker Moore c5141ef70d Merge pull request from pfista/master 
Use a protocol-relative url to load disqus over https or http
Michael Pfister f11df1b6ac removed superfluous parentheses
Michael Pfister 556fa9fe4d Use a protocol-relative url to load disqus over https or http
Alexandre Perrin 9225798c0b Merge branch 'master' of https://github.com/imathis/octopress
Parker Moore ff71657c43 Merge pull request from imathis/aleiphoenix-fix-gist-plugin 
Handle Gists returning 302's
Parker Moore f43163b9b7 Error handling FTW
Parker Moore e692d8ea1a Clean up Gist redirection.
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
Parker Moore 8aa851e9e3 Merge pull request from kAworu/fix-disqus-over-https 
Fix Disqus over https.
Alexandre Perrin 0a1b94d222 Fix Disqus over https. 
Forcing http:// as protocol will make Disqus fail when server over
  https for security reasons.
Trey Hunner 4cc7682033 Add proper disqus identifier comment count links 
Fixes
Alexandre Perrin 8bfd5ef323 Merge branch 'master' of https://github.com/imathis/octopress
AR cbf4b6570f fix old style gist url not found issue
Parker Moore f0674c6936 Merge pull request from nagimov/patch-1 
".git" added to sample string with SSH repository URL
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.
Parker Moore 9c41abf5e0 Remove .ruby-version file and add note to README regarding minimum Ruby version. 
@imathis - look ok?

Closes .
Parker Moore f75547f61f Update Gemfile.lock.
Brandon Mathis 3e1707d289 Set a fixed version for directory_watcher gem.
Brandon Mathis a604dce258 Fixed blog_url for personal github pages projects.
Brandon Mathis 77dc6a1ccf Fixed setup_github_pages success message.
Parker Moore b030e0c204 Merge pull request from rslifka/master 
Use version-manager-agnostic Ruby version specification
Brandon Mathis b7756c462b Merge pull request from sharethrough/master 
Use the CNAME from /source when (re)generating _config.yml
Rob Slifka af8c4cad70 Let's use the specified format - https://gist.github.com/fnichol/1912050
Rob Slifka 56a1868dfb Removed outdated ruby version manager configurations; update to .ruby-version
Rob Slifka 7f19c78cd5 Improved readability
Rob Slifka f56cbb5589 Extract method
Rob Slifka def01cb444 Use source/CNAME (if it exists) to set _config.yml url property
Mason Stewart fc37d922da Fixed typo in path to jQuery fallback 
The `libs` folder was typoed as `lib`
Parker Moore 9cf6b5ff83 Merge pull request from daphotron/master 
Remove redundant reset-html5 call
Daphne Lin 962798293b Remove redundant reset-html5, global-reset already calls reset-html5
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
Brandon Mathis 2432f9997b Merge pull request from ndbroadbent/patch-1 
Fix http generated images path when using Compass sprites
Parker Moore d85c2414ad Merge pull request from imathis/deprecate-192-whoops 
Deprecate 1.9.2, add 2.0.0
Parker Moore bd2caadf50 Deprecate 1.9.2, add 2.0.0 :)
Nathan Broadbent 7a4feb1e31 Fix http generated images path when using Compass sprites 
Otherwise compass uses '/source/images' for the sprite image URL
Brandon Mathis 64bb9a346b Merge pull request from joelclermont/patch-1 
Enable inline PHP syntax highlighting