aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 URL
| | * ".git" added to sample string with SSH repository URLnagimov2013-09-201-1/+1
| |/ | | | | | | Octopress does not work with a repo URL like a "git@github.com:your_username/your_username.github.io" ("ERROR: repository not found" error appears). It is necessary to add ".git" to the end of this line.
| * Remove .ruby-version file and add note to README regarding minimum Ruby version.Parker Moore2013-09-192-1/+1
| | | | | | | | | | | | @imathis - look ok? Closes #1365.
| * 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
| |\ | | | | | | Use version-manager-agnostic Ruby version specification
| | * 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
| |\ \ | | |/ | |/| Use the CNAME from /source when (re)generating _config.yml
| | * 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 call
| | * 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
| | * Fix http generated images path when using Compass sprites Nathan Broadbent2013-07-131-0/+1
| | | | | | | | | Otherwise compass uses '/source/images' for the sprite image URL
| * | Merge pull request #1298 from imathis/deprecate-192-whoopsParker Moore2013-07-131-1/+1
| |\ \ | | |/ | |/| Deprecate 1.9.2, add 2.0.0
| | * 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 highlighting
| | * Enable inline PHP syntax highlightingJoel Clermont2013-03-221-2/+2
| | | | | | | | | | | | | | | Pygments has a "startinline" option which is only relevant for the PhpLexer. It allows syntax highlighting without the opening <?php tag. I believe this option is ignored for every other lexer. Could you either set this to true by default using the proposed change? Or could this be exposed as a setting somewhere in _config.yml? I can't think of a reason someone would not want this enabled.
| * | Merge pull request #1291 from stevenharman/patch-1Parker Moore2013-07-021-1/+1
| |\ \ | | | | | | | | Use HTTPS for Rubygems
| | * | Use HTTPS for RubygemsSteven Harman2013-07-021-1/+1
| |/ / | | | | | | It is now recommended to use HTTPS for connecting to Rubygems.
| * | updated Sass to 3.2Brandon Mathis2013-07-012-3/+5
| | |
| * | Merge pull request #1286 from SamWhited/masterParker Moore2013-06-262-2/+2
| |\ \ | | | | | | | | Use protocol relative URL's for Twitter
| | * | 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
| | | | | | | | | | | | 1.8.2+
| * | Merge pull request #1282 from myoung34/gist-fixParker Moore2013-06-151-1/+1
| |\ \ | | | | | | | | The gist hashes have changed. They include letters now
| | * | 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
| |\ \ | | | | | | | | Allow for JsFiddle versions.
| | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, {% jsFiddle ccWP7/5 result,js,html %} wouldn't render the desired tab order properly since the regex pattern was being capturing the /5 as part of the first of the tabs.
| * | | Merge pull request #1275 from erizhang/add_https_supportBrandon Mathis2013-06-151-1/+7
| |\ \ \ | | | | | | | | | | add https protocol supporting during rake setup_github_pages
| | * | | 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-border
| | * | 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
| |
* | Footnotes styling updatesBrandon Mathis2013-05-071-3/+4
| |
* | Removed a couple of buggy filters on RDiscount (for now)Brandon Mathis2013-05-071-2/+0
| |
* | Updated RDiscount, added footnotes and other extensionsBrandon Mathis2013-05-072-1/+8
| |
* | Sinatra now correctly returns code 404 when a page is not found. Closes #1198Brandon Mathis2013-04-093-12/+10
| |
* | Added support for deploying to github.ioBrandon Mathis2013-04-091-3/+3
| |
* | Accepting all non-whitespace characters as language names for Pygments code ↵Brandon Mathis2013-04-092-4/+4
| | | | | | | | highlighting
* | Allowing dashes in code names. Closes #1166Brandon Mathis2013-04-092-4/+4
| |
* | fixed video wrapping jsBrandon Mathis2013-04-041-12/+6
| |
* | fixed mobile navigationBrandon Mathis2013-04-041-11/+9
|/