Brandon Mathis
6ae3369466
added a test for escaping liquid tags in code blocks
2012-09-06 11:18:40 -05:00
Brandon Mathis
23990084e2
Merge branch '2.1' into site
2012-09-06 11:15:39 -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
5f9945edef
updated latest
2012-09-06 10:54:40 -05:00
Brandon Mathis
118e71660e
Merge branch '2.1' of github.com:imathis/octopress into site
2012-09-06 10:22:02 -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
6afadaa97b
fixed path on rbenv docs
2012-08-03 21:40:46 -05:00
Brandon Mathis
f713697342
Updated documentation for setup and installing rbenv and rvm
2012-08-03 16:18:01 -05:00
Brandon Mathis
9bdecd301c
Merge branch '2.1' into site
2012-08-03 16:15:21 -05:00
Brandon Mathis
782c0bd56c
updated to Ruby 1.9.3-p0 udpated gems
2012-08-03 16:15:16 -05:00
Brandon Mathis
66db21307f
updated rbenv and rvm instructions to use 1.9.3
2012-07-31 15:45:05 -05:00
Brandon Mathis
15de735100
updated from master
2012-07-31 15:02:49 -05: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
Brandon Mathis
92baa93301
Merge branch '2.1' into site
2012-07-29 16:06:21 -05: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
5305861c5b
Merge branch '2.1' into site
2012-06-16 21:44:19 -05:00
Brandon Mathis
17368e93c4
Added minification and concatenation of Javascript files
2012-06-16 18:36:58 -05:00
Brandon Mathis
1970ef43b0
updated theme
2012-06-16 17:56:45 -05:00
Brandon Mathis
c0a18589b2
Merge branch '2.1' into site
...
Conflicts:
_config.yml
2012-06-16 17:19:06 -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
5799278244
Merge branch '2.1' into site
2012-06-15 12:51:18 -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
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
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
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
Brandon Mathis
bfb348695f
Merge branch '2.1' into site
2012-06-11 00:44:28 -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
cb64ab2bed
Added support for blockquotes with only Author but now cited work. Closes #470
2012-06-11 00:44:10 -05:00
Brandon Mathis
29d3c71366
Merge branch '2.1' into site
2012-06-11 00:26:16 -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
3fc0bf107f
Added html escaping GitHub feed. Closes #570
2012-06-11 00:19:05 -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
bc3553e4f7
updated octopress.js from latest
2012-06-08 14:35:00 -05:00
Brandon Mathis
4b3000f8a2
fixed bug with Modernizr classes not being added when a feature is not supported
2012-06-08 14:34:46 -05:00
Brandon Mathis
1f8377f157
Merge from 2.1
2012-06-08 14:29:08 -05:00
Brandon Mathis
d4bca3f7bb
Removed dupicate post paragraph in post/meta
2012-06-08 14:21:33 -05:00
Brandon Mathis
f4152ad1a7
udpated to latest
2012-06-08 14:21:28 -05:00
Brandon Mathis
3d27cb13c8
Removed dupicate post paragraph in post/meta
2012-06-08 14:20:51 -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
7b59a4c06e
updated theme
2012-06-07 14:27:17 -05:00
