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
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
8f51bdc0fd
Add note about current stable version of Octopress to README.
...
Fixes #1451 .
2013-12-28 11:49:37 -05:00
78defff9e1
Merge pull request #1443 from wickedshimmy/patch-1
...
Fix spelling error
2013-12-19 17:14:32 -08:00
33b92bdfbb
Fix spelling error
2013-12-19 16:26:03 -05:00
3477eaf834
chcp only needs to run once
2013-11-29 20:43:32 -08:00
21d26da1b6
Add check for running on Windows
2013-11-28 20:00:14 -08:00
cf4af1d825
Set the codepage to 65001 before generating
2013-11-28 19:52:03 -08:00
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
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
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
7f26224bb8
Allow no last space for gist number only in gist tag
...
Closes #1394
2013-11-17 22:47:16 -05:00
d577da7c0a
Merge pull request #1400 from axiac/fixed-titlecase-usage
...
Fixed titlecase usage
2013-11-17 19:43:20 -08:00
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
abc9ef5113
Move '/.' back to first arg in :update_style
...
Rel #1299
2013-11-17 21:52:15 -05:00
4a3c160a17
Merge pull request #1299 from blake41/master
...
Fix update styles rake task
2013-11-17 18:51:37 -08:00
a1896c5126
Merge pull request #1301 from masondesu/patch-1
...
Fixed typo in path to jQuery fallback
2013-11-17 18:49:20 -08:00
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
b57935d42c
Include timezone offset in new post template for YAML Front-Matter
...
Closes #1419 .
2013-11-17 15:33:22 -05:00
a94e02b6ed
changed sidebar content color so that it does not all change color on hover.
2013-11-01 05:28:26 +01:00
e01dc8ae27
Merge pull request #1405 from AlexVPopov/patch-1
...
Fix a typo in Readme.markdown
2013-10-31 08:57:29 -07:00
519c0db07a
Fix a typo in Readme.markdown
2013-10-31 16:15:01 +02:00
2f12296619
removing border from iframe in jsFiddle plugin
2013-10-28 14:07:37 -04:00
c4dff251dc
* properly escaped site title and post/page title in the RSS feeds;
2013-10-28 13:09:31 +02:00
a79855d1c3
* consistently convert page and post titles to titlecase if site.titlecase is true;
2013-10-28 12:48:05 +02:00
74d7238934
Merge pull request #1399 from aleiphoenix/master
...
fix minor mis-spelling
2013-10-24 08:19:52 -07:00
628e0e4d9a
fix minor mis-spelling
2013-10-24 22:59:03 +08:00
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
4fd754a762
Removed space to fix HAML compatibility on include_code.
2013-10-12 16:08:59 -05:00
050c393a4e
Merge pull request #1254 from kAworu/master
...
make codeblock play nice with HAML
2013-10-12 14:07:25 -07:00
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
f11df1b6ac
removed superfluous parentheses
2013-10-09 22:37:16 -05:00
556fa9fe4d
Use a protocol-relative url to load disqus over https or http
2013-10-09 21:29:10 -05:00
9225798c0b
Merge branch 'master' of https://github.com/imathis/octopress
2013-10-07 09:39:05 +02:00
ff71657c43
Merge pull request #1385 from imathis/aleiphoenix-fix-gist-plugin
...
Handle Gists returning 302's
2013-10-05 20:01:27 -07:00
f43163b9b7
Error handling FTW
2013-10-05 20:57:03 -04:00
e692d8ea1a
Clean up Gist redirection.
2013-10-05 20:52:12 -04:00
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
8aa851e9e3
Merge pull request #1384 from kAworu/fix-disqus-over-https
...
Fix Disqus over https.
2013-10-03 10:25:08 -07:00
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
4cc7682033
Add proper disqus identifier comment count links
...
Fixes #277
2013-09-29 22:22:00 -04:00
8bfd5ef323
Merge branch 'master' of https://github.com/imathis/octopress
2013-09-27 10:53:43 +02:00
cbf4b6570f
fix old style gist url not found issue
2013-09-20 10:45:12 +08:00
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
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
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
f75547f61f
Update Gemfile.lock.
2013-09-04 17:37:56 +00:00
3e1707d289
Set a fixed version for directory_watcher gem.
2013-08-29 11:49:00 -05:00
631069f427
Made blog_url becalled just once...
...
...and stored in the `url` variable.
2013-08-25 12:29:21 +02:00
a604dce258
Fixed blog_url for personal github pages projects. #1328
2013-08-23 15:03:57 -05:00
Patrick Aikens