aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #1589 from imathis/jekyll-2Brandon Mathis2014-06-2111-715/+94
|\
| * No longer including Gemfile.lock. Turns out that was a bad idea.Brandon Mathis2014-06-211-0/+3
| * Added jekyll-sitemap, jekyll-date-format, and updated gemsBrandon Mathis2014-06-213-5/+13
| * Initial update to be compatible with Jekyll 2Brandon Mathis2014-06-2111-711/+79
|/
* Merge pull request #1586 from simonewebdesign/masterParker Moore2014-06-151-5/+1
|\
| * Refactoring addSidebarToggler()Simone2014-06-151-5/+1
|/
* Merge pull request #1567 from howiehu/fix-gist-url-bugParker Moore2014-05-231-1/+1
|\
| * fix script_url_for url bugHu Hao2014-05-231-1/+1
| * Update gist tag url to githubusercontent.comHu Hao2014-05-231-2/+2
|/
* Merge pull request #1563 from tsmacdonald/masterParker Moore2014-05-171-1/+1
|\
| * Use correct time in log message for Github deployTimothy Macdonald2014-05-171-1/+1
|/
* Merge pull request #1489 from duckpuppy/fix-update_styleParker Moore2014-04-031-2/+2
|\
| * Fix typo in update_style copy commandPatrick Aikens2014-02-011-1/+1
| * Reversed update_style copy direction to correctly restore the sass.old/custom...Patrick Aikens2014-02-011-2/+2
* | Merge pull request #1515 from rythie/masterBrandon Mathis2014-03-092-3/+3
|\ \
| * | Use HTTPS for google webfonts when on HTTPS siteRichard Cunningham2014-03-071-2/+2
| * | Default to HTTPS for google searchesRichard Cunningham2014-03-071-1/+1
|/ /
* | Merge pull request #1506 from duckpuppy/handle-multiple-redirectsParker Moore2014-03-031-1/+5
|\ \
| * | gist_plugin: Handle multiple redirects, stopping if we find a circular referencePatrick Aikens2014-03-011-1/+5
|/ /
* | Fixed the expand_url filter. Finally.Brandon Mathis2014-02-241-2/+2
* | Removed accidental call to expand_urlBrandon Mathis2014-02-241-1/+1
* | Ignore protocol relative '//' urls.Brandon Mathis2014-02-241-2/+2
|/
* Merge pull request #1431 from Haacked/windows-code-page-fixBrandon Mathis2014-01-301-0/+4
|\
| * chcp only needs to run oncePhil Haack2013-11-291-4/+4
| * Add check for running on WindowsHaacked2013-11-281-2/+4
| * Set the codepage to 65001 before generatingHaacked2013-11-281-0/+2
* | Add note about current stable version of Octopress to README.Parker Moore2013-12-281-1/+3
* | Merge pull request #1443 from wickedshimmy/patch-1Parker Moore2013-12-191-1/+1
|\ \ | |/ |/|
| * Fix spelling errorMatt Enright2013-12-191-1/+1
|/
* Merge pull request #1397 from IQAndreas/cleanup-dateParker Moore2013-11-181-35/+18
|\
| * Rename 'data' to 'date_attributes'Andreas Renberg (IQAndreas)2013-11-181-4/+4
| * Call overridden version of `to_liquid` and remove duplicate codeAndreas Renberg (IQAndreas)2013-10-191-35/+18
* | Merge branch 'master' of github.com:imathis/octopressParker Moore2013-11-175-7/+7
|\ \
| * \ Merge pull request #1400 from axiac/fixed-titlecase-usageParker Moore2013-11-174-6/+6
| |\ \
| | * | * properly escaped site title and post/page title in the RSS feeds;Valentin VALCIU2013-10-282-2/+2
| | * | * consistently convert page and post titles to titlecase if site.titlecase is...Valentin VALCIU2013-10-284-5/+5
| * | | Merge pull request #1402 from vernak2539/removing_frame_from_jsFiddle_iframeParker Moore2013-11-171-1/+1
| |\ \ \
| | * | | removing border from iframe in jsFiddle pluginAlex Vernacchia2013-10-281-1/+1
| | |/ /
* | | | Allow no last space for gist number only in gist tagrcmdnk2013-11-171-2/+6
|/ / /
* | | Move '/.' back to first arg in :update_styleParker Moore2013-11-171-1/+1
* | | Merge pull request #1299 from blake41/masterParker Moore2013-11-171-1/+1
|\ \ \
| * | | update style rake task to copy from new sass to old sass folder. it seems li...Blake Johnson2013-07-151-1/+1
* | | | Merge pull request #1301 from masondesu/patch-1Parker Moore2013-11-171-1/+1
|\ \ \ \
| * | | | Fixed typo in path to jQuery fallbackMason Stewart2013-07-251-1/+1
* | | | | Merge pull request #1406 from TheChymera/masterParker Moore2013-11-171-1/+1
|\ \ \ \ \
| * | | | | changed sidebar content color so that it does not all change color on hover.Horea Christian2013-11-011-1/+1
* | | | | | Include timezone offset in new post template for YAML Front-MatterJ. B. Rainsberger2013-11-171-1/+1
|/ / / / /
* | | | | Merge pull request #1405 from AlexVPopov/patch-1Parker Moore2013-10-311-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix a typo in Readme.markdownAlexVPopov2013-10-311-1/+1
|/ / / /
* | | | Merge pull request #1399 from aleiphoenix/masterBrandon Mathis2013-10-241-2/+1
|\ \ \ \ | |_|_|/ |/| | |
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 23:53:46 +0000