Commit Graph

724 Commits

Author SHA1 Message Date
Brandon Mathis
4b5ffb725a Using https rather than protocol relative urls 2012-10-01 07:26:26 -05:00
Brandon Mathis
7fbb696966 Disqus ids can now be used to identify posts. 2012-09-30 16:41:43 -05:00
Brandon Mathis
340d9aea23 Merge branch '2.1' of github.com:imathis/octopress into 2.1 2012-09-29 22:48:26 -05:00
Brandon Mathis
9f7425a953 Using protocol relative URLs for Twitter, GitHub and Pinboard feeds 2012-09-29 22:48:11 -05:00
Brandon Mathis
76ae3e0a9b Merge pull request #771 from dmison/2.1-trailing_slashes_missing_from_archive_links
issue 770 - trailing slashes missing from archive links
2012-09-20 23:55:42 -07:00
Darrin Mison
62c58ad6cf issue 770 - trailing slashes missing from archive links
Signed-off-by: Darrin Mison <dmison@me.com>
2012-09-21 16:42:07 +10:00
Brandon Mathis
1a1f9905a8 Merge pull request #682 from henrik/unbreak_generate_only
[BUGFIX] Unbreak generate_only task.
2012-09-09 12:43:42 -07:00
Brandon Mathis
3f842465bd Now you can turn off titlecase on pages or posts by setting titlecase = false on the page/post YAML front matter 2012-09-08 14:37:26 -05:00
Brandon Mathis
1a96b235fc Now code blocks automatically escape liquid {{ and {% characters fixes #745 2012-09-06 11:10:32 -05:00
Brandon Mathis
c1a0d4ba52 Merge pull request #717 from rmm5t/patch-1
Typo while including custom/page_meta.html
2012-08-18 15:42:19 -07:00
Ryan McGeary
7645af6f90 Fixed typo while including custom/page_meta.html 2012-08-18 18:57:36 -03:00
Brandon Mathis
777736a8b7 Merge pull request #694 from SamWhited/2.1
Fix Twitter integration over SSL
2012-07-30 11:21:34 -07:00
Sam Whited
d4f7f10fee Fix Twitter integration over SSL 2012-07-30 14:19:43 -04:00
Henrik N
b0a60e44f3 Unbreak generate_only task.
The isolate task would overwrite the stash_dir local,
breaking the integrate task.
2012-07-22 21:15:34 +02:00
Brandon Mathis
cf0fd14476 fixed some typos 2012-06-17 11:20:05 -05:00
Brandon Mathis
c2e14bf88e Added combined javascript to .gitignore. Rake minify now uses configuration for the source directory 2012-06-17 09:36:56 -05:00
Brandon Mathis
17368e93c4 Added minification and concatenation of Javascript files 2012-06-16 18:36:58 -05:00
Brandon Mathis
318e348163 Removed include_array plugin, replaced it with include_sidebar plugin and reorganized sidebars 2012-06-16 17:17:33 -05:00
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