Brandon Mathis
9af74d3a47
updated to latest octopress
2011-09-26 08:35:06 -05:00
Brandon Mathis
2afb62b297
Merge branch 'master' into site
...
Conflicts:
Rakefile
2011-09-26 08:34:50 -05:00
Brandon Mathis
ceb3a7da83
updated sit source
2011-09-26 07:56:46 -05:00
Brandon Mathis
fd1c54bae6
Merge branch 'master' into site
2011-09-26 07:55:42 -05:00
Frederic Hemberger
40a7809d65
Fixes delicious integration #179
2011-09-26 14:19:47 +02:00
Frederic Hemberger
167db49940
Refactores twitter widget
...
- Order of code: Define functions first before using them
- Fixed issues found by jsHint (http://jshint.com )
- Switched to Twitter's current API url
- Expand shortened urls, fixes #165
2011-09-26 13:53:12 +02:00
Frederic Hemberger
19a646b5e9
Escapes double quotes in img tag
2011-09-26 11:55:43 +02:00
Frederic Hemberger
9bd572ffdc
Adds jsFiddle plugin
2011-09-26 11:51:44 +02:00
Frederic Hemberger
50eaf98c24
Makes img tag more flexible, adds support for relative paths. Includes pull request #145 , fixes #161
2011-09-26 11:00:35 +02:00
Frederic Hemberger
8c5ce51b3f
Merge pull request #178 from matrixagent/patch-1
...
Changed rsync deployment so the ssh port is configurable as well.
2011-09-25 22:50:56 -07:00
Brandon Mathis
d1e5c45e79
Ender.js is now loaded locally instead of hotlinking
2011-09-25 21:31:22 -05:00
Brandon Mathis
eade4fc0d5
now layouts or pages can specify "sidebar: collapse" in the yaml front matter for an always collapsed sidebar
2011-09-25 21:31:18 -05:00
Brandon Mathis
8ff71da80a
now layouts or pages can specify "sidebar: collapse" in the yaml front matter for an always collapsed sidebar
2011-09-25 21:30:55 -05:00
Brandon Mathis
8abc271e5d
Ender.js is now loaded locally instead of hotlinking
2011-09-25 21:29:53 -05:00
Manu
af1f2af48f
Typo.
2011-09-26 00:16:15 +03:00
Manu
a4177e1471
Changed it so the ssh port is configurable as well. (As I ran into the same issue already described at https://github.com/imathis/octopress/issues/30 )
2011-09-26 00:13:42 +03:00
Brandon Mathis
c26e5c3be9
Merge branch 'master' of github.com:imathis/octopress
2011-09-25 09:15:14 -05:00
Brandon Mathis
9ef928588b
mobile nav javascript updated to still work with role='main-navigation' since changes affecting custom partials don't get updated with the standard update script
2011-09-25 09:15:04 -05:00
Brandon Mathis
7b4ffcb980
mobile nav javascript updated to still work with role='main-navigation' since changes affecting custom partials don't get updated with the standard update script
2011-09-25 09:14:50 -05:00
Frederic Hemberger
2f60361a7b
Fixes child selector for param[name=movie], #168
2011-09-24 12:43:44 +02:00
Brandon Mathis
e7032f2f67
Merge branch 'master' of github.com:imathis/octopress
2011-09-22 18:09:37 -05:00
Brandon Mathis
dc81c879b0
added slugignore to help with heroku deployment
2011-09-22 18:09:03 -05:00
Brandon Mathis
aa1abd0827
now Github pages :push task forces
2011-09-22 16:16:54 -05:00
Brandon Mathis
560f54dba5
updated documentation to include steps for rbenv users
2011-09-22 14:40:40 -05:00
Brandon Mathis
215ecad897
Merge pull request #171 from fmcypriano/master
...
Add .rbenv-version file to simplify the installation when using rbenv
2011-09-22 12:09:30 -07:00
Brandon Mathis
fdfdbe6dd5
Merge pull request #170 from fmcypriano/site
...
Update Octopress Setup doc to show how to use rbenv instead of RVM
2011-09-22 12:08:03 -07:00
Felipe Cypriano
7cac353428
Add .rbenv-version file to simplify the installation using rbenv
2011-09-22 15:59:52 -03:00
Felipe Cypriano
dd3a572fcc
Update the setup/index.markdown to show how to install Octopress using rbenv
2011-09-22 15:58:44 -03:00
Brandon Mathis
95a831543d
fixed typo on github deployment docs
2011-09-22 13:37:50 -05:00
Brandon Mathis
4d49149404
renamed github pages configuration task
2011-09-22 04:45:44 -05:00
Brandon Mathis
d9e8e53f31
renamed github pages configuration task
2011-09-22 04:45:07 -05:00
Brandon Mathis
fcb730b5bf
Restored copying public into _deploy. fixes #169
2011-09-22 04:43:09 -05:00
Brandon Mathis
4efb29394f
improved github configuration raketask
2011-09-22 04:41:40 -05:00
Brandon Mathis
d1faf7656a
Merge branch 'master' into site
2011-09-22 04:28:40 -05:00
Brandon Mathis
85fd1ed2dc
improved documentaiton for setup and deployment
2011-09-22 04:13:12 -05:00
Frederic Hemberger
92ff4a9c67
copydot task can be called with parameters, no need for separate copydot_deploy
2011-09-22 10:17:31 +02:00
Brandon Mathis
a5d55fe80f
Fixed issue where dotfiles were not being copied to _deploy for github pages deployments
2011-09-21 18:54:54 -05:00
Brandon Mathis
5b2b0c508b
fixed issue where public was being copied into _deploy
2011-09-21 18:44:21 -05:00
Brandon Mathis
98d2b410fe
updated to latest octopress
2011-09-21 15:43:34 -05:00
Brandon Mathis
480b60ddf1
Merge branch 'master' into site
...
Conflicts:
_config.yml
2011-09-21 14:01:11 -05:00
Brandon Mathis
61b4abb256
Merge branch 'site' of github.com:imathis/octopress into site
2011-09-21 13:55:43 -05:00
Frederic Hemberger
27c736bff5
Minor fixes
2011-09-21 15:01:23 +02:00
Frederic Hemberger
a9a901c136
Fixed misuse of ARIA roles (see http://dev.opera.com/articles/view/introduction-to-wai-aria/ )
2011-09-21 14:48:38 +02:00
Frederic Hemberger
2a30d9a1eb
Refactored inclusion of disqus script
...
- Added ARIA setting `aria-live="polite"` to comment output
- Removed duplicate <div id="disqus_thread"> from page/post templates
- Moved blocking JavaScript loading to the end of the document body.
- Merged JavaScript code for index and pages/posts using conditionals
- Moved global JavaScript disqus variables into the anonymous function to stop pollution of global namespace
2011-09-21 14:09:48 +02:00
Frederic Hemberger
b2828eb039
Added optional comment count for disqus, fixes #88
2011-09-21 11:46:48 +02:00
Frederic Hemberger
3dbc379caa
Updated regex to select less content on posts
2011-09-21 11:41:55 +02:00
Frederic Hemberger
111142c5c2
Fixes whitespace, removed unnecessary closing '/' in HTML5
2011-09-21 10:13:23 +02:00
Frederic Hemberger
0b5215c0f5
Adds first 150 chars of content as meta description, if no page.description specified. Fixes #162
2011-09-21 10:08:38 +02:00
Brandon Mathis
86d9f7b996
Merge pull request #163 from FranklinChen/site
...
Fix typo.
2011-09-20 22:08:28 -07:00
Franklin Chen
d8b113c485
Fix typo.
2011-09-21 00:46:01 -04:00
