Alexandre Perrin
8bfd5ef323
Merge branch 'master' of https://github.com/imathis/octopress
2013-09-27 10:53:43 +02: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
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
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
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
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
