aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* modify tags and categoriesZhiming Wang2014-10-201-2/+1
| | | | | I guess "category" in Octopress is roughly equivalent to Tumblr's "tag", which is unlike WordPress, which boasts both categories and tags.
* 20141020 Hello, Octopress!Zhiming Wang2014-10-201-0/+36
|
* initial setupZhiming Wang2014-10-20119-10/+2777
|
* Merge pull request #1658 from kamatari/fix-rake-cleanParker Moore2014-10-031-1/+1
|\ | | | | enable wildcard of rm_rf
| * enable wildcard of rm_rfMasahiro Kamata2014-10-041-1/+1
|/
* Fixed issue with RubyPants and the Octopress hooks filterBrandon Mathis2014-08-291-2/+3
|
* Merge pull request #1629 from yous/patch-layoutBrandon Mathis2014-08-121-1/+1
|\ | | | | Set layout to null to suppress warning
| * Set layout to null to suppress warningChaYoung You2014-08-131-1/+1
|/ | | | Not applied in 0f1660437beba58cd2974f07270b19305b9bbfd9.
* Set layout to null to avoid page defaults.Brandon Mathis2014-08-122-0/+2
|
* Merge pull request #1628 from yous/patch-octopress-filterBrandon Mathis2014-08-121-2/+2
|\ | | | | Use `octopress-hooks` and `octopress-date-format`
| * Use `octopress-hooks` and `octopress-date-format`ChaYoung You2014-08-131-2/+2
|/ | | | | | Not applied in 73e540409ceb8bc18048b6a96a4b815fc303ea28. Fix #1622.
* Support octopress-hooks and octopress-date-format #1622Brandon Mathis2014-08-1211-57/+46
|
* Revert "remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'"Parker Moore2014-08-122-4/+4
| | | | This reverts commit 181d620c1c46c644c4319e81edc342ae5a30c067.
* Merge pull request #1622 from raysrashmi/ry-updating-gemsParker Moore2014-08-092-4/+4
|\ | | | | remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'
| * remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'Rashmi Yadav2014-08-072-4/+4
|/
* Delete Gemfile.lockParker Moore2014-07-311-104/+0
| | | Follow-up to #1617
* Merge pull request #1617 from nickhammond/patch-1Parker Moore2014-07-311-0/+1
|\ | | | | .gitignore Gemfile.lock per previous commit
| * .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
| |
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 15:50:32 +0000