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
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
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
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
Brandon Mathis
42ce9b2176
updating setup and deployment docs
2011-09-19 12:19:20 -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
9a24bcb857
updated help docs to include updated contact methods
2011-09-17 16:08:18 -05:00
Brandon Mathis
b5df8f9ae9
Merge branch 'master' into site
2011-09-17 14:15:23 -05:00
Brandon Mathis
728bdad5ca
removes index.html from canonical urls. closes #153
2011-09-17 09:40:32 -05:00
Brandon Mathis
87476e0355
removes index.html from canonical urls. closes #153
2011-09-17 09:40:14 -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
