aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:imathis/octopressFrederic Hemberger2011-10-114-0/+15
|\
| * Merge pull request #210 from xdworks/294accde545a7213b274c5b625b44a17ed72e0f3Frederic Hemberger2011-10-114-0/+15
| |\ | | | | | | Facebook Like button integration, fixes #176
| | * facebook like optionxdite2011-10-094-0/+15
| | |
* | | Codeblock: Output source even if 'pygments_prefix' or 'pygments_suffix' is ↵Frederic Hemberger2011-10-111-0/+1
|/ / | | | | | | nil. Fixes #182
* | Allows '-' in deployment branch names, fixes #213Frederic Hemberger2011-10-111-1/+1
| |
* | Merge pull request #209 from drewwells/patch-1Brandon Mathis2011-10-091-4/+4
|\ \ | |/ |/| Fix issues with Disqus integration
| * As other things rely on these variables, they need to be global. Drew Wells2011-10-091-4/+4
|/ | | | Fixes issues with comments not loading on the blog. Semicolons non-optional due to SAFE function http://twitter.com/#!/elijahmanor/status/121980870428069890
* Fixes delicious API url after moving from Yahoo! to AVOS, fixes #179Frederic Hemberger2011-10-061-1/+1
|
* Updates READMEFrederic Hemberger2011-10-041-4/+12
|
* Adds CDATA sections to atom.xml, fixes #198Frederic Hemberger2011-10-042-7/+10
|
* Merge pull request #197 from mikl/atom-feed-generatorBrandon Mathis2011-10-031-0/+1
|\ | | | | Add generator tag to Atom feed.
| * Add generator tag to Atom feed.Mikkel Hoegh2011-10-041-0/+1
|/ | | | | generator is an optional element, but let's give credit where it's due. Besides, it can be helpful to feed consumers to know what tool generated the file.
* Merge pull request #193 from alg/atom-escapingBrandon Mathis2011-10-031-4/+4
|\ | | | | Proper atom feed xml escaping
| * Proper atom feed xml escapingAleksey Gureiev2011-10-021-4/+4
|/
* fixed issue where update_source failed if source/index was any extension ↵Brandon Mathis2011-10-011-1/+2
| | | | other than .html
* wildcards broke rake update_source. fixes thatBrandon Mathis2011-10-011-1/+1
|
* improved support for solarized light themeBrandon Mathis2011-10-013-18/+33
|
* Merge branch 'master' of github.com:imathis/octopressFrederic Hemberger2011-09-301-1/+2
|\
| * Retains customized favicon on update_source fixes #189, Copies index.* from ↵Brandon Mathis2011-09-301-1/+2
| | | | | | | | source.old fixes #188
* | Fixes flow for sidebar three column modeFrederic Hemberger2011-09-301-1/+4
|/
* removed console.log from twitter.js #facepalmBrandon Mathis2011-09-291-1/+0
|
* fixed issue with expanded twitter urls, fixed issue where twitter would ↵Brandon Mathis2011-09-291-4/+8
| | | | report seven day old tweets as "false"
* updated github.js to use reqwest.js with EnderBrandon Mathis2011-09-291-10/+7
|
* Merge branch 'master' of github.com:imathis/octopressBrandon Mathis2011-09-291-2/+2
|\
| * Merge pull request #180 from victor/patch-1Brandon Mathis2011-09-281-2/+2
| |\ | | | | | | Allow capitalization after a period.
| | * Allow capitalization after a period.Victor Jalencas2011-09-281-2/+2
| | |
* | | added support for adding content to the bottom of a pageBrandon Mathis2011-09-293-4/+9
|/ /
* | Merge branch 'master' of github.com:imathis/octopress into compassBrandon Mathis2011-09-2814-166/+293
|\ \ | |/
| * added buffer for mentions in twitter streamBrandon Mathis2011-09-281-4/+3
| |
| * added node_modules to gitignoreBrandon Mathis2011-09-281-0/+1
| |
| * updated added reqwest to ender.js, fixed twitter.js url expansion bugBrandon Mathis2011-09-272-25/+31
| |
| * fixed github line numbering issue, fixed a few bugs in code block stylingBrandon Mathis2011-09-272-14/+19
| |
| * Merge branch 'master' of github.com:imathis/octopressBrandon Mathis2011-09-263-42/+38
| |\
| | * Fixes img tag propertiesFrederic Hemberger2011-09-261-2/+2
| | |
| | * jsHint'ed octopress.jsFrederic Hemberger2011-09-261-3/+3
| | |
| | * jsHint'ed github.jsFrederic Hemberger2011-09-261-37/+33
| | |
| * | collapse sidebar is now possible site-wideBrandon Mathis2011-09-261-1/+1
| |/
| * Fixes delicious integration #179Frederic Hemberger2011-09-262-2/+12
| |
| * Refactores twitter widgetFrederic Hemberger2011-09-261-59/+54
| | | | | | | | | | | | | | - Order of code: Define functions first before using them - Fixed issues found by jsHint (http://jshint.com) - Switched to Twitter's current API url - Expand shortened urls, fixes #165
| * Escapes double quotes in img tagFrederic Hemberger2011-09-261-4/+4
| |
| * Adds jsFiddle pluginFrederic Hemberger2011-09-261-0/+40
| |
| * Makes img tag more flexible, adds support for relative paths. Includes pull ↵Frederic Hemberger2011-09-261-22/+23
| | | | | | | | request #145, fixes #161
| * Merge pull request #178 from matrixagent/patch-1Frederic Hemberger2011-09-251-1/+2
| |\ | | | | | | Changed rsync deployment so the ssh port is configurable as well.
| | * Typo.Manu2011-09-261-1/+1
| | |
| | * Changed it so the ssh port is configurable as well. (As I ran into the same ↵Manu2011-09-261-1/+2
| | | | | | | | | | | | issue already described at https://github.com/imathis/octopress/issues/30 )
| * | Ender.js is now loaded locally instead of hotlinkingBrandon Mathis2011-09-252-2/+38
| | |
| * | now layouts or pages can specify "sidebar: collapse" in the yaml front ↵Brandon Mathis2011-09-252-10/+12
| |/ | | | | | | matter for an always collapsed sidebar
| * Merge branch 'master' of github.com:imathis/octopressBrandon Mathis2011-09-251-1/+1
| |\
| | * Fixes child selector for param[name=movie], #168Frederic Hemberger2011-09-241-1/+1
| | |
| * | mobile nav javascript updated to still work with role='main-navigation' ↵Brandon Mathis2011-09-251-0/+1
| |/ | | | | | | since changes affecting custom partials don't get updated with the standard update script