aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * .gitignore Gemfile.lock per previous commitNick Hammond2014-07-241-0/+1
|/ | | | | Gemfile.lock was removed in a previous commit, should be ignored so it doesn't get committed again. https://github.com/imathis/octopress/commit/06c04397053e46fe02fcecce589a2de76d21e160
* Merge pull request #1609 from alindeman/patch-1Parker Moore2014-07-191-2/+2
|\ | | | | Fixes load path issues with ruby-based git credential helpers
| * Fixes load path issues with ruby-based git credential helpersAndy Lindeman2014-07-191-2/+2
|/ | | | | | | | | Otherwise, we get errors like this (with boxen, e.g.): ``` /opt/boxen/bin/boxen-git-credential:23:in `require': cannot load such file -- boxen/config (LoadError) from /opt/boxen/bin/boxen-git-credential:23:in `<main>' Username for 'https://github.com': ```
* Merge pull request #1592 from yous/patch-4Parker Moore2014-06-241-1/+1
|\ | | | | Update `paginate_path` comment based on default value
| * Update `paginate_path` comment based on default valueChaYoung You2014-06-241-1/+1
|/
* Removed date plugin, added excerpt separator defaultBrandon Mathis2014-06-212-0/+1
|
* Replaced date plugin with jekyll-date-formatBrandon Mathis2014-06-212-82/+0
|
* Merge pull request #1589 from imathis/jekyll-2Brandon Mathis2014-06-2111-715/+94
|\ | | | | Jekyll 2.0 compatability
| * 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()
| * Refactoring addSidebarToggler()Simone2014-06-151-5/+1
|/
* Merge pull request #1567 from howiehu/fix-gist-url-bugParker Moore2014-05-231-1/+1
|\ | | | | Update gist tag url to githubusercontent.com
| * 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 deploy
| * 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
|\ | | | | Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder
| * Fix typo in update_style copy commandPatrick Aikens2014-02-011-1/+1
| |
| * Reversed update_style copy direction to correctly restore the ↵Patrick Aikens2014-02-011-2/+2
| | | | | | | | sass.old/custom files to the new sass/custom folder
* | Merge pull request #1515 from rythie/masterBrandon Mathis2014-03-092-3/+3
|\ \ | | | | | | A couple of changes to make octopress more friendly when hosted using HTTPS
| * | 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 r...
| * | 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
| | | | | | Thanks @larryprice
* | 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
|\ | | | | Set the codepage to 65001 before generating
| * 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
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-28 01:39:51 +0000