Mic92/blog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
820 Commits 1 Branch 0 Tags 23 MiB
c9e0078d65
Commit Graph

820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brandon Mathis
c9e0078d65 Merge pull request #1629 from yous/patch-layout 
Set layout to null to suppress warning
 2014-08-12 13:11:09 -05:00
ChaYoung You
2d40f51bd2
Set layout to null to suppress warning 
Not applied in 0f1660437b.
 2014-08-13 02:44:23 +09:00
Brandon Mathis
0f1660437b Set layout to null to avoid page defaults. 2014-08-12 12:02:20 -05:00
Brandon Mathis
bb06eec777 Merge pull request #1628 from yous/patch-octopress-filter 
Use `octopress-hooks` and `octopress-date-format`
 2014-08-12 12:01:16 -05:00
ChaYoung You
3d0e85730d
Use octopress-hooks and octopress-date-format 
Not applied in 73e540409c.

Fix #1622.
 2014-08-13 01:46:36 +09:00
Brandon Mathis
73e540409c Support octopress-hooks and octopress-date-format #1622 2014-08-12 10:56:45 -05:00
Parker Moore
18784a4cb0 Revert "remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'" 
This reverts commit 181d620c1c.
 2014-08-12 11:55:16 -04:00
Parker Moore
ce458d8b9e Merge pull request #1622 from raysrashmi/ry-updating-gems 
remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'
 2014-08-09 22:51:38 -04:00
Rashmi Yadav
181d620c1c remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format' 2014-08-07 16:18:22 +02:00
Parker Moore
6a099bfdb9 Delete Gemfile.lock 
Follow-up to #1617
 2014-07-31 16:22:30 -04:00
Parker Moore
f4d17ca45d Merge pull request #1617 from nickhammond/patch-1 
.gitignore Gemfile.lock per previous commit
 2014-07-31 16:21:49 -04:00
Nick Hammond
ed0412bef8 .gitignore Gemfile.lock per previous commit 
Gemfile.lock was removed in a previous commit, should be ignored so it doesn't get committed again.

06c0439705
 2014-07-24 18:08:14 -05:00
Parker Moore
c977b91e40 Merge pull request #1609 from alindeman/patch-1 
Fixes load path issues with ruby-based git credential helpers
 2014-07-19 19:35:13 -04:00
Andy Lindeman
00d1591322 Fixes load path issues with ruby-based git credential helpers 
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':
```
 2014-07-19 15:08:28 -04:00
Parker Moore
4fdae37e42 Merge pull request #1592 from yous/patch-4 
Update `paginate_path` comment based on default value
 2014-06-24 16:30:17 -04:00
ChaYoung You
7e044b498e Update paginate_path comment based on default value 2014-06-24 18:15:38 +09:00
Brandon Mathis
9d0c54e3e6 Removed date plugin, added excerpt separator default 2014-06-21 16:41:32 -05:00
Brandon Mathis
a0229b2c9c Replaced date plugin with jekyll-date-format 2014-06-21 15:51:40 -05:00
Brandon Mathis
72ea6042e3 Merge pull request #1589 from imathis/jekyll-2 
Jekyll 2.0 compatability
 2014-06-21 13:55:43 -05:00
Brandon Mathis
06c0439705 No longer including Gemfile.lock. Turns out that was a bad idea. 2014-06-21 13:49:29 -05:00
Brandon Mathis
2f47c00b48 Added jekyll-sitemap, jekyll-date-format, and updated gems 2014-06-21 13:46:27 -05:00
Brandon Mathis
52f9119645 Initial update to be compatible with Jekyll 2 2014-06-21 10:34:55 -05:00
Parker Moore
695fe922a9 Merge pull request #1586 from simonewebdesign/master 
Refactoring addSidebarToggler()
 2014-06-15 21:46:08 -04:00
Simone
e95d15d584 Refactoring addSidebarToggler() 2014-06-15 21:51:15 +01:00
Parker Moore
9bc4bb02ee Merge pull request #1567 from howiehu/fix-gist-url-bug 
Update gist tag url to githubusercontent.com
 2014-05-23 17:51:12 -04:00
Hu Hao
24fdbbbcfa fix script_url_for url bug 2014-05-23 15:45:58 +08:00
Hu Hao
dca0c7500f Update gist tag url to githubusercontent.com 2014-05-23 12:26:35 +08:00
Parker Moore
ff1b10d0bc Merge pull request #1563 from tsmacdonald/master 
Use correct time in log message for Github deploy
 2014-05-17 23:33:19 -04:00
Timothy Macdonald
c23be69915 Use correct time in log message for Github deploy 2014-05-17 15:08:38 -05:00
Parker Moore
f6ed4125b5 Merge pull request #1489 from duckpuppy/fix-update_style 
Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder
 2014-04-03 23:59:00 -04:00
Brandon Mathis
affa3ffb82 Merge pull request #1515 from rythie/master 
A couple of changes to make octopress more friendly when hosted using HTTPS
 2014-03-09 15:36:28 -05:00
Richard Cunningham
ec1fbccd64 Use HTTPS for google webfonts when on HTTPS site 2014-03-07 17:20:01 -05:00
Richard Cunningham
15e4418aed Default to HTTPS for google searches 2014-03-07 17:19:06 -05:00
Parker Moore
b86880352b Merge pull request #1506 from duckpuppy/handle-multiple-redirects 
gist_plugin: Handle multiple redirects, stopping if we find a circular r...
 2014-03-03 22:07:48 -05:00
Patrick Aikens
a66e031166 gist_plugin: Handle multiple redirects, stopping if we find a circular reference 2014-03-01 10:07:35 -05:00
Brandon Mathis
0ead88e6c2 Fixed the expand_url filter. Finally. 
Thanks @larryprice
 2014-02-24 20:52:26 -06:00
Brandon Mathis
1321423383 Removed accidental call to expand_url 2014-02-24 15:30:20 -06:00
Brandon Mathis
028769b73f Ignore protocol relative '//' urls. 2014-02-24 15:14:10 -06:00
Patrick Aikens
c139f680e1 Fix typo in update_style copy command 2014-02-01 00:20:19 -05:00
Patrick Aikens
51ad614bd2 Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder 2014-02-01 00:09:38 -05:00
Brandon Mathis
fe6ef744ed Merge pull request #1431 from Haacked/windows-code-page-fix 
Set the codepage to 65001 before generating
 2014-01-30 09:32:35 -08:00
Parker Moore
8f51bdc0fd Add note about current stable version of Octopress to README. 
Fixes #1451.
 2013-12-28 11:49:37 -05:00
Parker Moore
78defff9e1 Merge pull request #1443 from wickedshimmy/patch-1 
Fix spelling error
 2013-12-19 17:14:32 -08:00
Matt Enright
33b92bdfbb Fix spelling error 2013-12-19 16:26:03 -05:00
Phil Haack
3477eaf834 chcp only needs to run once 2013-11-29 20:43:32 -08:00
Haacked
21d26da1b6 Add check for running on Windows 2013-11-28 20:00:14 -08:00
Haacked
cf4af1d825 Set the codepage to 65001 before generating 2013-11-28 19:52:03 -08:00
Parker Moore
64ba603225 Merge pull request #1397 from IQAndreas/cleanup-date 
Call overridden version of `to_liquid` and remove duplicate code in `Octopress::Date`
 2013-11-18 09:38:47 -08:00
Andreas Renberg (IQAndreas)
408cade21f Rename 'data' to 'date_attributes' 
Prevents ambiguity, since there is already a `date` property defined in
the instance.
 2013-11-18 05:05:00 +01:00
Parker Moore
1230e01884 Merge branch 'master' of github.com:imathis/octopress 
* '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;
 2013-11-17 22:47:27 -05:00