Commit Graph

920 Commits

Author SHA1 Message Date
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
Brandon Mathis
2292fc03d6 Merge pull request #1267 from vinc/feature-default
Added !default to $img-border
2013-06-15 09:32:47 -07:00
Michael Buffington
a2ee7a0af1 Revised the regex for JsFiddle plugin after further testing. 2013-06-11 16:00:14 -07:00
Michael Buffington
46be4c8fc4 Adjusted JsFiddle plugin to detect jsFiddle versions.
Prior to this change, {% jsFiddle ccWP7/5 result,js,html %} wouldn't
render the desired tab order properly since the regex pattern was
being capturing the /5 as part of the first of the tabs.
2013-06-11 15:37:15 -07:00
erizhang
f5bb4dd89e add https protocol supporting during rake setup_github_pages 2013-05-31 11:19:47 +08:00
Vincent Ollivier
6d3eb3fed6 Added !default to $img-border 2013-05-23 21:43:18 +02:00
Alexandre Perrin
fe28c0b518 Fix codeblock rendering with HAML when there is a filetype defined. 2013-05-11 16:48:36 +03:00
Brandon Mathis
e83dfccc4f Recent posts sidebar now correctly observes titlecase settings 2013-05-09 16:36:26 -05:00
Brandon Mathis
ac5d2538ec Footnotes styling updates 2013-05-07 00:49:24 -05:00
Brandon Mathis
21985f25d5 Removed a couple of buggy filters on RDiscount (for now) 2013-05-07 00:27:45 -05:00
Brandon Mathis
11a1ba623e Updated RDiscount, added footnotes and other extensions 2013-05-07 00:06:56 -05:00
Brandon Mathis
09558c64e6 Sinatra now correctly returns code 404 when a page is not found. Closes #1198 2013-04-09 16:37:48 -05:00
Brandon Mathis
1bd2b62a80 Added support for deploying to github.io 2013-04-09 11:48:16 -05:00
Brandon Mathis
afca876bd4 Accepting all non-whitespace characters as language names for Pygments code highlighting 2013-04-09 09:23:31 -05:00
Brandon Mathis
3ab22cb820 Allowing dashes in code names. Closes #1166 2013-04-09 09:17:46 -05:00
Brandon Mathis
7dfba9a26e fixed video wrapping js 2013-04-04 10:59:18 -05:00
Brandon Mathis
49a27c929d fixed mobile navigation 2013-04-04 10:22:48 -05:00
Joel Clermont
1a1c8681a4 Enable inline PHP syntax highlighting
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.
2013-03-22 22:57:55 -03:00
Brandon Mathis
75cc24c8d6 fixed addSidebarToggler where index and section were flip-flopped 2013-03-11 12:48:10 -05:00
Brandon Mathis
9364f37ac7 Added sass-globbing, allowing plugin stylesheets to be auto-imported from the assets/stylesheets/plugins directory 2013-03-11 01:40:41 -05:00
Brandon Mathis
05db158fec Improved: config_tag plugin is much more flexible now and can be used by other plugins directly through the config_tag method 2013-03-11 01:19:59 -05:00
Brandon Mathis
2bec7f858a added config_tag plugin for integration of configuration into templates 2013-03-10 17:09:12 -05:00
Brandon Mathis
1c7919902d Merge pull request #1116 from peterboni/patch-1
Mobile nav fixed.
2013-03-10 13:58:49 -07:00
Brandon Mathis
c35ff7b660 Fixed GitHub jsonp call. Closed #1118 2013-03-10 14:35:00 -05:00
Brandon Mathis
4157cda54c removed Twitter configuration for timeline and follow buton which are no longer integrated 2013-03-10 00:35:44 -06:00
peterboni
dee2900ba2 Mobile nav fixed.
Now shows links instead of 'undefined'.
2013-03-10 13:23:52 +08:00
Brandon Mathis
98013543d9 Removed Twitter and Ender.js. Added jQuery and updated Modernizr 2013-03-09 17:14:33 -06:00
Parker Moore
cf5e909626 Merge branch 'master' of github.com:imathis/octopress
* 'master' of github.com:imathis/octopress:
  Update plugins/pygments_code.rb
  Async load of Facebook JS
  Update plugins/pygments_code.rb
  Upgrade ruby version
  optimized order of styles and scripts in header
  Added stringex and changed to use #to_url for create directory. To don't receive error in url to accented characters.
2013-03-06 01:29:52 +01:00
Parker Moore
3548752af0 Added .gitattributes file to keep CRLF's out of the codebase. 2013-03-06 01:29:40 +01:00
Parker Moore
16c18e4191 Merge pull request #991 from rretsiem/patch-2
Async load of Facebook JS
2013-03-05 16:11:33 -08:00
Parker Moore
392e32bef0 Merge pull request #990 from sjml/patch-1
Generate can fail if Pygments can't parse a code block
2013-03-05 16:03:33 -08:00
Parker Moore
524e337aec Merge pull request #664 from earaya/master
Styles & scripts optimization in the document head
2013-03-05 15:12:23 -08:00
Parker Moore
e2596c02cb Merge pull request #629 from vyper/master
Added stringex and changed to use #to_url for create directory.
2013-03-05 14:58:55 -08:00
Parker Moore
880b0fbdac Merge pull request #452 from treyhunner/topic/editorconfig
Add EditorConfig files to define indentation styles
2013-03-05 14:52:02 -08:00
Parker Moore
7f4cf25546 Merge branch 'master' of github.com:imathis/octopress
* 'master' of github.com:imathis/octopress:
  Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh. #438
  Fix for bottom margin in nested lists.
2013-03-05 23:44:02 +01:00