aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Do not strip trailing slash of canonical URLs.OGINO Masanori2012-06-021-1/+1
| | | | | | | | | | | | Usually, links for posts are generated with a trailing slash, but canonical URLs aren't. Some services (e.g. http://b.hatena.ne.jp/) are confused with that behavior. We can fix it by removing canonical URLs, but then anyone may read a post with /index.html URL and post the URL to some tool or service. Therefore rel="canonical" seems useful IMHO. Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
* updated plugins to work with latest version of LiquidBrandon Mathis2012-05-243-7/+5
|
* Updated GemfileBrandon Mathis2012-05-232-54/+57
|
* Merge pull request #499 from lukekarrys/patch-1Brandon Mathis2012-05-211-1/+1
|\ | | | | Don't display comments link for post excerpts on index page when comments for that post are set to false
| * Don't display comments link for post excerpts on index page when comments ↵Luke Karrys2012-03-231-1/+1
| | | | | | | | for that post are set to false.
* | Octopress filters are now limited to html producing templating languages, ↵Brandon Mathis2012-05-211-2/+6
| | | | | | | | Fixes #536
* | Fixed “3rd party plugins” wiki page linkAndrew Patton2012-05-201-1/+1
| | | | | | | | Signed-off-by: Brandon Mathis <brandon@imathis.com>
* | updated to latest version of Sass, fixed deprecation warningsBrandon Mathis2012-05-193-7/+8
|/
* Merge pull request #376 from robertkowalski/clrfBrandon Mathis2012-03-071-114/+114
|\ | | | | Fix CRLF, closes #374
| * Fix CRLF, closes #374Robert Kowalski2012-01-141-114/+114
| |
* | Merge pull request #427 from joliss/typoBrandon Mathis2012-02-191-1/+1
|\ \ | | | | | | Fix typo
| * | Fix typoJo Liss2012-02-151-1/+1
| | |
* | | Merge pull request #434 from nomulous/patch-1Brandon Mathis2012-02-191-2/+2
|\ \ \ | |/ / |/| | Github -> GitHub (capitalization)
| * | Github -> GitHub (capitalization)Fletcher Tomalty2012-02-191-2/+2
|/ /
* | Merge branch 'master' of github.com:imathis/octopressBrandon Mathis2012-01-081-1/+1
|\ \ | |/
| * Merge pull request #351 from grahamc/masterBrandon Mathis2012-01-071-1/+1
| |\ | | | | | | Resolve a simple _config.yml typo
| | * tilecase -> titlecaseGraham Christensen2011-12-311-1/+1
| |/
* | Fix for annoying overflow scroll issues caused by facebook and twitter ↵Brandon Mathis2012-01-083-1/+8
|/ | | | share/follow widgets.
* Merge pull request #335 from hSATAC/masterBrandon Mathis2011-12-201-1/+1
|\ | | | | Fix delicious widget js error
| * Fix delicious widget js errorhSATAC2011-12-211-1/+1
|/ | | | | JS error occured when there's no tags on bookmarks Check if it's an empty string before join item[i].t
* now Github repo url can be specified inline setup_github_pages commandBrandon Mathis2011-12-181-2/+6
|
* added site-wide description to config.yml (this provides a default meta ↵Brandon Mathis2011-12-131-0/+1
| | | | description for the site, but can be overridden on on any page with page.description in the yaml)
* Merge pull request #323 from adibis/develBrandon Mathis2011-12-131-1/+1
|\ | | | | Removed redeclaration of sidebar-border.
| * Removed redeclaration of sidebar-border.Aditya Shevade2011-12-121-1/+1
|/
* Merge pull request #322 from tgray/clearnoiseBrandon Mathis2011-12-121-1/+1
|\ | | | | Added !default to noise-bg
| * Added !default to noise-bgTim Gray2011-12-121-1/+1
|/ | | | | This lets us override the noise.png background image in the custom SCSS files if we choose.
* Merge pull request #319 from tgray/searchtoggleBrandon Mathis2011-12-111-0/+2
|\ | | | | Search box can be toggled off.
| * Search box can be toggled off.Tim Gray2011-12-111-0/+2
| | | | | | | | | | | | By leaving 'simple_search' parameter blank in the _config.yml file, the search form in the navigation.html include is omitted. This lets you put your own custom search form in the custom/navigation.html file.
* | Added a space between author and site to be sure it looked good in feed ↵Brandon Mathis2011-12-111-2/+2
| | | | | | | | readers and places where the site CSS wasn't being loaded
* | Added RubyPants (the ruby port of John Gruber's smarty pants) to ↵Brandon Mathis2011-12-112-2/+493
|/ | | | intelligently replace primes with smart quotes in the pullquote plugin, fixes #316
* Removed offending paren in RakefileBrandon Mathis2011-12-101-1/+1
|
* Rsync --delete option can be turned off in Rakefile configuration and users ↵Brandon Mathis2011-12-101-2/+7
| | | | can exclude directories from sync by adding an rsync-exclude file to their root directory. fixes #247
* removed overflow hidden from <article> to prevent clipping on facebook's ↵Brandon Mathis2011-12-102-2/+1
| | | | send dropdown, and fixed bug with styling on twitter status links
* now mobile navigation inlcudes subscription links fixes #299Brandon Mathis2011-12-101-1/+5
|
* removed size restriction on twitter sidebar follow buttonBrandon Mathis2011-12-101-1/+1
|
* Merge branch 'master' of github.com:imathis/octopressFrederic Hemberger2011-12-101-8/+15
|\
| * Merge pull request #225 from imathis/post_namesFrederic Hemberger2011-12-101-8/+15
| |\ | | | | | | Add more flexibility to :new_page task
| | * Adds more flexibility to :new_page taskFrederic Hemberger2011-10-161-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Page filenames/directories are lowercased and sanitized by default to allow a greater flexibility: - new_page["/path/to/file"] # => source/path/to/file/index.markdown - new_page["path/to/file"] # => source/path/to/file/index.markdown - new_page["my path/my file"] # => source/my-path/my-file/index.markdown - new_page["lorem.ipsum.dolor"] # => source/lorem-dot-ipsum.dolor - new_page["Questions & Answers"] # => source/questions-and-answers/index.markdown
* | | :copydot ignores thumbnail files starting with '._'Frederic Hemberger2011-12-101-5/+2
|/ /
* | Merge pull request #271 from simensen/ConfigureFontFamilyForSubtitleFrederic Hemberger2011-12-102-0/+5
|\ \ | | | | | | Make font-family for subtitle configurable.
| * | Provide a way to configure font family for subtitle.Beau Simensen2011-11-132-0/+5
| | |
* | | Merge pull request #270 from omo/missing-default-variablesFrederic Hemberger2011-12-101-4/+4
|\ \ \ | | | | | | | | Add missing default qualifiers to some sass variables.
| * | | Added missing default qualifiers to some sass variables.MORITA Hajime2011-11-121-4/+4
| | | |
* | | | Merge pull request #295 from jbrains/masterFrederic Hemberger2011-12-101-2/+2
|\ \ \ \ | | | | | | | | | | Capitalize word after '!' and '?'.
| * | | | Improved, I think, the Titlecase pluginJ. B. Rainsberger2011-11-281-2/+2
| | | | |
* | | | | Merge pull request #293 from imathis/generate_environmentFrederic Hemberger2011-12-102-2/+57
|\ \ \ \ \ | | | | | | | | | | | | Introduce distinction between preview/productive site generation
| * | | | | Set flag in preview mode and re-generate files before deployment if necessaryFrederic Hemberger2011-11-292-1/+11
| | | | | |
| * | | | | Introduce distinction between preview/productive site generationFrederic Hemberger2011-11-232-2/+47
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Posts which contain the YAML attribute `published: false` are usually not generated by Jekyll. With this patch they can be previewed just like published posts on localhost using `rake watch`or `rake preview`. NOTICE: Before pushing to the productive environment, use `rake generate` to update the public directory and remove posts which are flagged not to be published.
* | | | | Merge pull request #315 from vamsee/masterFrederic Hemberger2011-12-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | rvm does not recognize the current .rvmrc syntax
| * | | | | use correct .rvmrc syntaxVamsee Kanakala2011-12-101-1/+1
|/ / / / /