aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
| | | | | | | | Fixes #1451.
* | Merge pull request #1443 from wickedshimmy/patch-1Parker Moore2013-12-191-1/+1
|\ \ | |/ |/| Fix spelling error
| * Fix spelling errorMatt Enright2013-12-191-1/+1
|/
* Merge pull request #1397 from IQAndreas/cleanup-dateParker Moore2013-11-181-35/+18
|\ | | | | Call overridden version of `to_liquid` and remove duplicate code in `Octopress::Date`
| * Rename 'data' to 'date_attributes'Andreas Renberg (IQAndreas)2013-11-181-4/+4
| | | | | | | | | | Prevents ambiguity, since there is already a `date` property defined in the instance.
| * Call overridden version of `to_liquid` and remove duplicate codeAndreas Renberg (IQAndreas)2013-10-191-35/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to call "overidden" method which keeps us nice and compatible so we don't need to keep up with whatever Jekyll usually does, and make sure to include it in our overriden method. I have had it with these monkey-patching methods in this Monday-to- Friday language! Add method `liquid_date_attributes`. Cleanup the Post and Page overrides to be more similar.
* | Merge branch 'master' of github.com:imathis/octopressParker Moore2013-11-175-7/+7
|\ \ | | | | | | | | | | | | | | | | | | * 'master' of github.com:imathis/octopress: removing border from iframe in jsFiddle plugin * properly escaped site title and post/page title in the RSS feeds; * consistently convert page and post titles to titlecase if site.titlecase is true;
| * \ Merge pull request #1400 from axiac/fixed-titlecase-usageParker Moore2013-11-174-6/+6
| |\ \ | | | | | | | | Fixed titlecase usage
| | * | * 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 ↵Valentin VALCIU2013-10-284-5/+5
| | | | | | | | | | | | | | | | is true;
| * | | Merge pull request #1402 from vernak2539/removing_frame_from_jsFiddle_iframeParker Moore2013-11-171-1/+1
| |\ \ \ | | | | | | | | | | Removing border from iframe in jsFiddle plugin
| | * | | 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
|/ / / | | | | | | | | | Closes #1394
* | | Move '/.' back to first arg in :update_styleParker Moore2013-11-171-1/+1
| | | | | | | | | | | | Rel #1299
* | | Merge pull request #1299 from blake41/masterParker Moore2013-11-171-1/+1
|\ \ \ | | | | | | | | Fix update styles rake task
| * | | update style rake task to copy from new sass to old sass folder. it seems ↵Blake Johnson2013-07-151-1/+1
| | | | | | | | | | | | | | | | like it was backwards before which makes no sense
* | | | Merge pull request #1301 from masondesu/patch-1Parker Moore2013-11-171-1/+1
|\ \ \ \ | | | | | | | | | | Fixed typo in path to jQuery fallback
| * | | | Fixed typo in path to jQuery fallbackMason Stewart2013-07-251-1/+1
| | | | | | | | | | | | | | | The `libs` folder was typoed as `lib`
* | | | | 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
| * | | | | 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
|/ / / / / | | | | | | | | | | | | | | | Closes #1419.
* | | | | Merge pull request #1405 from AlexVPopov/patch-1Parker Moore2013-10-311-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix a typo in Readme.markdown
| * | | | Fix a typo in Readme.markdownAlexVPopov2013-10-311-1/+1
|/ / / /
* | | | Merge pull request #1399 from aleiphoenix/masterBrandon Mathis2013-10-241-2/+1
|\ \ \ \ | |_|_|/ |/| | | fix minor mis-spelling
| * | | fix minor mis-spellingAR2013-10-241-2/+1
|/ / /
* | | Removed space to fix HAML compatibility on include_code.Brandon Mathis2013-10-121-1/+1
| | |
* | | Merge pull request #1254 from kAworu/masterBrandon Mathis2013-10-121-1/+1
|\ \ \ | | | | | | | | make codeblock play nice with HAML
| * \ \ Merge branch 'master' of https://github.com/imathis/octopressAlexandre Perrin2013-10-073-11/+29
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/imathis/octopressAlexandre Perrin2013-09-2715-26/+46
| |\ \ \ \
| * | | | | Fix codeblock rendering with HAML when there is a filetype defined.Alexandre Perrin2013-05-111-1/+1
| | | | | |
* | | | | | Merge pull request #1390 from pfista/masterParker Moore2013-10-091-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Use a protocol-relative url to load disqus over https or http
| * | | | | removed superfluous parenthesesMichael Pfister2013-10-091-1/+1
| | | | | |
| * | | | | Use a protocol-relative url to load disqus over https or httpMichael Pfister2013-10-091-1/+1
|/ / / / /
* | | | | Merge pull request #1385 from imathis/aleiphoenix-fix-gist-pluginParker Moore2013-10-051-9/+26
|\ \ \ \ \ | | | | | | | | | | | | Handle Gists returning 302's
| * | | | | 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 ↵Parker Moore2013-10-051-8/+24
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into aleiphoenix-fix-gist-plugin * 'fix-gist-plugin' of git://github.com/aleiphoenix/octopress: fix old style gist url not found issue
| * | | | | 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.
| * | | | | | Fix Disqus over https.Alexandre Perrin2013-10-031-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Forcing http:// as protocol will make Disqus fail when server over https for security reasons.
* | | | | | Add proper disqus identifier comment count linksTrey Hunner2013-09-291-1/+2
| |_|/ / / |/| | | | | | | | | | | | | | Fixes #277
* | | | | 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
| | | |