Commit Graph

898 Commits

Author SHA1 Message Date
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
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
Frederic Hemberger
2f60361a7b Fixes child selector for param[name=movie], #168 2011-09-24 12:43:44 +02:00
Frederic Hemberger
3ad7715901 Fix generation of stylesheets 2011-09-24 11:31:57 +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
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
Felipe Cypriano
7cac353428 Add .rbenv-version file to simplify the installation using rbenv 2011-09-22 15:59:52 -03:00
Brandon Mathis
4d49149404 renamed github pages configuration task 2011-09-22 04:45:44 -05:00
Frederic Hemberger
ab61a62d30 Removes compass_compiler.rb 2011-09-22 11:43:33 +02: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
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
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
Frederic Hemberger
48a93a90a4 Merge pull request #159 from tmiller/patch-1
Removing glob because globbing does not pick up dotfiles.
2011-09-19 23:00:11 -07:00
Tom Miller
ec91c370d5 Removing glob because globbing does not pick up dotfiles. 2011-09-19 22:46:21 -05:00
Frederic Hemberger
44e4a991cf Fixes styling of <figure> code header 2011-09-18 21:27:42 +02:00
Frederic Hemberger
31adeee1df Wraps git commit message in double quotes, fixes #139 2011-09-18 14:07:43 +02:00
Frederic Hemberger
347e855ddc Fixes HTML validation issues with code highlighting 2011-09-18 13:55:35 +02:00
Frederic Hemberger
9e5e3c5d2f Fixes spacing and global variable leaks, JSHint check
octopress.js now almost passes JSHint (http://jshint.com). The only issues left
are due to undefined Modernizr and swfobject objects and the compressed
swfobject code at the end of the file, but those are neglectable.
2011-09-18 13:50:23 +02:00
Frederic Hemberger
f6bf894387 Aligns naming of .pygments-cache, .gist-cache and .sass-cache 2011-09-18 13:45:25 +02:00
Brandon Mathis
41cbe78251 Merge pull request #154 from jcsims/rake_dotcopy_fix
Fixes #150. Strip leading path before checking for excluded file.
2011-09-17 16:46:05 -07:00
Chris Sims
1a562b9580 Fixes #150. Strip leading path before checking for excluded file. 2011-09-17 18:34:09 -05:00
Brandon Mathis
728bdad5ca removes index.html from canonical urls. closes #153 2011-09-17 09:40:32 -05:00
Brandon Mathis
48cd2793cf added itegration to gen_deploy 2011-09-12 14:51:49 -05:00
fhemberger
565648300b Fix an issue in 'watch' and 'preview' where main process is terminated with child processes still running 2011-09-12 21:36:14 +02:00
fhemberger
04973e0948 Move generate + deploy to separate task 2011-09-12 20:48:26 +02:00
fhemberger
960a57c256 Generate site before deploying, execute tasks in sequence 2011-09-12 19:49:18 +02:00
fhemberger
5c275542c3 Copy dotfiles also for subdirectories 2011-09-12 19:46:11 +02:00
Brandon Mathis
7c1c24f899 moved from Posix::Span to Process.span, fixing #46 2011-09-08 11:54:18 -05:00
Brandon Mathis
7e75d2f654 updated Gemfile.lock 2011-09-08 10:39:49 -05:00
Brandon Mathis
71ad7185bc Merge branch 'sinatra_static_server' of https://github.com/scottwater/octopress into scottwater-sinatra_static_server
Conflicts:
	Gemfile
	Gemfile.lock
2011-09-08 10:31:36 -05:00
Brandon Mathis
a289c90909 improved backtick codeblock's handling of the raw option 2011-09-07 23:30:09 -05:00
Brandon Mathis
3d2d1a8be4 1. Vastly improved backtick code blocks and added support for Textile
2. Refactored Octopress filters into Liquid filters and pre/post render filters (using post_filters plugin)
3. Added methods to raw plugin to prevent Markdown and Textile from parsing blocks
4. Updated render partial to invoke the pre_render method of post_filters
5. Moved Rubypants filter out of default.html into Octopress post_render filters
6. Added raw's safe_wrapper method to codeblock and include_code filters
2011-09-07 18:34:21 -05:00
Brandon Mathis
b25db54f93 Merge branch 'post_filters' 2011-09-07 18:34:17 -05:00