Brandon Mathis
f1b57f39a1
Merge branch '2.1' of github.com:imathis/octopress into 2.1
2012-06-15 12:51:00 -05:00
Brandon Mathis
28e99b3c38
Added plugins/config.rb for reading and writing _config.yml. Added option to use Albino and default Python Pygments by setting pygments:true in _config.yml
2012-06-15 12:50:44 -05:00
Brandon Mathis
c3d9bf8783
Merge pull request #606 from jrothwell/2.1
...
[minor bugfix] 2.1: refer to page_meta.html rather than page-meta.html
2012-06-12 08:35:28 -07:00
Jonathan Rothwell
697465a486
TINY alteration to fix typo reference to page-meta rather than page_meta.html
2012-06-11 23:31:11 +01:00
Brandon Mathis
0ce6655e02
Added escape for liquid tags {{ and {% so that Liquid doesn't barf when a language uses these characters. Closes #466
2012-06-11 01:08:12 -05:00
Brandon Mathis
6b38214a33
Added support for blockquotes with only Author but now cited work. Closes #470
2012-06-11 00:44:23 -05:00
Brandon Mathis
2444c2c804
fixed bug with Modernizr classes not being added when a feature is not supported
2012-06-11 00:26:10 -05:00
Brandon Mathis
fbb76e3c7c
Changed permalink default to start with /year instead of /blog for posts. This should make it easier to host Octopress as a blog in a larger site instead of requiring it to be in the top level directory. This should clear up the problem where people end up with /blog/blog/ when they publish Octopress to a blog subdirectory.
2012-06-11 00:22:46 -05:00
Brandon Mathis
0bcfd1d8cc
Added html escaping GitHub feed. Closes #570
2012-06-11 00:19:18 -05:00
Brandon Mathis
d0203f0328
Merge branch 'master' of github.com:imathis/octopress into 2.1
2012-06-10 15:22:22 -05:00
Brandon Mathis
f5b6df5a57
Merge pull request #602 from zan5hin/powrc
...
Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 ...
2012-06-10 13:21:45 -07:00
Brandon Mathis
d4bca3f7bb
Removed dupicate post paragraph in post/meta
2012-06-08 14:21:33 -05:00
Mark Nichols
944255f879
Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 and beyond.
...
Support for automatically handling .rvmrc files in projects is being deprecated in
POW version 0.4.0 and beyond. RVM will still work but project will need to have a
.powrc file that detects the presence of and then loads RVM.
The code in the .powrc could also be in the .powenv file, however the .powrc loads
first and is the configuration file recommended for inclusion in version control.
2012-06-08 13:58:52 -05:00
Brandon Mathis
b1276f082c
Better method for customizing the favicon. Closes #594
2012-06-07 14:27:25 -05:00
Brandon Mathis
3adba0a302
Updated Twitter bird to latest logo. Added generated sprites to gitignore. Other improvements to theming and sprites
2012-06-07 13:11:00 -05:00
Brandon Mathis
af8591cc4f
Improved internal Modernizr testing function
2012-06-07 13:10:56 -05:00
Brandon Mathis
f38ed3ce8d
Mobile nav fixed for better IE support. Closes #595
2012-06-07 10:19:48 -05:00
Brandon Mathis
43850a2456
Fixed issue with CSS image mask test failing. Refactored Octopress.js functions into a closure. Added Twitter and GitHub feeds to Octopress.js to reduce http requests. Fixes #596
2012-06-07 00:05:16 -05:00
Brandon Mathis
8623264532
added custom after post include to post template
2012-06-06 22:57:26 -05:00
Brandon Mathis
22e6de10c3
Added more customization points in layout for pages, posts, comments, and meta data.
2012-06-06 01:04:45 -05:00
Brandon Mathis
5528f9acec
Added styling for github follow button, improved javascripts for adding GitHub and Twitter sidebars
2012-06-05 16:09:32 -05:00
Brandon Mathis
d37c1babc7
improved the wording of the respectfully_social description
2012-06-05 12:57:16 -05:00
Brandon Mathis
44118878d7
Changed do_not_track setting to respectfully_social. Added a better description to the config file. Also, now social icons are sprited for bandwidth friendliness
2012-06-05 12:40:44 -05:00
Brandon Mathis
64b2d2355d
Fixed issue where gists wouldn't get line numbers added. Fixed issue where backtick code blocks were getting empty figcaptions
2012-06-05 00:35:50 -05:00
Brandon Mathis
608d9fb9bd
updated facebook link share url pattern
2012-06-05 00:25:33 -05:00
Brandon Mathis
35d2077ccc
fixed the embedded example in include_code plugin
2012-06-05 00:09:01 -05:00
Brandon Mathis
8cb79404d5
Added support for using text based social sharing links instead of javascript widgets which may track users and do trigger crazy high http requests. Also added a custom sharing template file for injecting any other sharing widget into the sharing section after a post
2012-06-05 00:08:54 -05:00
Brandon Mathis
f180feb402
Added video and css masks to modernizer tests. Updated styles to work with new image mask classname
2012-06-05 00:08:45 -05:00
Brandon Mathis
d0257bd930
Removing .sass-cache in update_style task to ensure that Sass caches don't cause problems when users update. Related to issue #555
2012-06-03 17:22:09 -05:00
Brandon Mathis
1ea31d13a8
Merge branch 'master' into 2.1
2012-06-03 09:52:32 -05:00
Brandon Mathis
d4649f7f8f
Merge branch 'master' into 2.1
...
Conflicts:
plugins/code_block.rb
plugins/pullquote.rb
2012-06-03 09:52:10 -05:00
Brandon Mathis
90ef78edb3
Merge pull request #592 from omasanori/fix-rel-canonical
...
Do not strip trailing slash of canonical URLs.
2012-06-03 07:46:58 -07:00
Brandon Mathis
9b7958eab1
Syntax highlighting theme now defaults to the light color scheme. I also added new styles for marking lines of code, and a better custom/_colors.scss file
2012-06-03 00:27:20 -05:00
Brandon Mathis
cf0d5b80cf
Improvements to code plugins
...
- Range options are now properly stripped out of code plugin markup
- Markers now add start and end class names for more style control
- code_block plugin properly passes markings in highlight options
- Deprecated title before file name syntax for include_code
2012-06-03 00:19:06 -05:00
OGINO Masanori
f3c68bb73f
Do not strip trailing slash of canonical URLs.
...
Usually, links for posts are generated with a trailing slash, but
canonical URLs aren't. Some services (e.g. http://b.hatena.ne.jp/ )
are confused with that behavior.
We can fix it by removing canonical URLs, but then anyone may read
a post with /index.html URL and post the URL to some tool or service.
Therefore rel="canonical" seems useful IMHO.
Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
2012-06-02 11:14:12 +09:00
Brandon Mathis
b867b0877d
Refactored code plugins so that shared regexes are mixed in methods
...
Added option to mark one line or groups of lines in a code block
Relates to issue #584
2012-05-28 04:29:18 -05:00
Brandon Mathis
ec900d5af7
Merge branch '2.1' of github.com:imathis/octopress into 2.1
2012-05-27 02:32:58 -05:00
Brandon Mathis
e16844af29
Improvements to Code embedding features
...
1. Removed lots of duplication
2. Added warnings and fixed some dim regex
3. New: set a start line number for any code snippet
4. New: set a start, end, or range for include_code
5. New: added option to disable line numbers linenos:false
Fixes #478 #484
2012-05-27 02:30:17 -05:00
Brandon Mathis
3b26147aef
Merge pull request #583 from xuhdev/deploy-nojekyll
...
Use a more portable way to create .nojekyll file when deploying to github pages.
2012-05-26 22:54:41 -07:00
Hong Xu
c1b2b43b32
Use a more portable way to create .nojekyll file when deploying to github pages.
2012-05-27 13:49:35 +08:00
Brandon Mathis
0b088433ca
Added configurable array for adding hidden files to be deployed with copydot task
2012-05-26 11:52:23 -05:00
Brandon Mathis
ae967b264d
improved flexability of styling code blocks. Improved the light theme.
2012-05-25 11:36:57 -05:00
Brandon Mathis
d40eaab07c
Switched out ender.js in favor of jQuery. Some small improvements to sidebar feed scripts
2012-05-24 23:03:59 -05:00
Maxwell Swadling
b69e876828
Fixed paths in GitHub api lists from using api urls instead of HTML urls.
...
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-24 22:48:51 -05:00
Maxwell Swadling
693fc29572
Updated GitHub repos list to use GitHub Api v3
...
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-24 22:48:51 -05:00
Brandon Mathis
153756fdef
After thinking about it, I find little gain, and greater difficulty by not including the Gemfile.lock. It was fun while it lasted. fix #568
2012-05-24 10:36:54 -05:00
Brandon Mathis
e53b26ad30
updated plugins to work with latest version of Liquid
2012-05-24 10:28:32 -05:00
Brandon Mathis
af40b0aa13
Removed unnecessary line breaks from beginning and end of blockquotes
2012-05-24 10:24:37 -05:00
Brandon Mathis
4de8189651
Fixed collision with render on pygments_code.rb
2012-05-24 10:18:44 -05:00
Brandon Mathis
e81e1c8289
Removed .nojekyll from source directory as it only makes sense to add to GitHub pages deployments. Added .nojekyll creation to push rake task for GitHub pages
2012-05-24 10:18:28 -05:00
