Commit Graph

100 Commits

Author SHA1 Message Date
Brandon Mathis
c0a18589b2 Merge branch '2.1' into site
Conflicts:
	_config.yml
2012-06-16 17:19:06 -05:00
Brandon Mathis
318e348163 Removed include_array plugin, replaced it with include_sidebar plugin and reorganized sidebars 2012-06-16 17:17:33 -05:00
Brandon Mathis
28e99b3c38 Added plugins/config.rb for reading and writing _config.yml. Added option to use Albino and default Python Pygments by setting pygments:true in _config.yml 2012-06-15 12:50:44 -05:00
Brandon Mathis
9af3642100 Added plugins/config.rb for reading and writing _config.yml. Added option to use Albino and default Python Pygments by setting pygments:true in _config.yml 2012-06-15 12:50:34 -05:00
Brandon Mathis
29d3c71366 Merge branch '2.1' into site 2012-06-11 00:26:16 -05:00
Brandon Mathis
fbb76e3c7c Changed permalink default to start with /year instead of /blog for posts. This should make it easier to host Octopress as a blog in a larger site instead of requiring it to be in the top level directory. This should clear up the problem where people end up with /blog/blog/ when they publish Octopress to a blog subdirectory. 2012-06-11 00:22:46 -05:00
Brandon Mathis
1f8377f157 Merge from 2.1 2012-06-08 14:29:08 -05:00
Brandon Mathis
d37c1babc7 improved the wording of the respectfully_social description 2012-06-05 12:57:16 -05:00
Brandon Mathis
44118878d7 Changed do_not_track setting to respectfully_social. Added a better description to the config file. Also, now social icons are sprited for bandwidth friendliness 2012-06-05 12:40:44 -05:00
Brandon Mathis
7bad5416fa Changed do_not_track setting to respectfully_social. Added a better description to the config file. Also, now social icons are sprited for bandwidth friendliness 2012-06-05 12:39:23 -05:00
Brandon Mathis
8cb79404d5 Added support for using text based social sharing links instead of javascript widgets which may track users and do trigger crazy high http requests. Also added a custom sharing template file for injecting any other sharing widget into the sharing section after a post 2012-06-05 00:08:54 -05:00
Brandon Mathis
d353d3de8b Added support for using text based social sharing links instead of javascript widgets which may track users and do trigger crazy high http requests. Also added a custom sharing template file for injecting any other sharing widget into the sharing section after a post 2012-06-05 00:07:23 -05:00
Brandon Mathis
91cfd16d38 Merge branch '2.1' into site-2.1 2012-05-20 17:27:34 -05:00
Nathan Manzi
e334e832de Added disqus developer mode functionality
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-20 17:20:32 -05:00
Brandon Mathis
bc717eafe2 Merge branch '2.1' into site 2012-05-19 17:00:33 -05:00
Brandon Mathis
c26aa7e9a0 now per category feeds are optional (default to off) this should improve speed for the many people who don't use this feature 2012-02-19 16:27:45 -06:00
Brandon Mathis
a814ca76ea Merge branch 'master' of github.com:imathis/octopress into linklog 2012-02-19 15:12:19 -06:00
Brandon Mathis
895504f274 added support for excerpting feed articles, added linklog support to category feed, refactored feeds to reduce duplication 2012-02-18 22:45:40 -06:00
Brandon Mathis
55c5f8d4c1 added setting for marking standard blog posts 2012-02-12 17:42:09 -06:00
Brandon Mathis
9fd87c5186 fixed unquoted linklog label 2012-02-12 07:29:53 -06:00
Brandon Mathis
f1d4a47c85 added linklog configurations 2012-02-12 07:27:45 -06:00
Brandon Mathis
bf9070a6fd fixed blog url to point to octopress.org 2012-02-11 19:13:58 -06:00
Brandon Mathis
9e1da28bba Merge branch 'site' of github.com:imathis/octopress into site 2012-02-05 17:12:14 -06:00
Brandon Mathis
37bd08c73e updated rvn installation docs, removed disqus comments 2012-02-05 17:12:03 -06:00
Brandon Mathis
1bd24edba5 Merge branch 'site' of github.com:imathis/octopress into site
Conflicts:
	source/_includes/head.html
2012-01-08 19:58:52 -06:00
Brandon Mathis
dfd5f4e754 Merge branch 'master' into site 2012-01-08 19:57:27 -06:00
Brandon Mathis
59bd3d7af9 updated to latest style/source 2012-01-08 19:56:48 -06:00
Brandon Mathis
34173ec3f5 Merge branch 'master' into site
Conflicts:
	.themes/classic/source/javascripts/github.js
	Rakefile
	_config.yml
2012-01-08 17:29:25 -06:00
Graham Christensen
944dfd7583 tilecase -> titlecase 2011-12-31 23:46:37 -05:00
Brandon Mathis
f698e85343 fixed a few innacuracies in the docs, and saved deployment to github setup 2011-12-30 10:56:23 -06:00
Brandon Mathis
479d36332c Merge branch 'master' into site
Conflicts:
	_config.yml
2011-12-19 10:39:51 -06:00
Brandon Mathis
fca7f10fe9 added site-wide description to config.yml (this provides a default meta description for the site, but can be overridden on on any page with page.description in the yaml) 2011-12-13 08:37:34 -06:00
Brandon Mathis
19c18ad300 updated to latest 2011-12-10 18:48:43 -06:00
Brandon Mathis
284c5f98f8 fixed merge of _config 2011-12-10 10:36:19 -06:00
Frederic Hemberger
6561da22f5 Make third-party asides default to false, closes #263 2011-11-11 07:45:08 +01:00
Frederic Hemberger
142681489f Add custom date format %o for ordinal representation of the day 2011-11-04 08:11:16 +01:00
Frederic Hemberger
c2a68cc2a9 Make post's date output configurable via _config.yml, closes #164
A new config variable 'date_format' is introduced in _config.yml.
It can either be set to "ordinal" to use the current format or it
can be given a string complying to strftime() format identifiers.
2011-10-18 17:25:31 +02:00
Frederic Hemberger
35a598df03 Adds support for Google+ widget, supports author information in search results, fixes #203 2011-10-17 20:14:29 +02:00
Frederic Hemberger
d98a4de07e Makes titlecase of page/post titles configurable 2011-10-16 11:57:29 +02:00
xdite
294accde54 facebook like option 2011-10-09 16:36:53 +08:00
Brandon Mathis
480b60ddf1 Merge branch 'master' into site
Conflicts:
	_config.yml
2011-09-21 14:01:11 -05:00
Frederic Hemberger
b2828eb039 Added optional comment count for disqus, fixes #88 2011-09-21 11:46:48 +02:00
Brandon Mathis
fac22e50a8 changed order for Github 3rd-party configs 2011-09-04 08:52:32 -05:00
Brandon Mathis
38cb4059a6 added github asides to the default asides list 2011-09-04 08:52:32 -05:00
Philip Hofstetter
920aa2176e corrected fork skipping logic 2011-09-04 08:52:32 -05:00
Philip Hofstetter
727f8515e3 provide an option to show or not show github profile link 2011-09-04 08:52:32 -05:00
Philip Hofstetter
3462e39400 allow limiting the amount of repos to display
by setting github_repo_count to someething that's not 0, you can limit
the amount of repositories to render
2011-09-04 08:52:32 -05:00
Philip Hofstetter
c9650dc523 add github repositories sidebar plugin
if you specify

github_user:

in you _config.yml and once you add asides/github.html to your sidebar
items, this plugin will fetch the specified users github repositories
and order them so the last pushed ones are shown first. Then it'll list
them in the side-bar, including a link and the repository description

The plugin will only list your own repositories, not forks, though this
might need to be configurable later
2011-09-04 08:52:32 -05:00
Brandon Mathis
c8eded1d0e changed order for Github 3rd-party configs 2011-09-03 10:04:09 -05:00
Brandon Mathis
9bc641d4a8 added github asides to the default asides list 2011-09-03 09:59:56 -05:00