Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' of github.com:imathis/octopress | Frederic Hemberger | 2011-10-11 | 4 | -0/+15 | |
|\ \ | ||||||
| * \ | Merge pull request #210 from xdworks/294accde545a7213b274c5b625b44a17ed72e0f3 | Frederic Hemberger | 2011-10-11 | 4 | -0/+15 | |
| |\ \ | | | | | | | | | Facebook Like button integration, fixes #176 | |||||
| | * | | facebook like option | xdite | 2011-10-09 | 4 | -0/+15 | |
| | | | | ||||||
* | | | | Codeblock: Output source even if 'pygments_prefix' or 'pygments_suffix' is ↵ | Frederic Hemberger | 2011-10-11 | 1 | -0/+1 | |
|/ / / | | | | | | | | | | nil. Fixes #182 | |||||
* | | | Allows '-' in deployment branch names, fixes #213 | Frederic Hemberger | 2011-10-11 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #209 from drewwells/patch-1 | Brandon Mathis | 2011-10-09 | 1 | -4/+4 | |
|\ \ \ | |/ / |/| | | Fix issues with Disqus integration | |||||
| * | | As other things rely on these variables, they need to be global. | Drew Wells | 2011-10-09 | 1 | -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 #179 | Frederic Hemberger | 2011-10-06 | 1 | -1/+1 | |
|/ | ||||||
* | Updates README | Frederic Hemberger | 2011-10-04 | 1 | -4/+12 | |
| | ||||||
* | Adds CDATA sections to atom.xml, fixes #198 | Frederic Hemberger | 2011-10-04 | 2 | -7/+10 | |
| | ||||||
* | Merge pull request #197 from mikl/atom-feed-generator | Brandon Mathis | 2011-10-03 | 1 | -0/+1 | |
|\ | | | | | Add generator tag to Atom feed. | |||||
| * | Add generator tag to Atom feed. | Mikkel Hoegh | 2011-10-04 | 1 | -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-escaping | Brandon Mathis | 2011-10-03 | 1 | -4/+4 | |
|\ | | | | | Proper atom feed xml escaping | |||||
| * | Proper atom feed xml escaping | Aleksey Gureiev | 2011-10-02 | 1 | -4/+4 | |
|/ | ||||||
* | fixed issue where update_source failed if source/index was any extension ↵ | Brandon Mathis | 2011-10-01 | 1 | -1/+2 | |
| | | | | other than .html | |||||
* | wildcards broke rake update_source. fixes that | Brandon Mathis | 2011-10-01 | 1 | -1/+1 | |
| | ||||||
* | improved support for solarized light theme | Brandon Mathis | 2011-10-01 | 3 | -18/+33 | |
| | ||||||
* | Merge branch 'master' of github.com:imathis/octopress | Frederic Hemberger | 2011-09-30 | 1 | -1/+2 | |
|\ | ||||||
| * | Retains customized favicon on update_source fixes #189, Copies index.* from ↵ | Brandon Mathis | 2011-09-30 | 1 | -1/+2 | |
| | | | | | | | | source.old fixes #188 | |||||
* | | Fixes flow for sidebar three column mode | Frederic Hemberger | 2011-09-30 | 1 | -1/+4 | |
|/ | ||||||
* | removed console.log from twitter.js #facepalm | Brandon Mathis | 2011-09-29 | 1 | -1/+0 | |
| | ||||||
* | fixed issue with expanded twitter urls, fixed issue where twitter would ↵ | Brandon Mathis | 2011-09-29 | 1 | -4/+8 | |
| | | | | report seven day old tweets as "false" | |||||
* | updated github.js to use reqwest.js with Ender | Brandon Mathis | 2011-09-29 | 1 | -10/+7 | |
| | ||||||
* | Merge branch 'master' of github.com:imathis/octopress | Brandon Mathis | 2011-09-29 | 1 | -2/+2 | |
|\ | ||||||
| * | Merge pull request #180 from victor/patch-1 | Brandon Mathis | 2011-09-28 | 1 | -2/+2 | |
| |\ | | | | | | | Allow capitalization after a period. | |||||
| | * | Allow capitalization after a period. | Victor Jalencas | 2011-09-28 | 1 | -2/+2 | |
| | | | ||||||
* | | | added support for adding content to the bottom of a page | Brandon Mathis | 2011-09-29 | 3 | -4/+9 | |
|/ / | ||||||
* | | Merge branch 'master' of github.com:imathis/octopress into compass | Brandon Mathis | 2011-09-28 | 14 | -166/+293 | |
|\ \ | |/ | ||||||
| * | added buffer for mentions in twitter stream | Brandon Mathis | 2011-09-28 | 1 | -4/+3 | |
| | | ||||||
| * | added node_modules to gitignore | Brandon Mathis | 2011-09-28 | 1 | -0/+1 | |
| | | ||||||
| * | updated added reqwest to ender.js, fixed twitter.js url expansion bug | Brandon Mathis | 2011-09-27 | 2 | -25/+31 | |
| | | ||||||
| * | fixed github line numbering issue, fixed a few bugs in code block styling | Brandon Mathis | 2011-09-27 | 2 | -14/+19 | |
| | | ||||||
| * | Merge branch 'master' of github.com:imathis/octopress | Brandon Mathis | 2011-09-26 | 3 | -42/+38 | |
| |\ | ||||||
| | * | Fixes img tag properties | Frederic Hemberger | 2011-09-26 | 1 | -2/+2 | |
| | | | ||||||
| | * | jsHint'ed octopress.js | Frederic Hemberger | 2011-09-26 | 1 | -3/+3 | |
| | | | ||||||
| | * | jsHint'ed github.js | Frederic Hemberger | 2011-09-26 | 1 | -37/+33 | |
| | | | ||||||
| * | | collapse sidebar is now possible site-wide | Brandon Mathis | 2011-09-26 | 1 | -1/+1 | |
| |/ | ||||||
| * | Fixes delicious integration #179 | Frederic Hemberger | 2011-09-26 | 2 | -2/+12 | |
| | | ||||||
| * | Refactores twitter widget | Frederic Hemberger | 2011-09-26 | 1 | -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 tag | Frederic Hemberger | 2011-09-26 | 1 | -4/+4 | |
| | | ||||||
| * | Adds jsFiddle plugin | Frederic Hemberger | 2011-09-26 | 1 | -0/+40 | |
| | | ||||||
| * | Makes img tag more flexible, adds support for relative paths. Includes pull ↵ | Frederic Hemberger | 2011-09-26 | 1 | -22/+23 | |
| | | | | | | | | request #145, fixes #161 | |||||
| * | Merge pull request #178 from matrixagent/patch-1 | Frederic Hemberger | 2011-09-25 | 1 | -1/+2 | |
| |\ | | | | | | | Changed rsync deployment so the ssh port is configurable as well. | |||||
| | * | Typo. | Manu | 2011-09-26 | 1 | -1/+1 | |
| | | | ||||||
| | * | Changed it so the ssh port is configurable as well. (As I ran into the same ↵ | Manu | 2011-09-26 | 1 | -1/+2 | |
| | | | | | | | | | | | | issue already described at https://github.com/imathis/octopress/issues/30 ) | |||||
| * | | Ender.js is now loaded locally instead of hotlinking | Brandon Mathis | 2011-09-25 | 2 | -2/+38 | |
| | | | ||||||
| * | | now layouts or pages can specify "sidebar: collapse" in the yaml front ↵ | Brandon Mathis | 2011-09-25 | 2 | -10/+12 | |
| |/ | | | | | | | matter for an always collapsed sidebar | |||||
| * | Merge branch 'master' of github.com:imathis/octopress | Brandon Mathis | 2011-09-25 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Fixes child selector for param[name=movie], #168 | Frederic Hemberger | 2011-09-24 | 1 | -1/+1 | |
| | | | ||||||
| * | | mobile nav javascript updated to still work with role='main-navigation' ↵ | Brandon Mathis | 2011-09-25 | 1 | -0/+1 | |
| |/ | | | | | | | since changes affecting custom partials don't get updated with the standard update script |