aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix typoJo Liss2012-02-151-1/+1
|
* 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
|/ / / / /
* | | | | Merge pull request #298 from nistude/masterBrandon Mathis2011-12-021-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | Nested lists should not have margin-bottom
| * | | | nested lists should not have a margin-bottomNikolay Sturm2011-12-021-4/+4
|/ / / /
* | | | Remove !default from property valuesFrederic Hemberger2011-11-181-3/+3
| | | |
* | | | Add header font size and padding to custom layoutFrederic Hemberger2011-11-181-0/+4
| | | |
* | | | Add missing $header-padding-top, $header-padding-bottom.Frederic Hemberger2011-11-181-0/+2
| | | |
* | | | Merge pull request #288 from jakemcc/octo-headFrederic Hemberger2011-11-171-6/+8
|\ \ \ \ | |/ / / |/| | | Make header font-size customizable.
| * | | Make header font size customizable.Jake McCrary2011-11-171-6/+8
|/ / / | | | | | | | | | Change $header-font-size variable to specify size.
* | | Make third-party asides default to false, closes #263Frederic Hemberger2011-11-111-2/+2
| | |
* | | Fix custom colors -bg-back, closes #269Frederic Hemberger2011-11-111-1/+1
|/ /
* | Date format: Remove unnecessary escapementFrederic Hemberger2011-11-041-1/+0
| |
* | Add custom date format %o for ordinal representation of the dayFrederic Hemberger2011-11-042-2/+7
| |
* | Add custom date format to pages, add 'updated' field againFrederic Hemberger2011-11-034-22/+56
| | | | | | | | Reverts changes of c2a68cc where I accidentally removed support for 'updated' field, see comments of issue #164 for details.
* | Reverted commit 514e848 (issue #236), should fix Disqus identifier issues.Frederic Hemberger2011-11-011-2/+2
| | | | | | | | See also: https://github.com/imathis/octopress/wiki/Disqus-identifier-issues