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

791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Parker Moore
f6ed4125b5 Merge pull request #1489 from duckpuppy/fix-update_style 
Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder
 2014-04-03 23:59:00 -04:00
Brandon Mathis
affa3ffb82 Merge pull request #1515 from rythie/master 
A couple of changes to make octopress more friendly when hosted using HTTPS
 2014-03-09 15:36:28 -05:00
Richard Cunningham
ec1fbccd64 Use HTTPS for google webfonts when on HTTPS site 2014-03-07 17:20:01 -05:00
Richard Cunningham
15e4418aed Default to HTTPS for google searches 2014-03-07 17:19:06 -05:00
Parker Moore
b86880352b Merge pull request #1506 from duckpuppy/handle-multiple-redirects 
gist_plugin: Handle multiple redirects, stopping if we find a circular r...
 2014-03-03 22:07:48 -05:00
Patrick Aikens
a66e031166 gist_plugin: Handle multiple redirects, stopping if we find a circular reference 2014-03-01 10:07:35 -05:00
Brandon Mathis
0ead88e6c2 Fixed the expand_url filter. Finally. 
Thanks @larryprice
 2014-02-24 20:52:26 -06:00
Brandon Mathis
1321423383 Removed accidental call to expand_url 2014-02-24 15:30:20 -06:00
Brandon Mathis
028769b73f Ignore protocol relative '//' urls. 2014-02-24 15:14:10 -06:00
Patrick Aikens
c139f680e1 Fix typo in update_style copy command 2014-02-01 00:20:19 -05:00
Patrick Aikens
51ad614bd2 Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder 2014-02-01 00:09:38 -05:00
Brandon Mathis
fe6ef744ed Merge pull request #1431 from Haacked/windows-code-page-fix 
Set the codepage to 65001 before generating
 2014-01-30 09:32:35 -08:00
Parker Moore
8f51bdc0fd Add note about current stable version of Octopress to README. 
Fixes #1451.
 2013-12-28 11:49:37 -05:00
Parker Moore
78defff9e1 Merge pull request #1443 from wickedshimmy/patch-1 
Fix spelling error
 2013-12-19 17:14:32 -08:00
Matt Enright
33b92bdfbb Fix spelling error 2013-12-19 16:26:03 -05:00
Phil Haack
3477eaf834 chcp only needs to run once 2013-11-29 20:43:32 -08:00
Haacked
21d26da1b6 Add check for running on Windows 2013-11-28 20:00:14 -08:00
Haacked
cf4af1d825 Set the codepage to 65001 before generating 2013-11-28 19:52:03 -08:00
Parker Moore
64ba603225 Merge pull request #1397 from IQAndreas/cleanup-date 
Call overridden version of `to_liquid` and remove duplicate code in `Octopress::Date`
 2013-11-18 09:38:47 -08:00
Andreas Renberg (IQAndreas)
408cade21f Rename 'data' to 'date_attributes' 
Prevents ambiguity, since there is already a `date` property defined in
the instance.
 2013-11-18 05:05:00 +01:00
Parker Moore
1230e01884 Merge branch 'master' of github.com:imathis/octopress 
* 'master' of github.com:imathis/octopress:
  removing border from iframe in jsFiddle plugin
  * properly escaped site title and post/page title in the RSS feeds;
  * consistently convert page and post titles to titlecase if site.titlecase is true;
 2013-11-17 22:47:27 -05:00
rcmdnk
7f26224bb8 Allow no last space for gist number only in gist tag 
Closes #1394
 2013-11-17 22:47:16 -05:00
Parker Moore
d577da7c0a Merge pull request #1400 from axiac/fixed-titlecase-usage 
Fixed titlecase usage
 2013-11-17 19:43:20 -08:00
Parker Moore
cf4bdae818 Merge pull request #1402 from vernak2539/removing_frame_from_jsFiddle_iframe 
Removing border from iframe in jsFiddle plugin
 2013-11-17 19:07:55 -08:00
Parker Moore
abc9ef5113 Move '/.' back to first arg in :update_style 
Rel #1299
 2013-11-17 21:52:15 -05:00
Parker Moore
4a3c160a17 Merge pull request #1299 from blake41/master 
Fix update styles rake task
 2013-11-17 18:51:37 -08:00
Parker Moore
a1896c5126 Merge pull request #1301 from masondesu/patch-1 
Fixed typo in path to jQuery fallback
 2013-11-17 18:49:20 -08:00
Parker Moore
133921ecbf Merge pull request #1406 from TheChymera/master 
changed sidebar content color so that it does not all change color on hover
 2013-11-17 18:42:04 -08:00
J. B. Rainsberger
b57935d42c Include timezone offset in new post template for YAML Front-Matter 
Closes #1419.
 2013-11-17 15:33:22 -05:00
Horea Christian
a94e02b6ed changed sidebar content color so that it does not all change color on hover. 2013-11-01 05:28:26 +01:00
Parker Moore
e01dc8ae27 Merge pull request #1405 from AlexVPopov/patch-1 
Fix a typo in Readme.markdown
 2013-10-31 08:57:29 -07:00
AlexVPopov
519c0db07a Fix a typo in Readme.markdown 2013-10-31 16:15:01 +02:00
Alex Vernacchia
2f12296619 removing border from iframe in jsFiddle plugin 2013-10-28 14:07:37 -04:00
Valentin VALCIU
c4dff251dc * properly escaped site title and post/page title in the RSS feeds; 2013-10-28 13:09:31 +02:00
Valentin VALCIU
a79855d1c3 * consistently convert page and post titles to titlecase if site.titlecase is true; 2013-10-28 12:48:05 +02:00
Brandon Mathis
74d7238934 Merge pull request #1399 from aleiphoenix/master 
fix minor mis-spelling
 2013-10-24 08:19:52 -07:00
AR
628e0e4d9a fix minor mis-spelling 2013-10-24 22:59:03 +08:00
Andreas Renberg (IQAndreas)
797aeb5074 Call overridden version of to_liquid and remove duplicate code 
Make sure to call "overidden" method which keeps us nice and compatible
so we don't need to keep up with whatever Jekyll usually does, and make
sure to include it in our overriden method.

I have had it with these monkey-patching methods in this Monday-to-
Friday language!

Add method `liquid_date_attributes`.

Cleanup the Post and Page overrides to be more similar.
 2013-10-19 05:45:03 +02:00
Brandon Mathis
4fd754a762 Removed space to fix HAML compatibility on include_code. 2013-10-12 16:08:59 -05:00
Brandon Mathis
050c393a4e Merge pull request #1254 from kAworu/master 
make codeblock play nice with HAML
 2013-10-12 14:07:25 -07:00
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