9bdecd301c
Merge branch '2.1' into site
2012-08-03 16:15:21 -05:00
782c0bd56c
updated to Ruby 1.9.3-p0 udpated gems
2012-08-03 16:15:16 -05:00
66db21307f
updated rbenv and rvm instructions to use 1.9.3
2012-07-31 15:45:05 -05:00
15de735100
updated from master
2012-07-31 15:02:49 -05:00
777736a8b7
Merge pull request #694 from SamWhited/2.1
...
Fix Twitter integration over SSL
2012-07-30 11:21:34 -07:00
d4f7f10fee
Fix Twitter integration over SSL
2012-07-30 14:19:43 -04:00
92baa93301
Merge branch '2.1' into site
2012-07-29 16:06:21 -05:00
cf0fd14476
fixed some typos
2012-06-17 11:20:05 -05:00
c2e14bf88e
Added combined javascript to .gitignore. Rake minify now uses configuration for the source directory
2012-06-17 09:36:56 -05:00
5305861c5b
Merge branch '2.1' into site
2012-06-16 21:44:19 -05:00
17368e93c4
Added minification and concatenation of Javascript files
2012-06-16 18:36:58 -05:00
1970ef43b0
updated theme
2012-06-16 17:56:45 -05:00
c0a18589b2
Merge branch '2.1' into site
...
Conflicts:
_config.yml
2012-06-16 17:19:06 -05:00
318e348163
Removed include_array plugin, replaced it with include_sidebar plugin and reorganized sidebars
2012-06-16 17:17:33 -05:00
5799278244
Merge branch '2.1' into site
2012-06-15 12:51:18 -05:00
f1b57f39a1
Merge branch '2.1' of github.com:imathis/octopress into 2.1
2012-06-15 12:51:00 -05:00
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
9af3642100
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:34 -05:00
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
697465a486
TINY alteration to fix typo reference to page-meta rather than page_meta.html
2012-06-11 23:31:11 +01:00
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
f3978d1604
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:05 -05:00
bfb348695f
Merge branch '2.1' into site
2012-06-11 00:44:28 -05:00
6b38214a33
Added support for blockquotes with only Author but now cited work. Closes #470
2012-06-11 00:44:23 -05:00
cb64ab2bed
Added support for blockquotes with only Author but now cited work. Closes #470
2012-06-11 00:44:10 -05:00
29d3c71366
Merge branch '2.1' into site
2012-06-11 00:26:16 -05:00
2444c2c804
fixed bug with Modernizr classes not being added when a feature is not supported
2012-06-11 00:26:10 -05:00
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
0bcfd1d8cc
Added html escaping GitHub feed. Closes #570
2012-06-11 00:19:18 -05:00
3fc0bf107f
Added html escaping GitHub feed. Closes #570
2012-06-11 00:19:05 -05:00
d0203f0328
Merge branch 'master' of github.com:imathis/octopress into 2.1
2012-06-10 15:22:22 -05:00
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
bc3553e4f7
updated octopress.js from latest
2012-06-08 14:35:00 -05:00
4b3000f8a2
fixed bug with Modernizr classes not being added when a feature is not supported
2012-06-08 14:34:46 -05:00
1f8377f157
Merge from 2.1
2012-06-08 14:29:08 -05:00
d4bca3f7bb
Removed dupicate post paragraph in post/meta
2012-06-08 14:21:33 -05:00
f4152ad1a7
udpated to latest
2012-06-08 14:21:28 -05:00
3d27cb13c8
Removed dupicate post paragraph in post/meta
2012-06-08 14:20:51 -05:00
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
b1276f082c
Better method for customizing the favicon. Closes #594
2012-06-07 14:27:25 -05:00
7b59a4c06e
updated theme
2012-06-07 14:27:17 -05:00
709b090e5b
Better method for customizing the favicon. Closes #594
2012-06-07 14:27:03 -05:00
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
af8591cc4f
Improved internal Modernizr testing function
2012-06-07 13:10:56 -05:00
c9086a16b0
updated to latest theme
2012-06-07 13:10:50 -05:00
ce9b3cab18
Improved internal Modernizr testing function
2012-06-07 13:09:46 -05:00
90029198a4
Updated Twitter bird to latest logo. Added generated sprites to gitignore. Other improvements to theming and sprites
2012-06-07 13:08:20 -05:00
f38ed3ce8d
Mobile nav fixed for better IE support. Closes #595
2012-06-07 10:19:48 -05:00
f9eeb5ae71
udpated to latest octopress.js
2012-06-07 10:19:39 -05:00
2225f69536
Mobile nav fixed for better IE support. Closes #595
2012-06-07 10:19:27 -05:00
Brandon Mathis