Commit Graph

669 Commits

Author SHA1 Message Date
Brandon Mathis
d8c0d462ce Merge pull request #68 from eproxus/site
Clarify need for 'source' branch
2011-08-13 13:13:21 -07:00
Brandon Mathis
0b77a38704 Merge pull request #93 from fsdev-cmiller/master
Fix Code Text in Lists
2011-08-12 08:26:42 -07:00
Chris Miller
84e2fd5ead Code text works in lists now. 2011-08-12 08:41:49 -06:00
Brandon Mathis
6432245b52 updated head to latest 2011-08-12 09:48:58 -04:00
Brandon Mathis
4933a5459c Merge branch 'master' into site 2011-08-12 09:48:09 -04:00
Brandon Mathis
80f95b8b6c Merge pull request #91 from brigham/extra-subdir
Fix extra subdirectories appearing in category links and atom.xml link.
2011-08-12 06:46:02 -07:00
Brigham Brown
648d4cc238 Fix extra subdirectories appearing in category links and atom.xml link. 2011-08-11 21:30:45 -07:00
Brandon Mathis
d1cb77baf8 updated docs to reflect removal of Jekyll's webrick server in favor of using rackup 2011-08-12 00:23:20 -04:00
Brandon Mathis
ed88bb430a Merge branch 'master' into site 2011-08-12 00:07:10 -04:00
Brandon Mathis
5958810eb2 Merge branch 'master' of github.com:imathis/octopress 2011-08-11 19:56:54 -04:00
Brandon Mathis
313c3859aa now using rack instead of Jekyll's webrick server, fixes #90 2011-08-11 19:56:25 -04:00
Brandon Mathis
2cd05cf2d1 Merge pull request #87 from marutanm/fix_rake-list
fix rake-list
2011-08-11 08:50:34 -07:00
marutanm
a817f99785 fix rake-list 2011-08-11 21:13:30 +09:00
Brandon Mathis
39052cdb1a updated to latest site index system, added liquid tests for haml (hint, if you indent under a tag block, it breaks). added fix for twitter.js 2011-08-10 18:19:08 -04:00
Brandon Mathis
0e072543da added support for preserving customized source/index.html during template updates. Moved the blog index code to a partial in source/_includes/blog_index.html 2011-08-10 18:15:10 -04:00
Brandon Mathis
cc4e51db8b added support for preserving customized source/index.html during template updates. Moved the blog index code to a partial in source/_includes/blog_index.html 2011-08-10 18:14:56 -04:00
Brandon Mathis
a8c1fc1d09 Merge branch 'master' into site 2011-08-07 12:20:55 -04:00
Brandon Mathis
9c2f64d20c fixed issue where port setting didn't change jekyll's webbrick in _config.yml. Accidentally used port where I should have used server_port fixes #70 2011-08-07 12:18:58 -04:00
Jake McCrary
7d6062b5eb fixed @extend for pp, code, and tt. The @extend was extending a non-existant entry. 2011-08-06 23:19:00 -05:00
Brandon Mathis
9a82e42d34 Merge branch 'master' into site 2011-08-05 16:56:33 -04:00
Brandon Mathis
9992fabb83 added help page 2011-08-05 16:55:57 -04:00
Brandon Mathis
3a599d4159 Merge pull request #73 from pilif/twitter-js-scope-fix
correctly scope locals
2011-08-04 16:03:21 -07:00
Philip Hofstetter
1860c23632 corrected fork skipping logic 2011-08-04 21:49:38 +02:00
Brandon Mathis
1857e62865 Merge branch 'site' of github.com:imathis/octopress into site 2011-08-04 15:40:30 -04:00
Brandon Mathis
de2f70b4e6 updated to latest Octopress source 2011-08-04 15:40:09 -04:00
Brandon Mathis
16d859baae Merge branch 'master' into site 2011-08-04 15:39:18 -04:00
Philip Hofstetter
16bb7729ec make listing/not listing of forks configurable
some people have more or less taken over projects with their forks, so
it probably makes sense to still list them among the repositories
2011-08-04 21:27:58 +02:00
Philip Hofstetter
2e1f0c0bfc provide an option to show or not show github profile link 2011-08-04 21:21:25 +02:00
Philip Hofstetter
08af7b4e38 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-08-04 21:15:50 +02:00
Philip Hofstetter
f955919348 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-08-04 21:01:24 +02:00
Brandon Mathis
ee0899dcad Merge pull request #74 from smt/feed-fix
Update atom.xml to use site.title and expand_urls
2011-08-04 08:57:19 -07:00
Stephen Tudor
0fa8732e2a Update atom.xml to use site.title and expand_urls 2011-08-04 09:31:20 -04:00
Philip Hofstetter
81dcb0301b correctly scope locals
having such generic variables as feed and i global is a recipe for
trouble waiting to happen.

These variables aren't used outside of the twitter plugin, so we can
easily make them local to getTwitterFeed
2011-08-04 10:17:09 +02:00
Adam Lindberg
639fcff9ea Clarify need for 'source' branch 2011-08-03 17:48:33 +02:00
Brandon Mathis
9e23a173aa Merge branch 'master' into site 2011-08-02 12:07:35 -04:00
Brandon Mathis
b536fcacf8 updated include paths for styles in theming docs 2011-08-02 12:07:17 -04:00
Brandon Mathis
140198b87a Merge pull request #64 from adamnbowen/master
added source.old and sass.old into .gitignore
2011-08-02 06:44:40 -07:00
Adam Bowen
0108966c55 added source.old, sass.old to .gitignore 2011-08-02 09:38:47 -04:00
Brandon Mathis
d8d2649b7b updated sass to latest Octopress 2011-08-02 00:56:21 -04:00
Brandon Mathis
b42a7f87dc changed mdash to unicode character to help some users with encoding errors 2011-08-02 00:55:47 -04:00
Brandon Mathis
d39ec5fffe changed mdash to unicode character to help some users with encoding errors 2011-08-02 00:55:28 -04:00
Brandon Mathis
4a181e3a14 added explaination to _config.yml for why pygments are turned off 2011-08-02 00:40:50 -04:00
Brandon Mathis
2f7ab55f9a added explaination to _config.yml for why pygments are turned off 2011-08-02 00:40:38 -04:00
Brandon Mathis
53e9d28be5 updated docs to include new plugins and better explain theming and customization 2011-08-02 00:40:15 -04:00
Brandon Mathis
15a78991da updated to latest /source 2011-08-01 17:58:12 -04:00
Brandon Mathis
98200038f7 added header to customizable includes 2011-08-01 17:57:29 -04:00
Brandon Mathis
c10140b52d added header to customizable includes 2011-08-01 17:57:17 -04:00
Brandon Mathis
df0918b2ee improve docs for theming 2011-08-01 17:38:25 -04:00
Brandon Mathis
3983bd0918 added raw liquid tag plugin for helping with documentation 2011-08-01 17:38:09 -04:00
Brandon Mathis
7b52fb492e added yml alias for yaml code highlighting 2011-08-01 17:35:44 -04:00