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
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
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
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
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
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
