aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/imathis/octopressAlexandre Perrin2013-10-073-11/+29
|\
| * Merge pull request #1385 from imathis/aleiphoenix-fix-gist-pluginParker Moore2013-10-051-9/+26
| |\
| | * Error handling FTWParker Moore2013-10-051-0/+3
| | * Clean up Gist redirection.Parker Moore2013-10-051-14/+12
| | * Merge branch 'fix-gist-plugin' of git://github.com/aleiphoenix/octopress into...Parker Moore2013-10-051-8/+24
| | |\ | |/ /
| | * fix old style gist url not found issueAR2013-09-201-8/+24
| * | Merge pull request #1384 from kAworu/fix-disqus-over-httpsParker Moore2013-10-031-1/+1
| |\ \
| | * | Fix Disqus over https.Alexandre Perrin2013-10-031-1/+1
| |/ /
| * | Add proper disqus identifier comment count linksTrey Hunner2013-09-291-1/+2
* | | Merge branch 'master' of https://github.com/imathis/octopressAlexandre Perrin2013-09-2715-26/+46
|\ \ \ | |/ /
| * | Merge pull request #1367 from nagimov/patch-1Parker Moore2013-09-191-1/+1
| |\ \
| | * | ".git" added to sample string with SSH repository URLnagimov2013-09-201-1/+1
| |/ /
| * | Remove .ruby-version file and add note to README regarding minimum Ruby version.Parker Moore2013-09-192-1/+1
| |/
| * Update Gemfile.lock.Parker Moore2013-09-041-1/+2
| * Set a fixed version for directory_watcher gem.Brandon Mathis2013-08-291-0/+1
| * Fixed blog_url for personal github pages projects. #1328Brandon Mathis2013-08-231-0/+1
| * Fixed setup_github_pages success message. #1328Brandon Mathis2013-08-231-1/+1
| * Merge pull request #1330 from rslifka/masterParker Moore2013-08-223-2/+1
| |\
| | * Let's use the specified format - https://gist.github.com/fnichol/1912050Rob Slifka2013-08-221-1/+1
| | * Removed outdated ruby version manager configurations; update to .ruby-versionRob Slifka2013-08-223-2/+1
| * | Merge pull request #1328 from sharethrough/masterBrandon Mathis2013-08-221-3/+10
| |\ \ | | |/ | |/|
| | * Improved readabilityRob Slifka2013-08-221-1/+1
| | * Extract methodRob Slifka2013-08-211-7/+10
| | * Use source/CNAME (if it exists) to set _config.yml url propertyRob Slifka2013-08-211-1/+5
| |/
| * Merge pull request #1300 from daphotron/masterParker Moore2013-07-161-1/+0
| |\
| | * Remove redundant reset-html5, global-reset already calls reset-html5Daphne Lin2013-07-151-1/+0
| |/
| * Merge pull request #1297 from ndbroadbent/patch-1Brandon Mathis2013-07-131-0/+1
| |\
| | * Fix http generated images path when using Compass sprites Nathan Broadbent2013-07-131-0/+1
| * | Merge pull request #1298 from imathis/deprecate-192-whoopsParker Moore2013-07-131-1/+1
| |\ \ | | |/ | |/|
| | * Deprecate 1.9.2, add 2.0.0 :)Parker Moore2013-07-131-1/+1
| |/
| * Merge pull request #1141 from joelclermont/patch-1Brandon Mathis2013-07-091-2/+2
| |\
| | * Enable inline PHP syntax highlightingJoel Clermont2013-03-221-2/+2
| * | Merge pull request #1291 from stevenharman/patch-1Parker Moore2013-07-021-1/+1
| |\ \
| | * | Use HTTPS for RubygemsSteven Harman2013-07-021-1/+1
| |/ /
| * | updated Sass to 3.2Brandon Mathis2013-07-012-3/+5
| * | Merge pull request #1286 from SamWhited/masterParker Moore2013-06-262-2/+2
| |\ \
| | * | Fix second Twitter URL to be protocol relativeSam Whited2013-06-251-1/+1
| | * | Use protocol relative URL for TwitterSam Whited2013-06-251-1/+1
| |/ /
| * | Github Pages deployment is now using `git add -A` for compatability with Git ...Brandon Mathis2013-06-231-4/+7
| * | Merge pull request #1282 from myoung34/gist-fixParker Moore2013-06-151-1/+1
| |\ \
| | * | The gist hashes have changed. They include letters nowMarcus Young2013-06-151-1/+1
| |/ /
| * | Merge pull request #1281 from elbowdonkey/masterParker Moore2013-06-151-1/+1
| |\ \
| | * | Revised the regex for JsFiddle plugin after further testing.Michael Buffington2013-06-111-1/+1
| | * | Adjusted JsFiddle plugin to detect jsFiddle versions.Michael Buffington2013-06-111-1/+1
| * | | Merge pull request #1275 from erizhang/add_https_supportBrandon Mathis2013-06-151-1/+7
| |\ \ \
| | * | | add https protocol supporting during rake setup_github_pageserizhang2013-05-311-1/+7
| | |/ /
| * | | Merge pull request #1267 from vinc/feature-defaultBrandon Mathis2013-06-151-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Added !default to $img-borderVincent Ollivier2013-05-231-1/+1
| |/ /
* | | Fix codeblock rendering with HAML when there is a filetype defined.Alexandre Perrin2013-05-111-1/+1
|/ /
* | Recent posts sidebar now correctly observes titlecase settingsBrandon Mathis2013-05-091-1/+1
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-16 21:43:07 +0000