Commit Graph

1062 Commits

Author SHA1 Message Date
Brandon Mathis
99767a4e0c updated Gems, added more liberal definitions to gemfile
Conflicts:

	Gemfile.lock
2012-05-21 16:18:42 -05:00
Brandon Mathis
8394c9ffb1 updated Gems, added more liberal definitions to gemfile 2012-05-21 16:16:29 -05:00
Brandon Mathis
9fbc46abd9 Octopress filters are now limited to html producing templating languages, Fixes #536 2012-05-21 16:07:01 -05:00
Brandon Mathis
8753a6b00c Octopress filters are now limited to html producing templating languages, Fixes #536 2012-05-21 16:06:52 -05:00
Brandon Mathis
0873c103d3 Octopress filters are now limited to html producing templating languages, Fixes #536 2012-05-21 15:58:42 -05:00
Brandon Mathis
de38449d78 added 404.html to sitemap.xml exclude list. Closes #569 2012-05-21 11:29:20 -05:00
Brandon Mathis
bfa5255188 Rake new post now accepts:
- Inline input as in `rake new_post["Your post title"]
- Input from stdin if in-line input isn't given.

This should help zhs users who've been frustrated by globbing issues.
Fixes #117
2012-05-21 08:57:49 -05:00
Brandon Mathis
8a0940503f updated docs for styling linklog options 2012-05-20 23:45:21 -05:00
Brandon Mathis
860094feba Merge branch '2.1' into site-2.1 2012-05-20 23:40:31 -05:00
Brandon Mathis
42369ddf5d fixed class name attribute on linklog posts 2012-05-20 23:40:17 -05:00
Brandon Mathis
c653dfa198 updated docs for configurations, updated to latest 2.1 2012-05-20 23:39:36 -05:00
Brandon Mathis
ad40321eff Merge branch '2.1' into site-2.1 2012-05-20 22:23:42 -05:00
Brandon Mathis
741107291b Added 404, moved archives from /blog/archives to /archives, added migration in update_source rake task. Closes #375 2012-05-20 22:23:18 -05:00
Andrew Patton
c5e2e524f8 Fixed “3rd party plugins” wiki page link
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-20 18:03:10 -05:00
Andrew Patton
a49651fdfd Fixed “3rd party plugins” wiki page link
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-20 18:02:41 -05:00
Brandon Mathis
738ea438c6 Fixed some links to GitHub pages documentation 2012-05-20 18:01:17 -05:00
Brandon Mathis
91cfd16d38 Merge branch '2.1' into site-2.1 2012-05-20 17:27:34 -05:00
Brandon Mathis
c7d74c0d82 Added instruction regarding management of _deploy/ for GitHub pages users. Removed preview mode check from deploy script 2012-05-20 17:27:27 -05:00
Brandon Mathis
0d2af78693 Added instruction regarding management of _deploy/ for GitHub pages users. Removed preview mode check from deploy script 2012-05-20 17:27:18 -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
d68e9ddc41 removed some duplication from category url generation 2012-05-20 16:43:16 -05:00
Brandon Mathis
c06ba58466 removed some duplication from category url generation 2012-05-20 16:43:06 -05:00
Brandon Mathis
5e666bfe6b Category directory can be set to root directory. Closes #331 #369 2012-05-20 16:36:53 -05:00
Brandon Mathis
5b39a943f7 Category directory can be set to root directory. Closes #331 #369 2012-05-20 16:36:03 -05:00
Brandon Mathis
996ab81e88 Merge branch '2.1' into site-2.1 2012-05-20 16:23:30 -05:00
Brandon Mathis
ecb1748c4e fixed issue where category layouts were using category feed xml instead of html layout 2012-05-20 16:23:08 -05:00
Brandon Mathis
47b13260cf Merge branch '2.1' into site-2.1 2012-05-20 16:20:00 -05:00
Avery Yen
19320018b2 Re-encoding of input string rather than force encoding. This is safer/more valid
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-20 16:12:14 -05:00
Avery Yen
dd5f3d3fef Force code blocks to be UTF. This fixes ASCII/UTF incompatabilities.
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-20 16:12:14 -05:00
Brandon Mathis
654a2937b8 Improvements to hosting with Github Pages:
1. Push deployment task pulls first, avoiding a --force push
  2. Improvements to rake task setup_github_pages:
    - Now only rewrites _config.yml if in default state
    - Attempts a pull from deploy repo before setting up as a new project
    - Detects conflicts between CNAME and _config.yml url
    - Links to GitHub's help documentation for CNAME setup
Fixes #561
2012-05-20 10:38:56 -05:00
Brandon Mathis
addb0a149d Merge branch 'site-linklog' into site-2.1 2012-05-20 08:07:18 -05:00
Brandon Mathis
93c1965844 updated to latest 2.1 2012-05-19 17:42:27 -05:00
Brandon Mathis
bc717eafe2 Merge branch '2.1' into site 2012-05-19 17:00:33 -05:00
Jeffrey Tratner
7025a1a90a changed pullquote to reflect multi-line pullquotes
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-19 17:00:01 -05:00
Brandon Mathis
73b7e2094e Merge branch 'master' into 2.1 2012-05-19 14:56:16 -05:00
Brandon Mathis
d71223c675 updated to latest version of Sass, fixed deprecation warnings 2012-05-19 14:48:37 -05:00
Brandon Mathis
10d5fdaf51 fixed deprecation warning for sass extend feature 2012-05-19 13:30:59 -05:00
Brandon Mathis
f954689bb6 Improved styling for linklog along with other scss refactoring.
Feed urls are more flexible with linklog items
2012-04-29 19:03:52 -05:00
Luke Karrys
8b8fff3b03 Don't display comments link for post excerpts on index page when comments for that post are set to false. 2012-03-23 13:06:01 -07:00
Brandon Mathis
14a8bc05b3 Merge branch 'master' of github.com:imathis/octopress into site 2012-03-07 22:45:39 -06:00
Brandon Mathis
8013163d00 Merge branch 'master' of github.com:imathis/octopress into linklog 2012-03-07 22:42:09 -06:00
Brandon Mathis
9f40242b1e Merge pull request #376 from robertkowalski/clrf
Fix CRLF, closes #374
2012-03-07 13:40:54 -08: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
84933ebb63 Merge branch 'site' of github.com:imathis/octopress into site 2012-02-19 15:53:13 -06:00
Brandon Mathis
692c5c32e5 fixed help layout 2012-02-19 15:52:55 -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
3f7c2c6033 Merge pull request #425 from lukekarrys/patch-1
Comments link still visible on home page for excerpts even when comments for that post are set to false
2012-02-19 11:27:58 -08:00
Brandon Mathis
a8c9fb8d7a Merge pull request #427 from joliss/typo
Fix typo
2012-02-19 11:26:41 -08:00
Brandon Mathis
b215202f1d Merge pull request #434 from nomulous/patch-1
Github -> GitHub (capitalization)
2012-02-19 11:25:50 -08:00
Fletcher Tomalty
4b8aeb2774 Github -> GitHub (capitalization) 2012-02-19 01:40:53 -05:00