David Blacka [Sat, 17 Oct 2015 16:04:21 +0000 (12:04 -0400)]
Merge branch 'master' of git://github.com/imathis/octopress
Brandon Mathis [Wed, 13 May 2015 13:04:06 +0000 (08:04 -0500)]
Removing Rubypants (automatic smartquotes)
- Parsing an entire page through this is bad, it can break things.
- There are better ways to integrate this kind of feature.
Fixes jekyll/jekyll#3701
Brandon Mathis [Wed, 13 May 2015 12:35:36 +0000 (07:35 -0500)]
Merge pull request #1732 from PeterDaveHello/patch-1
Use svg instead of png to get better image quality
Peter Dave Hello [Wed, 13 May 2015 10:25:59 +0000 (18:25 +0800)]
Use svg instead of png to get better image quality
Brandon Mathis [Thu, 15 Jan 2015 00:30:26 +0000 (18:30 -0600)]
Fixed improper canonical url
Brandon Mathis [Wed, 14 Jan 2015 20:14:58 +0000 (14:14 -0600)]
Merge pull request #1710 from KeenRivals/image-optimization
Optimized PNG images with optipng & advdef.
KeenRivals [Wed, 14 Jan 2015 18:58:46 +0000 (13:58 -0500)]
Advpng optimizations
KeenRivals [Wed, 14 Jan 2015 18:43:24 +0000 (13:43 -0500)]
Optimized PNG images in the classic theme with optipng -o7 -strip all *.png and advdef -z4 -i60 *.png. Savings of 3KiB.
Brandon Mathis [Tue, 13 Jan 2015 19:02:09 +0000 (13:02 -0600)]
Fixed repo_url detection regex
Brandon Mathis [Sun, 11 Jan 2015 21:15:53 +0000 (15:15 -0600)]
Added poster="" to list of things expand urls should work on. #1707
Brandon Mathis [Sun, 11 Jan 2015 17:05:24 +0000 (11:05 -0600)]
refactor videos regex to be less insane
Philippe Lovis [Sun, 11 Jan 2015 10:01:04 +0000 (11:01 +0100)]
Fix relative URLs for video tag
Fixes issue #1127. The markup regex only matched URLs beginning with 'http'.
This change adds support for relative URLs beginning with '/'. The regex is
based on the one used in image_tag.rb.
Parker Moore [Sat, 27 Dec 2014 20:03:04 +0000 (15:03 -0500)]
Merge pull request #1702 from ndbroadbent/fix_code
Tidy up some code in category_generator.rb
Nathan Broadbent [Sat, 27 Dec 2014 15:11:18 +0000 (21:11 +0600)]
Should use << for string concatenation in Ruby
Nathan Broadbent [Sat, 27 Dec 2014 15:11:09 +0000 (21:11 +0600)]
Fix verbose code with a one liner
Brandon Mathis [Sun, 21 Dec 2014 14:49:54 +0000 (08:49 -0600)]
Merge pull request #1657 from enriquesaid/master
updated compass
Brandon Mathis [Sun, 21 Dec 2014 14:45:40 +0000 (08:45 -0600)]
Merge pull request #1678 from Blaisorblade/patch-1
Add link to add site to the wiki
Brandon Mathis [Sun, 21 Dec 2014 14:45:09 +0000 (08:45 -0600)]
Merge pull request #1682 from muescha/patch-1
leave some hints about OP3.0
Brandon Mathis [Sun, 21 Dec 2014 14:44:24 +0000 (08:44 -0600)]
Merge pull request #1687 from blbradley/rakefile-cname-sourcedir
Rakefile: use source_dir when setting url via CNAME
Brandon Mathis [Sun, 21 Dec 2014 14:42:34 +0000 (08:42 -0600)]
Merge pull request #1699 from VincentTam/jquery-ref
Fix the way of loading the local copy of jQuery
Vincent Tam [Sun, 21 Dec 2014 13:55:12 +0000 (21:55 +0800)]
Fix the way of loading the local copy of jQuery
Deleted the dot at the beginning of the path in the script that called the local copy of jQuery.
Brandon Mathis [Sun, 21 Dec 2014 04:50:20 +0000 (22:50 -0600)]
Google broke old site-search method, this fixes it
Brandon Bradley [Thu, 27 Nov 2014 06:33:12 +0000 (00:33 -0600)]
Rakefile: use source_dir when setting url via CNAME
Parker Moore [Mon, 17 Nov 2014 04:23:01 +0000 (20:23 -0800)]
Merge pull request #1684 from tangledhelix/feature-windows-ampersand
Fix 1656 - & needs specific quoting under Windows. Closes #1656.
Dan Lowe [Mon, 17 Nov 2014 04:05:14 +0000 (23:05 -0500)]
Fix 1656 - & needs specific quoting under Windows
muescha [Sat, 15 Nov 2014 02:18:55 +0000 (03:18 +0100)]
leave some hints about OP3.0 (not mentioned on imathis/octopress and not at octopress.org )
Paolo G. Giarrusso [Tue, 4 Nov 2014 09:38:36 +0000 (10:38 +0100)]
Add link to add site to the wiki
So that more people will do it and it'll take less time. As long as we trust people, that's good.
Parker Moore [Thu, 23 Oct 2014 22:01:37 +0000 (15:01 -0700)]
Merge pull request #1331 from Darkhogg/patch-1
Fixed setup_github_pages failing and not properly writing url to _config.yml
Parker Moore [Sat, 4 Oct 2014 00:42:16 +0000 (17:42 -0700)]
Merge pull request #1658 from kamatari/fix-rake-clean
enable wildcard of rm_rf
Masahiro Kamata [Fri, 3 Oct 2014 23:56:28 +0000 (08:56 +0900)]
enable wildcard of rm_rf
Enrique Marques Junior [Wed, 1 Oct 2014 23:08:02 +0000 (20:08 -0300)]
updated compass
Brandon Mathis [Fri, 29 Aug 2014 15:46:34 +0000 (10:46 -0500)]
Fixed issue with RubyPants and the Octopress hooks filter
Brandon Mathis [Tue, 12 Aug 2014 18:11:09 +0000 (13:11 -0500)]
Merge pull request #1629 from yous/patch-layout
Set layout to null to suppress warning
ChaYoung You [Tue, 12 Aug 2014 17:44:23 +0000 (02:44 +0900)]
Set layout to null to suppress warning
Not applied in
0f1660437beba58cd2974f07270b19305b9bbfd9.
Brandon Mathis [Tue, 12 Aug 2014 17:02:20 +0000 (12:02 -0500)]
Set layout to null to avoid page defaults.
Brandon Mathis [Tue, 12 Aug 2014 17:01:16 +0000 (12:01 -0500)]
Merge pull request #1628 from yous/patch-octopress-filter
Use `octopress-hooks` and `octopress-date-format`
ChaYoung You [Tue, 12 Aug 2014 16:45:15 +0000 (01:45 +0900)]
Use `octopress-hooks` and `octopress-date-format`
Not applied in
73e540409ceb8bc18048b6a96a4b815fc303ea28.
Fix #1622.
Brandon Mathis [Tue, 12 Aug 2014 15:55:23 +0000 (10:55 -0500)]
Support octopress-hooks and octopress-date-format #1622
Parker Moore [Tue, 12 Aug 2014 15:55:16 +0000 (11:55 -0400)]
Revert "remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'"
This reverts commit
181d620c1c46c644c4319e81edc342ae5a30c067.
Parker Moore [Sun, 10 Aug 2014 02:51:38 +0000 (22:51 -0400)]
Merge pull request #1622 from raysrashmi/ry-updating-gems
remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'
Rashmi Yadav [Thu, 7 Aug 2014 14:03:13 +0000 (16:03 +0200)]
remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'
Parker Moore [Thu, 31 Jul 2014 20:22:30 +0000 (16:22 -0400)]
Delete Gemfile.lock
Follow-up to #1617
Parker Moore [Thu, 31 Jul 2014 20:21:49 +0000 (16:21 -0400)]
Merge pull request #1617 from nickhammond/patch-1
.gitignore Gemfile.lock per previous commit
Nick Hammond [Thu, 24 Jul 2014 23:08:14 +0000 (18:08 -0500)]
.gitignore Gemfile.lock per previous commit
Gemfile.lock was removed in a previous commit, should be ignored so it doesn't get committed again.
https://github.com/imathis/octopress/commit/
06c04397053e46fe02fcecce589a2de76d21e160
Parker Moore [Sat, 19 Jul 2014 23:35:13 +0000 (19:35 -0400)]
Merge pull request #1609 from alindeman/patch-1
Fixes load path issues with ruby-based git credential helpers
Andy Lindeman [Sat, 19 Jul 2014 19:08:28 +0000 (15:08 -0400)]
Fixes load path issues with ruby-based git credential helpers
Otherwise, we get errors like this (with boxen, e.g.):
```
/opt/boxen/bin/boxen-git-credential:23:in `require': cannot load such file -- boxen/config (LoadError)
from /opt/boxen/bin/boxen-git-credential:23:in `<main>'
Username for 'https://github.com':
```
Parker Moore [Tue, 24 Jun 2014 20:30:17 +0000 (16:30 -0400)]
Merge pull request #1592 from yous/patch-4
Update `paginate_path` comment based on default value
ChaYoung You [Tue, 24 Jun 2014 09:15:38 +0000 (18:15 +0900)]
Update `paginate_path` comment based on default value
Brandon Mathis [Sat, 21 Jun 2014 21:41:32 +0000 (16:41 -0500)]
Removed date plugin, added excerpt separator default
Brandon Mathis [Sat, 21 Jun 2014 20:51:40 +0000 (15:51 -0500)]
Replaced date plugin with jekyll-date-format
Brandon Mathis [Sat, 21 Jun 2014 18:55:43 +0000 (13:55 -0500)]
Merge pull request #1589 from imathis/jekyll-2
Jekyll 2.0 compatability
Brandon Mathis [Sat, 21 Jun 2014 18:49:29 +0000 (13:49 -0500)]
No longer including Gemfile.lock. Turns out that was a bad idea.
Brandon Mathis [Sat, 21 Jun 2014 18:46:27 +0000 (13:46 -0500)]
Added jekyll-sitemap, jekyll-date-format, and updated gems
Brandon Mathis [Sat, 21 Jun 2014 15:34:55 +0000 (10:34 -0500)]
Initial update to be compatible with Jekyll 2
Parker Moore [Mon, 16 Jun 2014 01:46:08 +0000 (21:46 -0400)]
Merge pull request #1586 from simonewebdesign/master
Refactoring addSidebarToggler()
Simone [Sun, 15 Jun 2014 20:51:15 +0000 (21:51 +0100)]
Refactoring addSidebarToggler()
Parker Moore [Fri, 23 May 2014 21:51:12 +0000 (17:51 -0400)]
Merge pull request #1567 from howiehu/fix-gist-url-bug
Update gist tag url to githubusercontent.com
Hu Hao [Fri, 23 May 2014 07:45:58 +0000 (15:45 +0800)]
fix script_url_for url bug
Hu Hao [Fri, 23 May 2014 04:26:35 +0000 (12:26 +0800)]
Update gist tag url to githubusercontent.com
Parker Moore [Sun, 18 May 2014 03:33:19 +0000 (23:33 -0400)]
Merge pull request #1563 from tsmacdonald/master
Use correct time in log message for Github deploy
Timothy Macdonald [Sat, 17 May 2014 20:08:38 +0000 (15:08 -0500)]
Use correct time in log message for Github deploy
Parker Moore [Fri, 4 Apr 2014 03:59:00 +0000 (23:59 -0400)]
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
Brandon Mathis [Sun, 9 Mar 2014 20:36:28 +0000 (15:36 -0500)]
Merge pull request #1515 from rythie/master
A couple of changes to make octopress more friendly when hosted using HTTPS
Richard Cunningham [Fri, 7 Mar 2014 22:20:01 +0000 (17:20 -0500)]
Use HTTPS for google webfonts when on HTTPS site
Richard Cunningham [Fri, 7 Mar 2014 22:19:06 +0000 (17:19 -0500)]
Default to HTTPS for google searches
Parker Moore [Tue, 4 Mar 2014 03:07:48 +0000 (22:07 -0500)]
Merge pull request #1506 from duckpuppy/handle-multiple-redirects
gist_plugin: Handle multiple redirects, stopping if we find a circular r...
Patrick Aikens [Sat, 1 Mar 2014 15:07:35 +0000 (10:07 -0500)]
gist_plugin: Handle multiple redirects, stopping if we find a circular reference
Brandon Mathis [Tue, 25 Feb 2014 02:52:26 +0000 (20:52 -0600)]
Fixed the expand_url filter. Finally.
Thanks @larryprice
Brandon Mathis [Mon, 24 Feb 2014 21:30:20 +0000 (15:30 -0600)]
Removed accidental call to expand_url
Brandon Mathis [Mon, 24 Feb 2014 21:14:10 +0000 (15:14 -0600)]
Ignore protocol relative '//' urls.
Patrick Aikens [Sat, 1 Feb 2014 05:20:19 +0000 (00:20 -0500)]
Fix typo in update_style copy command
Patrick Aikens [Sat, 1 Feb 2014 05:09:38 +0000 (00:09 -0500)]
Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder
Brandon Mathis [Thu, 30 Jan 2014 17:32:35 +0000 (09:32 -0800)]
Merge pull request #1431 from Haacked/windows-code-page-fix
Set the codepage to 65001 before generating
Parker Moore [Sat, 28 Dec 2013 16:49:37 +0000 (11:49 -0500)]
Add note about current stable version of Octopress to README.
Fixes #1451.
Parker Moore [Fri, 20 Dec 2013 01:14:32 +0000 (17:14 -0800)]
Merge pull request #1443 from wickedshimmy/patch-1
Fix spelling error
Matt Enright [Thu, 19 Dec 2013 21:26:03 +0000 (16:26 -0500)]
Fix spelling error
David Blacka [Sat, 14 Dec 2013 16:52:18 +0000 (11:52 -0500)]
Merge branch 'master' of git://github.com/imathis/octopress
Phil Haack [Sat, 30 Nov 2013 04:43:32 +0000 (20:43 -0800)]
chcp only needs to run once
Haacked [Fri, 29 Nov 2013 04:00:14 +0000 (20:00 -0800)]
Add check for running on Windows
Haacked [Fri, 29 Nov 2013 03:52:03 +0000 (19:52 -0800)]
Set the codepage to 65001 before generating
Parker Moore [Mon, 18 Nov 2013 17:38:47 +0000 (09:38 -0800)]
Merge pull request #1397 from IQAndreas/cleanup-date
Call overridden version of `to_liquid` and remove duplicate code in `Octopress::Date`
Andreas Renberg (IQAndreas) [Mon, 18 Nov 2013 04:05:00 +0000 (05:05 +0100)]
Rename 'data' to 'date_attributes'
Prevents ambiguity, since there is already a `date` property defined in
the instance.
Parker Moore [Mon, 18 Nov 2013 03:47:27 +0000 (22:47 -0500)]
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;
rcmdnk [Mon, 18 Nov 2013 03:47:06 +0000 (22:47 -0500)]
Allow no last space for gist number only in gist tag
Closes #1394
Parker Moore [Mon, 18 Nov 2013 03:43:20 +0000 (19:43 -0800)]
Merge pull request #1400 from axiac/fixed-titlecase-usage
Fixed titlecase usage
Parker Moore [Mon, 18 Nov 2013 03:07:55 +0000 (19:07 -0800)]
Merge pull request #1402 from vernak2539/removing_frame_from_jsFiddle_iframe
Removing border from iframe in jsFiddle plugin
Parker Moore [Mon, 18 Nov 2013 02:52:15 +0000 (21:52 -0500)]
Move '/.' back to first arg in :update_style
Rel #1299
Parker Moore [Mon, 18 Nov 2013 02:51:37 +0000 (18:51 -0800)]
Merge pull request #1299 from blake41/master
Fix update styles rake task
Parker Moore [Mon, 18 Nov 2013 02:49:20 +0000 (18:49 -0800)]
Merge pull request #1301 from masondesu/patch-1
Fixed typo in path to jQuery fallback
Parker Moore [Mon, 18 Nov 2013 02:42:04 +0000 (18:42 -0800)]
Merge pull request #1406 from TheChymera/master
changed sidebar content color so that it does not all change color on hover
J. B. Rainsberger [Sun, 17 Nov 2013 20:33:09 +0000 (15:33 -0500)]
Include timezone offset in new post template for YAML Front-Matter
Closes #1419.
David Blacka [Fri, 15 Nov 2013 05:29:38 +0000 (00:29 -0500)]
new post
Horea Christian [Fri, 1 Nov 2013 04:28:26 +0000 (05:28 +0100)]
changed sidebar content color so that it does not all change color on hover.
Parker Moore [Thu, 31 Oct 2013 15:57:29 +0000 (08:57 -0700)]
Merge pull request #1405 from AlexVPopov/patch-1
Fix a typo in Readme.markdown
AlexVPopov [Thu, 31 Oct 2013 14:15:01 +0000 (16:15 +0200)]
Fix a typo in Readme.markdown
Alex Vernacchia [Mon, 28 Oct 2013 18:07:37 +0000 (14:07 -0400)]
removing border from iframe in jsFiddle plugin
Valentin VALCIU [Mon, 28 Oct 2013 11:09:31 +0000 (13:09 +0200)]
* properly escaped site title and post/page title in the RSS feeds;
Valentin VALCIU [Mon, 28 Oct 2013 10:48:05 +0000 (12:48 +0200)]
* consistently convert page and post titles to titlecase if site.titlecase is true;
David Blacka [Sun, 27 Oct 2013 16:06:57 +0000 (12:06 -0400)]
add whitespace theme and switch to it
David Blacka [Sun, 27 Oct 2013 01:37:37 +0000 (21:37 -0400)]
new post