Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 20141021 Get rolling | Zhiming Wang | 2014-10-21 | 1 | -0/+35 |
| | |||||
* | add google analytics | Zhiming Wang | 2014-10-21 | 1 | -1/+1 |
| | |||||
* | 20141020 Help Mou Hit 1.0 | Zhiming Wang | 2014-10-21 | 1 | -0/+13 |
| | |||||
* | modify tags and categories | Zhiming Wang | 2014-10-20 | 1 | -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 Wang | 2014-10-20 | 1 | -0/+36 |
| | |||||
* | initial setup | Zhiming Wang | 2014-10-20 | 119 | -10/+2777 |
| | |||||
* | Merge pull request #1658 from kamatari/fix-rake-clean | Parker Moore | 2014-10-03 | 1 | -1/+1 |
|\ | | | | | enable wildcard of rm_rf | ||||
| * | enable wildcard of rm_rf | Masahiro Kamata | 2014-10-04 | 1 | -1/+1 |
|/ | |||||
* | Fixed issue with RubyPants and the Octopress hooks filter | Brandon Mathis | 2014-08-29 | 1 | -2/+3 |
| | |||||
* | Merge pull request #1629 from yous/patch-layout | Brandon Mathis | 2014-08-12 | 1 | -1/+1 |
|\ | | | | | Set layout to null to suppress warning | ||||
| * | Set layout to null to suppress warning | ChaYoung You | 2014-08-13 | 1 | -1/+1 |
|/ | | | | Not applied in 0f1660437beba58cd2974f07270b19305b9bbfd9. | ||||
* | Set layout to null to avoid page defaults. | Brandon Mathis | 2014-08-12 | 2 | -0/+2 |
| | |||||
* | Merge pull request #1628 from yous/patch-octopress-filter | Brandon Mathis | 2014-08-12 | 1 | -2/+2 |
|\ | | | | | Use `octopress-hooks` and `octopress-date-format` | ||||
| * | Use `octopress-hooks` and `octopress-date-format` | ChaYoung You | 2014-08-13 | 1 | -2/+2 |
|/ | | | | | | Not applied in 73e540409ceb8bc18048b6a96a4b815fc303ea28. Fix #1622. | ||||
* | Support octopress-hooks and octopress-date-format #1622 | Brandon Mathis | 2014-08-12 | 11 | -57/+46 |
| | |||||
* | Revert "remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'" | Parker Moore | 2014-08-12 | 2 | -4/+4 |
| | | | | This reverts commit 181d620c1c46c644c4319e81edc342ae5a30c067. | ||||
* | Merge pull request #1622 from raysrashmi/ry-updating-gems | Parker Moore | 2014-08-09 | 2 | -4/+4 |
|\ | | | | | remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format' | ||||
| * | remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format' | Rashmi Yadav | 2014-08-07 | 2 | -4/+4 |
|/ | |||||
* | Delete Gemfile.lock | Parker Moore | 2014-07-31 | 1 | -104/+0 |
| | | | Follow-up to #1617 | ||||
* | Merge pull request #1617 from nickhammond/patch-1 | Parker Moore | 2014-07-31 | 1 | -0/+1 |
|\ | | | | | .gitignore Gemfile.lock per previous commit | ||||
| * | .gitignore Gemfile.lock per previous commit | Nick Hammond | 2014-07-24 | 1 | -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-1 | Parker Moore | 2014-07-19 | 1 | -2/+2 |
|\ | | | | | Fixes load path issues with ruby-based git credential helpers | ||||
| * | Fixes load path issues with ruby-based git credential helpers | Andy Lindeman | 2014-07-19 | 1 | -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-4 | Parker Moore | 2014-06-24 | 1 | -1/+1 |
|\ | | | | | Update `paginate_path` comment based on default value | ||||
| * | Update `paginate_path` comment based on default value | ChaYoung You | 2014-06-24 | 1 | -1/+1 |
|/ | |||||
* | Removed date plugin, added excerpt separator default | Brandon Mathis | 2014-06-21 | 2 | -0/+1 |
| | |||||
* | Replaced date plugin with jekyll-date-format | Brandon Mathis | 2014-06-21 | 2 | -82/+0 |
| | |||||
* | Merge pull request #1589 from imathis/jekyll-2 | Brandon Mathis | 2014-06-21 | 11 | -715/+94 |
|\ | | | | | Jekyll 2.0 compatability | ||||
| * | No longer including Gemfile.lock. Turns out that was a bad idea. | Brandon Mathis | 2014-06-21 | 1 | -0/+3 |
| | | |||||
| * | Added jekyll-sitemap, jekyll-date-format, and updated gems | Brandon Mathis | 2014-06-21 | 3 | -5/+13 |
| | | |||||
| * | Initial update to be compatible with Jekyll 2 | Brandon Mathis | 2014-06-21 | 11 | -711/+79 |
|/ | |||||
* | Merge pull request #1586 from simonewebdesign/master | Parker Moore | 2014-06-15 | 1 | -5/+1 |
|\ | | | | | Refactoring addSidebarToggler() | ||||
| * | Refactoring addSidebarToggler() | Simone | 2014-06-15 | 1 | -5/+1 |
|/ | |||||
* | Merge pull request #1567 from howiehu/fix-gist-url-bug | Parker Moore | 2014-05-23 | 1 | -1/+1 |
|\ | | | | | Update gist tag url to githubusercontent.com | ||||
| * | fix script_url_for url bug | Hu Hao | 2014-05-23 | 1 | -1/+1 |
| | | |||||
| * | Update gist tag url to githubusercontent.com | Hu Hao | 2014-05-23 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #1563 from tsmacdonald/master | Parker Moore | 2014-05-17 | 1 | -1/+1 |
|\ | | | | | Use correct time in log message for Github deploy | ||||
| * | Use correct time in log message for Github deploy | Timothy Macdonald | 2014-05-17 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1489 from duckpuppy/fix-update_style | Parker Moore | 2014-04-03 | 1 | -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 command | Patrick Aikens | 2014-02-01 | 1 | -1/+1 |
| | | |||||
| * | Reversed update_style copy direction to correctly restore the ↵ | Patrick Aikens | 2014-02-01 | 1 | -2/+2 |
| | | | | | | | | sass.old/custom files to the new sass/custom folder | ||||
* | | Merge pull request #1515 from rythie/master | Brandon Mathis | 2014-03-09 | 2 | -3/+3 |
|\ \ | | | | | | | A couple of changes to make octopress more friendly when hosted using HTTPS | ||||
| * | | Use HTTPS for google webfonts when on HTTPS site | Richard Cunningham | 2014-03-07 | 1 | -2/+2 |
| | | | |||||
| * | | Default to HTTPS for google searches | Richard Cunningham | 2014-03-07 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1506 from duckpuppy/handle-multiple-redirects | Parker Moore | 2014-03-03 | 1 | -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 reference | Patrick Aikens | 2014-03-01 | 1 | -1/+5 |
|/ / | |||||
* | | Fixed the expand_url filter. Finally. | Brandon Mathis | 2014-02-24 | 1 | -2/+2 |
| | | | | | | Thanks @larryprice | ||||
* | | Removed accidental call to expand_url | Brandon Mathis | 2014-02-24 | 1 | -1/+1 |
| | | |||||
* | | Ignore protocol relative '//' urls. | Brandon Mathis | 2014-02-24 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #1431 from Haacked/windows-code-page-fix | Brandon Mathis | 2014-01-30 | 1 | -0/+4 |
|\ | | | | | Set the codepage to 65001 before generating |